Merge remote-tracking branch 'origin/master' into Yuy

Storage/Assets/#A2_Scripts/Battle/View/StorageView.cs

@@ -186,11 +186,11 @@ public class StorageView : MonoBehaviour
         //{
         //    varBody.isKinematic = true;
         //}
-        Rigidbody varBody = other.gameObject.GetComponent<Rigidbody>();
-        if (varBody)
-        {
-            varBody.velocity = Vector3.zero;
-        }
+        //Rigidbody varBody = other.gameObject.GetComponent<Rigidbody>();
+        //if (varBody)
+        //{
+        //    varBody.velocity = Vector3.zero;
+        //}
         m_insideBoxNum++;
         BattleCtrl.instance.battleUI.SetTakeBtnState(m_insideBoxNum >= m_TotalNum);
     }
@@ -323,9 +323,13 @@ public class StorageView : MonoBehaviour
         //}
         if (value)
         {
-            for (int i = 0; i < m_targetTrans.Length; i++)
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelEightIndex ||
+                    BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelNineIndex)
             {
-                m_targetTrans[i].GetComponent<Rigidbody>().isKinematic = true;
+                for (int i = 0; i < m_targetTrans.Length; i++)
+                {
+                    m_targetTrans[i].GetComponent<Rigidbody>().isKinematic = true;
+                }
             }
             if (m_animator)
             {
@@ -355,7 +359,7 @@ public class StorageView : MonoBehaviour
             }
         }
     }
-    void Update()
+    void FixedUpdate()
     {
         if (!BattleCtrl.instance.isStartBattle)
         {
@@ -453,6 +457,10 @@ public class StorageView : MonoBehaviour
             {
                 varPos.y = m_dicPos[m_curTargetTrans];
             }
+            if (varPos.z > m_specialZLimit)
+            {
+                varPos.z = m_specialZLimit;
+            }
             m_curTargetTrans.transform.position = varPos;
         }
         //if (m_bIsHitTarget)
@@ -479,17 +487,17 @@ public class StorageView : MonoBehaviour
             }
             //if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelEightIndex ||
             //    BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelNineIndex)
-            {
-                for (int i = 0; i < m_targetTrans.Length; i++)
-                {
-                    Vector3 varPos = m_targetTrans[i].transform.position;
-                    if (varPos.z > m_specialZLimit)
-                    {
-                        varPos.z = m_specialZLimit;
-                    }
-                    m_targetTrans[i].transform.position = varPos;
-                }
-            }
+            //{
+            //    for (int i = 0; i < m_targetTrans.Length; i++)
+            //    {
+            //        Vector3 varPos = m_targetTrans[i].transform.position;
+            //        if (varPos.z > m_specialZLimit)
+            //        {
+            //            varPos.z = m_specialZLimit;
+            //        }
+            //        m_targetTrans[i].transform.position = varPos;
+            //    }
+            //}
         }
         //UpdateExitBox();
     }

Storage/Assets/#A3_Prefabs/BattleUI.prefab

@@ -2902,14 +2902,14 @@ RectTransform:
   m_GameObject: {fileID: 3165065989114207065}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.5, y: 0.5, z: 1}
+  m_LocalScale: {x: 0.65, y: 0.65, z: 1}
   m_Children: []
   m_Father: {fileID: 767122297}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -482}
+  m_AnchoredPosition: {x: 0, y: -480}
   m_SizeDelta: {x: 1544, y: 751}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3165065989114207076
@@ -12090,7 +12090,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6064464677632144689}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 14433df62b9b3554e93abbfbc187fc8c, type: 3}
   m_Name: 

Storage/Assets/Res/Levels/Level8.prefab

@@ -9664,7 +9664,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -19439,7 +19439,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -67319,7 +67319,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -72737,7 +72737,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -82445,7 +82445,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -96637,7 +96637,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4

Storage/Assets/Res/Levels/Level9.prefab

@@ -9488,7 +9488,7 @@ Rigidbody:
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1
-  m_IsKinematic: 1
+  m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 0
   m_CollisionDetection: 0
@@ -23828,7 +23828,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -48213,7 +48213,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -57872,7 +57872,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -77112,7 +77112,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -91487,7 +91487,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4
@@ -101438,7 +101438,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   Params:
-    maxConvexHulls: 32
+    maxConvexHulls: 10
     resolution: 50000
     concavity: 0.0025
     planeDownsampling: 4