整合动画

Storage/Assets/#A2_Scripts/Battle/UI/BattleUI.cs

@@ -335,7 +335,7 @@ public class BattleUI : MonoBehaviour
         StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
         if(varView)
         {
-            varView.SetRigidBodyState();
+            varView.SetResultAnimator(m_bResult);
         }
     }
     //设置take按钮状态

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

@@ -38,6 +38,7 @@ public class StorageView : MonoBehaviour
     private Vector3 m_hitBoxPoint = Vector3.zero;//碰到箱子的点
     private bool m_bControlCollisionBox = true;
     private int m_insideBoxNum = 0;
+    private Animator m_animator;
     // Start is called before the first frame update
     void Start()
     {
@@ -53,6 +54,7 @@ public class StorageView : MonoBehaviour
         }
         m_camera = Camera.main;
         GameServices.inputService.pad.onTouchUp += OnTouchUp;
+        m_animator = GetComponent<Animator>();
     }
     void CancelInvoke()
     {
@@ -177,13 +179,21 @@ public class StorageView : MonoBehaviour
             m_curTargetTrans.transform.Rotate(transform.up, 1.0f);
         }
     }
-    //设置刚体状态
-    public void SetRigidBodyState()
+    //设置结果动画
+    public void SetResultAnimator(bool value)
+    {
+        if(value)
         {
             for (int i = 0; i < m_targetTrans.Length; i++)
             {
                 m_targetTrans[i].GetComponent<Rigidbody>().isKinematic = true;
             }
+            m_animator.Play("成功动画");
+        }
+        else
+        {
+            m_animator.Play("失败");
+        }
     }
     void Update()
     {
@@ -208,6 +218,7 @@ public class StorageView : MonoBehaviour
                     float varX = (Input.mousePosition.x - Screen.width / 2f) / (Screen.width / GlobalConfig.NormalWidth);
                     float varY = (Input.mousePosition.y - Screen.height / 2f) / (Screen.width / GlobalConfig.NormalWidth);
                     BattleCtrl.instance.battleUI.SetSymbolPos(varX, varY);
+                    m_curTargetTrans.transform.localScale = Vector3.Lerp(m_curTargetTrans.transform.localScale,Vector3.one*10,0.2f);
                 }
             }
         }
@@ -263,8 +274,11 @@ public class StorageView : MonoBehaviour
         }
         if (m_bIsHitTarget)
         {
-            m_camera.transform.position = Vector3.Lerp(m_camera.transform.position, m_cameraTargetPos, 0.2f);
-            m_camera.transform.rotation = Quaternion.Lerp(m_camera.transform.rotation, m_cameraTargetRotate, 0.2f);
+            m_bIsHitTarget = false;
+            m_animator.enabled = true;
+            Invoke("SetTargetParent", 1.0f);
+            //m_camera.transform.position = Vector3.Lerp(m_camera.transform.position, m_cameraTargetPos, 0.2f);
+            //m_camera.transform.rotation = Quaternion.Lerp(m_camera.transform.rotation, m_cameraTargetRotate, 0.2f);
         }
         for (int i = 0; i < m_targetTrans.Length; i++)
         {
@@ -277,6 +291,11 @@ public class StorageView : MonoBehaviour
         }
         //UpdateExitBox();
     }
+    //设置父节点
+    void SetTargetParent()
+    {
+        m_targetParentTrans.SetParent(transform.GetChild(0));
+    }
     // 抬起回调
     void OnTouchUp()
     {

Storage/Assets/#B2_Graphics.meta

+fileFormatVersion: 2
+guid: 317d19313d1d7204e9bbc37122116e7f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Storage/Assets/#C2_Animations/ShowBox/失败.anim

@@ -448,7 +448,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

Storage/Assets/#C2_Animations/ShowBox/开始.anim

@@ -68,7 +68,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

Storage/Assets/#C2_Animations/ShowBox/成功.anim

@@ -510,7 +510,7 @@ AnimationClip:
     m_Level: 0
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
-    m_LoopTime: 1
+    m_LoopTime: 0
     m_LoopBlend: 0
     m_LoopBlendOrientation: 0
     m_LoopBlendPositionY: 0

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

@@ -27,7 +27,7 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 2201674354850670455}
+  m_DefaultState: {fileID: 7978185253963228048}
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0

Storage/Assets/#Z1_Tabs.meta

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

Storage/Assets/#Z2_Documents.meta

+fileFormatVersion: 2
+guid: 325c11e064841204bbd6de7c85bebef6
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Storage/Assets/#Z3_WebAPI.meta

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

Storage/Assets/#Z4_Icons.meta

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

Storage/Assets/#Z4_Previews.meta

+fileFormatVersion: 2
+guid: 55c4962f2a6593c4b9c1bb6003b1ff08
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Storage/Assets/Res/Levels/Level1.prefab

@@ -217,7 +217,7 @@ Camera:
   m_Enabled: 1
   serializedVersion: 2
   m_ClearFlags: 2
-  m_BackGroundColor: {r: 0.52954787, g: 0.9433962, b: 0.6559733, a: 0.019607844}
+  m_BackGroundColor: {r: 0.3135903, g: 0.764151, b: 0.4496086, a: 0.019607844}
   m_projectionMatrixMode: 1
   m_GateFitMode: 2
   m_FOVAxisMode: 0
@@ -867,7 +867,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5438490885440523106}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1.36, y: 1.18, z: 0.4}
@@ -1747,15 +1747,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 2d6d15b5004c7974f9d93c34e2469371, type: 3}
       propertyPath: m_LocalScale.x
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 2d6d15b5004c7974f9d93c34e2469371, type: 3}
       propertyPath: m_LocalScale.y
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 2d6d15b5004c7974f9d93c34e2469371, type: 3}
       propertyPath: m_LocalScale.z
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400002, guid: 2d6d15b5004c7974f9d93c34e2469371, type: 3}
       propertyPath: m_LocalRotation.x
@@ -1876,15 +1876,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalScale.x
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalScale.y
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalScale.z
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 2300000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_Materials.Array.data[0]
@@ -1969,15 +1969,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 49bd86e2cfdb81d458813d8609a06235, type: 3}
       propertyPath: m_LocalScale.x
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 49bd86e2cfdb81d458813d8609a06235, type: 3}
       propertyPath: m_LocalScale.y
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: 49bd86e2cfdb81d458813d8609a06235, type: 3}
       propertyPath: m_LocalScale.z
-      value: 10
+      value: 8
       objectReference: {fileID: 0}
     - target: {fileID: 2300000, guid: 49bd86e2cfdb81d458813d8609a06235, type: 3}
       propertyPath: m_Materials.Array.data[0]

Storage/Assets/Res/Levels/Level2.prefab

@@ -396,7 +396,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2472580358520713167}
-  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.1, z: -0.42}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
@@ -404,7 +404,7 @@ Transform:
   - {fileID: 5743554440857701011}
   m_Father: {fileID: 9100893407832903181}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
 --- !u!114 &2713718237360528484
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -454,7 +454,7 @@ BoxCollider:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2472580358520713167}
   m_Material: {fileID: 0}
-  m_IsTrigger: 0
+  m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
   m_Size: {x: 1.36, y: 1.18, z: 0.4}
@@ -493,7 +493,7 @@ Animator:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2472580358520713167}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: c0dcfa5de078fe04c94ac421ee1aa18b, type: 2}
   m_CullingMode: 0
@@ -513,7 +513,7 @@ MeshCollider:
   m_GameObject: {fileID: 2774092466441058996}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 0
+  m_Enabled: 1
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -527,7 +527,7 @@ BoxCollider:
   m_GameObject: {fileID: 2774092466441058996}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 3.49, y: 1.18, z: 0.18}
   m_Center: {x: 0, y: 0.24, z: 1.89}
@@ -540,7 +540,7 @@ BoxCollider:
   m_GameObject: {fileID: 2774092466441058996}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 1.36, y: 1.18, z: 0.4}
   m_Center: {x: 0, y: 0.24, z: -2.38}
@@ -566,7 +566,7 @@ BoxCollider:
   m_GameObject: {fileID: 2774092466441058996}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 0.18, y: 1.18, z: 3.49}
   m_Center: {x: 1.93, y: 0.24, z: 0}
@@ -579,7 +579,7 @@ BoxCollider:
   m_GameObject: {fileID: 2774092466441058996}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 2
   m_Size: {x: 3.49, y: 1.18, z: 0.18}
   m_Center: {x: 0, y: 0.24, z: -1.89}
@@ -642,7 +642,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3345215856749858857
 Transform:
   m_ObjectHideFlags: 0
@@ -5398,7 +5398,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3345215857500625458
 Transform:
   m_ObjectHideFlags: 0
@@ -10164,7 +10164,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3473543474185922720}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.88, z: 0.08}
+  m_LocalPosition: {x: 0, y: 0.88, z: -0.46}
   m_LocalScale: {x: 3, y: 2, z: 3}
   m_Children: []
   m_Father: {fileID: 49667949129306736}
@@ -15328,14 +15328,14 @@ Rigidbody:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5989328207809631358}
   serializedVersion: 2
-  m_Mass: 1
+  m_Mass: 2
   m_Drag: 0
   m_AngularDrag: 0.05
   m_UseGravity: 1
   m_IsKinematic: 0
   m_Interpolate: 0
   m_Constraints: 112
-  m_CollisionDetection: 0
+  m_CollisionDetection: 3
 --- !u!64 &1705134452893876212
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -15542,6 +15542,20 @@ PlayableDirector:
     value: {fileID: 3345215856749858838}
   m_ExposedReferences:
     m_References: []
+--- !u!64 &8226036011998857033
+MeshCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6782243094312826536}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 4
+  m_Convex: 0
+  m_CookingOptions: 30
+  m_Mesh: {fileID: -7011429734207973542, guid: a0da0ed1414c2804988bea365cf06a82, type: 3}
 --- !u!1 &7498688766740695151
 GameObject:
   m_ObjectHideFlags: 0
@@ -17267,6 +17281,12 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 4400286579866470903}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6782243094312826536 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 7138112490818289503, guid: a0da0ed1414c2804988bea365cf06a82,
+    type: 3}
+  m_PrefabInstance: {fileID: 4400286579866470903}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5007168110086149445
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -17966,23 +17986,23 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -1.07
+      value: -1.04
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 0.3602846
+      value: 0.37
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalPosition.z
-      value: -4.67
+      value: -4.26
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0.9130763
+      value: 0.97719413
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalRotation.z
@@ -17990,7 +18010,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalRotation.w
-      value: -0.40778884
+      value: -0.21234825
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_RootOrder
@@ -18002,7 +18022,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 228.13199
+      value: 204.52
       objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
@@ -18026,15 +18046,15 @@ PrefabInstance:
       objectReference: {fileID: 2100000, guid: 823ac0e34852f1946b70b81aa0a7763c, type: 2}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ae2f75a4966658e468029b815a0bd3ac, type: 3}
---- !u!1 &5989328207809631358 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 100000, guid: ae2f75a4966658e468029b815a0bd3ac,
-    type: 3}
-  m_PrefabInstance: {fileID: 5989328207809729246}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &5989328207810119774 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 400000, guid: ae2f75a4966658e468029b815a0bd3ac,
     type: 3}
   m_PrefabInstance: {fileID: 5989328207809729246}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &5989328207809631358 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 100000, guid: ae2f75a4966658e468029b815a0bd3ac,
+    type: 3}
+  m_PrefabInstance: {fileID: 5989328207809729246}
+  m_PrefabAsset: {fileID: 0}

Storage/Storage.sln

 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2015
+# Visual Studio 15
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{83355358-96AD-9FBF-E5C0-19A3B1543F57}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-Editor", "Assembly-CSharp-Editor.csproj", "{7B06F993-FB77-FDFE-BFE7-A14136B23707}"