修改场景预制体

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

@@ -14,6 +14,7 @@ public class StorageView : MonoBehaviour
     public float m_rotateSpeed = 1.0f;
     public Transform m_parent;//父节点
     public Animator m_animator;
+    public GameObject m_pushObj;//特殊处理（第6，7关）
     private MeshRenderer m_curTargetTrans;//当前抓的目标
     public MeshRenderer curTargetTrans => m_curTargetTrans;
     private Vector3 m_offset;//偏移值
@@ -86,6 +87,10 @@ public class StorageView : MonoBehaviour
         m_meshCollider = GetComponent<MeshCollider>();
         m_TotalNum = GlobalConfig.TotalNum();
         m_boxHeight = GlobalConfig.BoxHeight();
+        if(m_pushObj)
+        {
+            m_pushObj.SetActive(false);
+        }
         if (BattleCtrl.instance.isStartBattle)
         {
             OnStartClick();
@@ -319,6 +324,10 @@ public class StorageView : MonoBehaviour
                 string varStr = GlobalConfig.WinAnimatorName();
                 m_animator.Play(varStr);
             }
+            if (m_pushObj)
+            {
+                m_pushObj.SetActive(true);
+            }
         }
         else
         {

Storage/Assets/Res/Levels/Level2.prefab

@@ -22515,7 +22515,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1854398177115112716}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
   m_LocalPosition: {x: 0, y: 0, z: -1.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -22525,7 +22525,7 @@ Transform:
   - {fileID: 4325771776769910041}
   m_Father: {fileID: 5336090729675821977}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
 --- !u!95 &3755926457968805806
 Animator:
   serializedVersion: 3

Storage/Assets/Res/Levels/Level6.prefab

@@ -23968,7 +23968,7 @@ MonoBehaviour:
   cachedMesh: {fileID: -7011429734207973542, guid: 974688b4bf34a4e4fa5b4833b749d3d7,
     type: 3}
   InvisibleUpdate: 0
-  readable: 1
+  readable: 0
 --- !u!114 &8703156966850793955
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -93328,6 +93328,7 @@ MonoBehaviour:
   m_rotateSpeed: 1.5
   m_parent: {fileID: 6823741327319139769}
   m_animator: {fileID: 8710598915273231866}
+  m_pushObj: {fileID: 5071190230845608337}
 --- !u!1 &7443755736953841485
 GameObject:
   m_ObjectHideFlags: 0
@@ -96872,7 +96873,7 @@ MonoBehaviour:
   cachedMesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7,
     type: 3}
   InvisibleUpdate: 0
-  readable: 1
+  readable: 0
 --- !u!114 &47010074862378471
 MonoBehaviour:
   m_ObjectHideFlags: 0

Storage/Assets/Res/Levels/Level7.prefab

@@ -3442,7 +3442,7 @@ MonoBehaviour:
   cachedMesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7,
     type: 3}
   InvisibleUpdate: 0
-  readable: 1
+  readable: 0
 --- !u!114 &4160006159148553539
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -4945,6 +4945,20 @@ MonoBehaviour:
         m_Calls: []
   m_LegacyBlendHint: 0
   m_ComponentOwner: {fileID: 5143007038304641734}
+--- !u!64 &8878036156543449481
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1549869246939040298}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -2100243942497823721, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
 --- !u!1 &1605864023129452128
 GameObject:
   m_ObjectHideFlags: 0
@@ -5298,6 +5312,7 @@ MonoBehaviour:
   m_rotateSpeed: 1.5
   m_parent: {fileID: 4160006159637857422}
   m_animator: {fileID: 4160006160181235149}
+  m_pushObj: {fileID: 1549869246939040298}
 --- !u!1 &2017754977799998250
 GameObject:
   m_ObjectHideFlags: 0
@@ -87503,20 +87518,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!64 &8878036156543449481
-MeshCollider:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1549869246939040298}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 0
-  m_CookingOptions: 30
-  m_Mesh: {fileID: -2100243942497823721, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
 --- !u!1 &7591557306564037293
 GameObject:
   m_ObjectHideFlags: 0
@@ -111772,7 +111773,7 @@ MonoBehaviour:
   cachedMesh: {fileID: -7011429734207973542, guid: 974688b4bf34a4e4fa5b4833b749d3d7,
     type: 3}
   InvisibleUpdate: 0
-  readable: 1
+  readable: 0
 --- !u!114 &4160006160338906351
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -113354,18 +113355,18 @@ PrefabInstance:
     - {fileID: -1504981713932161579, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
     - {fileID: -5178661895559278292, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
   m_SourcePrefab: {fileID: 100100000, guid: eeac5b70c5baae8478ec17be74426a76, type: 3}
---- !u!4 &8582674605568793740 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: eeac5b70c5baae8478ec17be74426a76,
-    type: 3}
-  m_PrefabInstance: {fileID: 3630321150668060566}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &4701917217898851999 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: eeac5b70c5baae8478ec17be74426a76,
     type: 3}
   m_PrefabInstance: {fileID: 3630321150668060566}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &8582674605568793740 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: eeac5b70c5baae8478ec17be74426a76,
+    type: 3}
+  m_PrefabInstance: {fileID: 3630321150668060566}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &6405417076783468548
 PrefabInstance:
   m_ObjectHideFlags: 0

Storage/Assets/Res/Levels/Level8.prefab

@@ -14575,6 +14575,7 @@ MonoBehaviour:
   m_rotateSpeed: 1.5
   m_parent: {fileID: 3242446049856155242}
   m_animator: {fileID: 2843108052282128534}
+  m_pushObj: {fileID: 0}
 --- !u!1 &1542969949887770052
 GameObject:
   m_ObjectHideFlags: 0
@@ -19399,6 +19400,20 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 112
   m_CollisionDetection: 3
+--- !u!64 &218733972402938279
+MeshCollider:
+  m_ObjectHideFlags: 10
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1836285497934110341}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 5673484455713311591, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
 --- !u!114 &1441938100223409250
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -19441,20 +19456,6 @@ MonoBehaviour:
   m_material: {fileID: 0}
   m_showColliders: 0
   m_colliderAsset: {fileID: 11400000, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
---- !u!64 &218733972402938279
-MeshCollider:
-  m_ObjectHideFlags: 10
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1836285497934110341}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 5673484455713311591, guid: 93a0efc913d12ac46b7c21c9b953d386, type: 2}
 --- !u!1 &1843368597236988458
 GameObject:
   m_ObjectHideFlags: 0
@@ -67818,7 +67819,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5244471681496118822}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_Children:
@@ -67829,7 +67830,7 @@ Transform:
   - {fileID: 3242446049856155242}
   m_Father: {fileID: 5143472178291914392}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
 --- !u!95 &2843108052282128534
 Animator:
   serializedVersion: 3

Storage/Assets/Res/Levels/Level9.prefab

@@ -33591,6 +33591,7 @@ MonoBehaviour:
   m_rotateSpeed: 1.5
   m_parent: {fileID: 3213739765037777080}
   m_animator: {fileID: 157537422146586657}
+  m_pushObj: {fileID: 0}
 --- !u!1 &3458547271904174591
 GameObject:
   m_ObjectHideFlags: 0
@@ -57800,18 +57801,20 @@ Rigidbody:
   m_Interpolate: 0
   m_Constraints: 112
   m_CollisionDetection: 3
---- !u!114 &7395948471543289605
-MonoBehaviour:
-  m_ObjectHideFlags: 0
+--- !u!64 &1923886939358369826
+MeshCollider:
+  m_ObjectHideFlags: 10
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4869330585920949664}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
   m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
+  serializedVersion: 4
+  m_Convex: 1
+  m_CookingOptions: 30
+  m_Mesh: {fileID: 7554385752148729925, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
 --- !u!114 &4294279012535693393
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -57842,20 +57845,18 @@ MonoBehaviour:
   m_material: {fileID: 0}
   m_showColliders: 0
   m_colliderAsset: {fileID: 11400000, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
---- !u!64 &1923886939358369826
-MeshCollider:
-  m_ObjectHideFlags: 10
+--- !u!114 &7395948471543289605
+MonoBehaviour:
+  m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4869330585920949664}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 4
-  m_Convex: 1
-  m_CookingOptions: 30
-  m_Mesh: {fileID: 7554385752148729925, guid: e1a06ba52681e2b4e8a5ff37f6b9d5ee, type: 2}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 520f5f544cbbabf49ab2841d0b218734, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &4940665392295981882
 GameObject:
   m_ObjectHideFlags: 0
@@ -62874,7 +62875,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5930954319460512190}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
   m_Children:
@@ -62885,7 +62886,7 @@ Transform:
   - {fileID: 2005704845593694761}
   m_Father: {fileID: 4179803106819375027}
   m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
 --- !u!95 &157537422146586657
 Animator:
   serializedVersion: 3