jiajun.hu.x 2 years ago
parent
commit
a390986150

+ 1 - 1
Assets/StreamingAssets/build_info

@@ -1 +1 @@
-Build from HJJ at 2023/2/27 9:09:17
+Build from HJJ at 2023/2/27 10:38:15

+ 37 - 40
Assets/Studio/Resources/Container/ModelContainer.prefab

@@ -28,6 +28,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.2, z: -0.0266}
   m_LocalScale: {x: 0.03, y: 0.03, z: 0.03}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8813769521014321180}
   m_RootOrder: 1
@@ -43,9 +44,12 @@ MeshRenderer:
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -70,6 +74,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
 --- !u!102 &4895520205962565269
 TextMesh:
   serializedVersion: 3
@@ -118,6 +123,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4994529286529523537}
   - {fileID: 8966945890872210017}
@@ -151,6 +157,7 @@ Transform:
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.05, y: 0.05, z: 0.05}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 8813769521014321180}
   m_RootOrder: 0
@@ -166,9 +173,12 @@ SpriteRenderer:
   m_CastShadows: 0
   m_ReceiveShadows: 0
   m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -201,7 +211,7 @@ SpriteRenderer:
   m_Size: {x: 5.12, y: 5.12}
   m_AdaptiveModeThreshold: 0.5
   m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
+  m_WasSpriteAssigned: 0
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
 --- !u!1 &7921608366927118931
@@ -218,6 +228,7 @@ GameObject:
   - component: {fileID: 7921608366927118933}
   - component: {fileID: 7921608366927118934}
   - component: {fileID: 7921608366927118921}
+  - component: {fileID: 1783179119547974561}
   m_Layer: 0
   m_Name: ModelContainer
   m_TagString: Untagged
@@ -235,6 +246,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 1}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7921608367376971771}
   - {fileID: 6901466653404652261}
@@ -257,25 +269,17 @@ MonoBehaviour:
   activation: 0
   flattenAxis: 0
   activeHandle: 6
-  boxFocusDisplayMat: {fileID: 2100000, guid: 4a9aae3094118f44593e7f8000e24c31, type: 2}
-  boxGrabDisplayMat: {fileID: 2100000, guid: 7e4095c5609075846b657c8917aae797, type: 2}
-  HandleMaterial: {fileID: 2100000, guid: 986558eab447a9847bbe138149edc1b4, type: 2}
-  HandleGrabMaterial: {fileID: 2100000, guid: bf37b5eab60b288498d02fd524325d10, type: 2}
-  CornerPrefab: {fileID: 1361136173122186969, guid: ba9083550f965e545a628b53bfa80c9e,
-    type: 3}
-  CornerSlatePrefab: {fileID: 1134031327877807717, guid: c45e552a6d92491468c421c35c5dd63d,
-    type: 3}
+  m_HandlerAssets: {fileID: 0}
+  activeScaleMinRestrict: 1
   scaleMinimum: 0.2
+  activeScaleMaxRestrict: 0
   scaleMaximum: 2
   scaleHandleSize: 0.016
   BoundBoxCollider: {fileID: 0}
-  SidePrefab: {fileID: 3868891704370700786, guid: 969c9b04d1b1848489de0d6efe6250fc,
-    type: 3}
   rotationHandleSize: 0.016
   showRotationHandleForX: 1
   showRotationHandleForY: 1
   showRotationHandleForZ: 1
-  facePrefab: {fileID: 0}
   axisScaleHandleSize: 0.016
   activeAxis: -2
   RotateStartAudio: 4
@@ -285,33 +289,21 @@ MonoBehaviour:
   RotateStarted:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   RotateStopped:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   ScaleStarted:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   ScaleStopped:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   Rotating:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
   Scaling:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
-      Culture=neutral, PublicKeyToken=null
 --- !u!114 &7921608366927118932
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -327,36 +319,26 @@ MonoBehaviour:
   PointerEnter:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerDown:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerClick:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerUp:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerExit:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   PointerDrag:
     m_PersistentCalls:
       m_Calls: []
-    m_TypeName: PointerUnityEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
-      PublicKeyToken=null
   Target: {fileID: 0}
   StartAudio: 6
   EndAudio: 5
+  headRotate: 0
+  oneGameControllerRotate: 0
   canOneHandRotate: 1
   canTwoHandRotate: 1
   canTwoHandScale: 1
@@ -407,6 +389,19 @@ MonoBehaviour:
   artType: 1
   smoothTween: 3
   offset: {x: 0.02, y: 0.02, z: 0.02}
+--- !u!65 &1783179119547974561
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7921608366927118931}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.5777985, y: 0.5262127, z: 0.18131644}
+  m_Center: {x: -0.04919064, y: -0.0077617764, z: -0.04117599}
 --- !u!1 &7921608367376971768
 GameObject:
   m_ObjectHideFlags: 0
@@ -433,6 +428,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7921608366927118930}
   m_RootOrder: 0
@@ -446,7 +442,7 @@ GameObject:
   serializedVersion: 6
   m_Component:
   - component: {fileID: 6901466653404652261}
-  - component: {fileID: 2187686680123956044}
+  - component: {fileID: 3870321613989413733}
   m_Layer: 0
   m_Name: ColliderBody
   m_TagString: Untagged
@@ -464,11 +460,12 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7921608366927118930}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!65 &2187686680123956044
+--- !u!65 &3870321613989413733
 BoxCollider:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -479,5 +476,5 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.25, y: 0.25, z: 0.25}
-  m_Center: {x: 0, y: 0, z: 0}
+  m_Size: {x: 0.5777985, y: 0.5262127, z: 0.18131644}
+  m_Center: {x: -0.04919064, y: -0.0077617764, z: -0.04117599}

+ 36 - 1
Assets/Studio/Scenes/Logo/Logo.unity

@@ -2152,6 +2152,16 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 5142388694493675282, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5142388694493675283, guid: 7cd0ceba7525bdc42a36be841a8aad16,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 5264498474688620203, guid: 7cd0ceba7525bdc42a36be841a8aad16,
         type: 3}
       propertyPath: m_Layer
@@ -4175,12 +4185,15 @@ MonoBehaviour:
   m_HideMobileInput: 0
   m_CharacterValidation: 0
   m_CharacterLimit: 11
-  m_OnEndEdit:
+  m_OnSubmit:
     m_PersistentCalls:
       m_Calls: []
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
+  m_OnDidEndEdit:
+    m_PersistentCalls:
+      m_Calls: []
   m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
   m_CustomCaretColor: 0
   m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412}
@@ -4282,6 +4295,7 @@ GameObject:
   - component: {fileID: 3694994521062204929}
   - component: {fileID: 5394885976978340326}
   - component: {fileID: 5394885976978340328}
+  - component: {fileID: 5394885976978340329}
   m_Layer: 0
   m_Name: GameSession
   m_TagString: Untagged
@@ -4331,6 +4345,27 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: b9debd87a7bc08647b03f657220a31a0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+--- !u!114 &5394885976978340329
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5394885976978340325}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e43ea5875156c3743943701fec0f757a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _appIdInput: {fileID: 11400000, guid: 300c6525f002a4dbaac41a5c4b054e35, type: 2}
+  _appID: 
+  _token: 
+  _channelName: 
+  LogText: {fileID: 0}
+  uid: 0
+  userAccount: 
+  menuIcon: {fileID: 0}
+  isSwitchCamera: 0
 --- !u!222 &8059137849200321610
 CanvasRenderer:
   m_ObjectHideFlags: 0

+ 3 - 3
Assets/Studio/XRLib/Codes/TestMVC/LoginDlg.cs

@@ -178,11 +178,11 @@ namespace ShadowStudio.UI
         }
         private void OnClickLogin()
         {
-            //userInputField.text = "HBKC217147";
+            // userInputField.text = "HBKC217147";
             //passwordInputField.text = "HBKC217147";
 
-           // userInputField.text = "ycst0003";
-           // passwordInputField.text = "0001";
+            userInputField.text = "ycst0003";
+            passwordInputField.text = "yc123456";
 
             if (userInputField.text == "" || passwordInputField.text == "")
             {

File diff suppressed because it is too large
+ 223 - 42
Assets/Studio/yiliao/guge.prefab


+ 1 - 1
Packages/manifest.json

@@ -7,7 +7,7 @@
     "com.unity.ide.rider": "3.0.16",
     "com.unity.ide.visualstudio": "2.0.16",
     "com.unity.ide.vscode": "1.2.5",
-    "com.unity.purchasing": "4.5.1",
+    "com.unity.purchasing": "4.5.2",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",

+ 1 - 1
Packages/packages-lock.json

@@ -84,7 +84,7 @@
       "url": "https://packages.unity.cn"
     },
     "com.unity.purchasing": {
-      "version": "4.5.1",
+      "version": "4.5.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {

Some files were not shown because too many files changed in this diff