修改代码

Storage/Assets/#A1_Scenes/DemoScenes.unity

@@ -290,7 +290,6 @@ GameObject:
   - component: {fileID: 1872965181}
   - component: {fileID: 1872965183}
   - component: {fileID: 1872965182}
-  - component: {fileID: 1872965184}
   m_Layer: 0
   m_Name: GameServices
   m_TagString: Untagged
@@ -337,22 +336,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ff376a18ea419e546ba78667f1b5c6b3, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!114 &1872965184
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1872965180}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: edb0d13b66926534795d037f8ffc70e4, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_bombEffectObj: {fileID: 1700217648693119091, guid: c8e49c3b7567ba44c9434bbb6049f364,
-    type: 3}
-  m_rayfireBombObj: {fileID: 7079061562166580387, guid: 6494bd2f9be30d54ab414db21e0d1beb,
-    type: 3}
 --- !u!114 &6598198701804661606 stripped
 MonoBehaviour:
   m_CorrespondingSourceObject: {fileID: 6064464677632144694, guid: 919382978f5e2684ba83e6daf6491458,
@@ -389,11 +372,6 @@ 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/#A2_Scripts/Battle/Collision/TargetCollision.cs

@@ -5,21 +5,48 @@ using UnityEngine;
 public class TargetCollision : MonoBehaviour
 {
     private bool m_bControl = true;
+    private Vector3 m_hitPoint = Vector3.zero;
     private void OnCollisionEnter(Collision other)
     {
-        if (other.collider.gameObject.CompareTag("Target") && m_bControl)
+        if (other.collider.gameObject.CompareTag("Target"))
+        {
+            StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+            if(varView && varView.curTargetTrans &&
+                !string.Equals(varView.curTargetTrans.name, other.collider.name) && m_bControl)
             {
                 m_bControl = false;
-            BattleCtrl.instance.levelManager.curLevel.storageView.SetTargetCollison(transform, true);
+                varView.SetTargetCollison(other.collider.transform, true);
+            }
         }
     }
     private void OnCollisionExit(Collision other)
     {
-        if (other.collider.gameObject.CompareTag("Target") && !m_bControl)
+        if (other.collider.gameObject.CompareTag("Target"))
+        {
+            StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+            if (varView && varView.curTargetTrans &&
+                !string.Equals(varView.curTargetTrans.name, other.collider.name) && !m_bControl)
             {
                 m_bControl = true;
-            MeshCollider varBox = other.collider.gameObject.GetComponent<MeshCollider>();
-            BattleCtrl.instance.levelManager.curLevel.storageView.SetTargetCollison(transform, false);
+                m_hitPoint = other.collider.ClosestPoint(other.transform.position);
+            }
+        }
+    }
+    //退出箱子碰到处理
+    void UpdateExitBox()
+    {
+        if (m_bControl && m_hitPoint != Vector3.zero)
+        {
+            StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+            if (varView.curTargetTrans && Vector3.SqrMagnitude(varView.curTargetTrans.transform.position - m_hitPoint) >= 3.0f)
+            {
+                m_hitPoint = Vector3.zero;
+                varView.SetTargetCollison(null, false);
             }
         }
+    }
+    private void Update()
+    {
+        //UpdateExitBox();
+    }
 }

Storage/Assets/#A2_Scripts/Battle/Trigger/FirstLevelTrigger.cs

@@ -5,70 +5,29 @@ using UnityEngine;
 
 public class FirstLevelTrigger : MonoBehaviour
 {
-    //public Transform m_targetTrans;
-    //private Vector3 m_pos = new Vector3(0, 5.2f, 0);
-    //private Quaternion m_rotation = Quaternion.identity;
-
-    //private void OnTriggerEnter(Collider other)
-    //{
-    //    if (other.gameObject.CompareTag("Target"))
-    //    {
-    //        BattleCtrl.instance.levelManager.curLevel.chainRopeView.CatchObjEnterTarget();
-    //        BattleCtrl.instance.OnBattleWin();
-    //        m_targetTrans.localPosition = m_pos;
-    //        m_targetTrans.localRotation = m_rotation;
-    //    }
-    //}
-    //public Transform m_carTrans;
-    //public GameObject m_yellowBodyObj;
-    //public Transform m_playerTrans;
-    //private bool m_bControl = true;
-    //private bool m_bControlPass = true;
-    //private GameObject m_cubeObj;
-    //private void Awake()
-    //{
-    //    m_cubeObj = m_playerTrans.Find("Cube").gameObject;
-    //}
-
-    //private void OnTriggerEnter(Collider other)
-    //{
-    //    if (other.tag == "Final" && m_bControlPass)
-    //    {
-    //        m_bControlPass = false;
-    //        m_yellowBodyObj.gameObject.SetActive(false);
-    //        Invoke("PassLevelAnimation", 3);
-    //    }
-    //}
-
-    //void PassLevelAnimation()
-    //{
-    //    m_carTrans.DOLocalMoveZ(9, 2).SetEase(Ease.Linear).OnComplete(() =>
-    //    {
-    //        BattleCtrl.instance.OnBattleWin();
-    //    });
-    //}
-    //Update is called once per frame
-    //void Update()
-    //{
-    //    if (m_bControl && m_playerTrans.position.y < 5.4f)
-    //    {
-    //        m_cubeObj.SetActive(false);
-    //        m_bControl = false;
-    //    }
-    //}
     private bool m_bControl = true;
+    private List<Collider> m_lst = new List<Collider>();
     private void OnTriggerEnter(Collider other)
     {
-        if (other.gameObject.CompareTag("Player") && m_bControl)
+        if (other.gameObject.CompareTag("Target"))
         {
-            m_bControl = false;
-            if (BattleCtrl.instance.levelManager.curLevel.carView.GetLeftBoxNum() > 0)
+            StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+            if(!m_lst.Contains(other))
             {
-                BattleCtrl.instance.OnBattleWin();
+                varView.InsideBox(other);
+                m_lst.Add(other);
+            }
         }
-            else
+    }
+    private void OnTriggerExit(Collider other)
+    {
+        if (other.gameObject.CompareTag("Target"))
+        {
+            StorageView varView = BattleCtrl.instance.levelManager.curLevel.storageView;
+            if (m_lst.Contains(other))
             {
-                BattleCtrl.instance.OnBattleFail();
+                varView.ExitBox();
+                m_lst.Remove(other);
             }
         }
     }

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

@@ -38,6 +38,7 @@ public class BattleUI : MonoBehaviour
     public GameObject[] m_boomUIS;//爆炸Ui
     public Button m_boomBtn;//炸弹按钮
     public GameObject m_symbolObj;//十字架图标
+    public GameObject m_takeBtnObj;//take按钮
     public Action onStartBtn;
     public Action onPosUpBtn;
     public Action onPosDownBtn;
@@ -317,4 +318,14 @@ public class BattleUI : MonoBehaviour
         varVec2.y = y;
         m_symbolObj.transform.localPosition = varVec2;
     }
+    //take按钮
+    public void OnClickTakeBtn()
+    {
+
+    }
+    //设置take按钮状态
+    public void SetTakeBtnState(bool value)
+    {
+        m_takeBtnObj.SetActive(value);
+    }
 }

Storage/Assets/#A3_Prefabs/BattleUI.prefab

@@ -9209,6 +9209,84 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!1 &5881563048680123161
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6141748135306032743}
+  - component: {fileID: 3275270187392914165}
+  - component: {fileID: 6174521463047810065}
+  m_Layer: 5
+  m_Name: Text
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6141748135306032743
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5881563048680123161}
+  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_Children: []
+  m_Father: {fileID: 824464444758788978}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3275270187392914165
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5881563048680123161}
+  m_CullTransparentMesh: 0
+--- !u!114 &6174521463047810065
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5881563048680123161}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.5764706, g: 0.57254905, b: 0.57254905, a: 1}
+  m_RaycastTarget: 0
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: dca7afcde023a8a4a8aa8debbdbd5427, type: 3}
+    m_FontSize: 50
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 5
+    m_MaxSize: 50
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: take
 --- !u!1 &5927221786089016403
 GameObject:
   m_ObjectHideFlags: 0
@@ -9369,6 +9447,7 @@ RectTransform:
   - {fileID: 7990636835775695375}
   - {fileID: 9107797946881246061}
   - {fileID: 6109125632920290557}
+  - {fileID: 824464444758788978}
   m_Father: {fileID: 6064464677632144690}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11329,6 +11408,7 @@ MonoBehaviour:
   - {fileID: 4698874706327749044}
   m_boomBtn: {fileID: 3314642096669198153}
   m_symbolObj: {fileID: 8615814293053379064}
+  m_takeBtnObj: {fileID: 7938503036084442980}
 --- !u!114 &1995691973
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -13091,6 +13171,136 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 0
+--- !u!1 &7938503036084442980
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 824464444758788978}
+  - component: {fileID: 6955487854264395609}
+  - component: {fileID: 809426388673241357}
+  - component: {fileID: 5059922042648412219}
+  m_Layer: 5
+  m_Name: TakeButton
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &824464444758788978
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7938503036084442980}
+  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_Children:
+  - {fileID: 6141748135306032743}
+  m_Father: {fileID: 6064464676328073067}
+  m_RootOrder: 14
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0}
+  m_AnchorMax: {x: 0.5, y: 0}
+  m_AnchoredPosition: {x: 0, y: 61}
+  m_SizeDelta: {x: 220, y: 234}
+  m_Pivot: {x: 0.5, y: 0}
+--- !u!222 &6955487854264395609
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7938503036084442980}
+  m_CullTransparentMesh: 0
+--- !u!114 &809426388673241357
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7938503036084442980}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5059922042648412219
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7938503036084442980}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 809426388673241357}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 6064464677632144694}
+        m_MethodName: OnClickTakeBtn
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
 --- !u!1 &7975587463478854421
 GameObject:
   m_ObjectHideFlags: 0

Storage/Assets/#B2_Graphics.meta

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

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/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}"