Merge remote-tracking branch 'origin/Yuy'

Storage/Assets/#A1_Scenes/DemoScenes.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.37311926, g: 0.38073996, b: 0.35872698, a: 1}
+  m_IndirectSpecularColor: {r: 0.4410327, g: 0.48977453, b: 0.56986296, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &4
 LightmapSettings:
@@ -166,6 +166,79 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   levelPrefs:
   - {fileID: 8844811367371711361, guid: 4e82526948e0052488262b6410156ade, type: 3}
+--- !u!1001 &471229527
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 902116567, guid: 4e82526948e0052488262b6410156ade, type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 3
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123360, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 9100893407295123361, guid: 4e82526948e0052488262b6410156ade,
+        type: 3}
+      propertyPath: m_Name
+      value: Level2
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4e82526948e0052488262b6410156ade, type: 3}
 --- !u!1 &543166196
 GameObject:
   m_ObjectHideFlags: 0
@@ -372,6 +445,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: BattleUI
       objectReference: {fileID: 0}
+    - target: {fileID: 6064464677632144689, guid: 919382978f5e2684ba83e6daf6491458,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 6064464677632144690, guid: 919382978f5e2684ba83e6daf6491458,
         type: 3}
       propertyPath: m_LocalPosition.x

Storage/Assets/#C2_Animations/ShowBox/箱子.controller

@@ -11,13 +11,13 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 4360613730991412054}
-    m_Position: {x: 120, y: 280, z: 0}
+    m_Position: {x: 290, y: 450, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 7978185253963228048}
     m_Position: {x: 155, y: 345, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 2201674354850670455}
-    m_Position: {x: 190, y: 410, z: 0}
+    m_Position: {x: 70, y: 450, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Storage/Assets/#C3_Materials/PhysicMaterial.meta

+fileFormatVersion: 2
+guid: 3b6dfc5aedee14e4f8bb1f9148876e9f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Storage/Assets/#C3_Materials/New Physic Material.physicMaterial → Storage/Assets/#C3_Materials/PhysicMaterial/NoFriction.physicMaterial

@@ -6,9 +6,9 @@ PhysicMaterial:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: New Physic Material
-  dynamicFriction: 0.6
-  staticFriction: 0.6
+  m_Name: NoFriction
+  dynamicFriction: 0
+  staticFriction: 0
   bounciness: 0
   frictionCombine: 0
   bounceCombine: 0

Storage/Assets/#C3_Materials/New Physic Material.physicMaterial.meta → Storage/Assets/#C3_Materials/PhysicMaterial/NoFriction.physicMaterial.meta

 fileFormatVersion: 2
-guid: 088589653085ff843a36edfc199cde67
+guid: a34baac3bc326c040a393c315246c48d
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 0