新增关卡和需求优化

FastMail/Assets/0A1_Scenes/DemoScenes.unity

@@ -165,6 +165,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   levelPrefs:
+  - {fileID: 3637377167929237828, guid: 17d47d2f5e5b83844b03238035998518, type: 3}
   - {fileID: 7648479656126583040, guid: 017d78d673d131144af3ee97fda1bc72, type: 3}
   - {fileID: 4084304606294289247, guid: 0e5a17f94bbcb2340a59faf75fb3c915, type: 3}
   - {fileID: 6864267669485422817, guid: 6d4b86388e4f64a4f9f0aba25b7e6836, type: 3}

FastMail/Assets/0A2_Scripts/Battle/Trigger/LeftClawTrigger.cs

@@ -15,8 +15,8 @@ public class LeftClawTrigger : MonoBehaviour
         if (other.gameObject.CompareTag("Target"))
         {
             //特殊处理，因为碰到的骨骼可能不一样
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex ||
-                BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex ||
+                BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
             {
                 GameObject varObj = other.gameObject.GetComponent<TargetView>().parentTrans.gameObject;
                 BattleCtrl.instance.levelManager.curLevel.chainRopeView.EnterLeftClaw(varObj);

FastMail/Assets/0A2_Scripts/Battle/Trigger/RightClawTrigger.cs

@@ -15,8 +15,8 @@ public class RightClawTrigger : MonoBehaviour
         if (other.gameObject.CompareTag("Target"))
         {
             //特殊处理，因为碰到的骨骼可能不一样
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelTwoIndex ||
-                BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex)
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelThreeIndex ||
+                BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFourIndex)
             {
                 GameObject varObj = other.gameObject.GetComponent<TargetView>().parentTrans.gameObject;
                 BattleCtrl.instance.levelManager.curLevel.chainRopeView.EnterRightClaw(varObj);

FastMail/Assets/0A2_Scripts/Battle/UI/BattleUI.cs

@@ -53,7 +53,7 @@ public class BattleUI : MonoBehaviour
         //m_fieldFarBtn.onClick.AddListener(FieldFarBtn);
         //m_fieldNearBtn.onClick.AddListener(FieldNearBtn);
         GameServices.audioServices.PlayBgm(GameServices.configService.audioConfig.GameBgm);
-        GameServices.configService.playerConfig.ClawMoveSpeed = 0.8f;//开始默认值
+        GameServices.configService.playerConfig.ClawMoveSpeed = 0.4f;//开始默认值
     }
     void SetDragMode()
     {

FastMail/Assets/0A2_Scripts/Battle/View/ChainRopeView.cs

@@ -446,7 +446,7 @@ public class ChainRopeView : MonoBehaviour
             m_targetView.SetColliderSuccessTarget();
             m_targetView = null;
             //特殊处理
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
             {
                 onBalloonEnterTarget?.Invoke();
                 onBalloonEnterSuccessTarget?.Invoke();
@@ -458,7 +458,7 @@ public class ChainRopeView : MonoBehaviour
     {
         TouchUpEnd();
         //特殊处理
-        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
+        if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
         {
             onBalloonEnterGround?.Invoke();
         }
@@ -752,7 +752,7 @@ public class ChainRopeView : MonoBehaviour
             m_bCatchTouchUp = false;
             m_targetView.DestroyRigidBody(m_rigidBody);
             //特殊处理
-            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
+            if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
             {
                 onBalloonEnterTarget?.Invoke();
             }

FastMail/Assets/0A2_Scripts/Battle/View/TargetView.cs

@@ -82,7 +82,7 @@ public class TargetView : MonoBehaviour
             for (int i = 0; i < varTrans.Length; i++)
             {
                 //第五关特殊处理，抓住之后layer不需要碰撞
-                if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
+                if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
                 {
                     varTrans[i].gameObject.layer = 8;
                 }
@@ -135,7 +135,7 @@ public class TargetView : MonoBehaviour
                 m_rigidBody = gameObject.AddComponent<Rigidbody>();
 
                 //特殊处理，第五关气球特殊处理
-                if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelFiveIndex)
+                if (BattleCtrl.instance.levelManager.CurLevelIndex == LevelEnum.levelSixIndex)
                 {
                     m_rigidBody.useGravity = false;
                     m_rigidBody.constraints = RigidbodyConstraints.FreezePositionX | RigidbodyConstraints.FreezePositionZ |
@@ -184,7 +184,8 @@ public class TargetView : MonoBehaviour
             || string.Equals(gameObject.name, GameServices.configService.levelConfig.fifthLevelGoalName1)
             || string.Equals(gameObject.name, GameServices.configService.levelConfig.fifthLevelGoalName2)
             || string.Equals(gameObject.name, GameServices.configService.levelConfig.fifthLevelGoalName3)
-            || string.Equals(gameObject.name, GameServices.configService.levelConfig.sixthLevelGoalName);
+            || string.Equals(gameObject.name, GameServices.configService.levelConfig.sixthLevelGoalName)
+            || string.Equals(gameObject.name, GameServices.configService.levelConfig.seventhLevelGoalName);
     }
     private void Update()
     {

FastMail/Assets/0A2_Scripts/Enum/LevelEnum.cs

@@ -10,10 +10,12 @@ public class LevelEnum
         threeLevel,
         fourLevel,
         fiveLevel,
+        sixLevel,
     }
     public static int levelOneIndex => (int)LevelIndexEnum.oneLevel;
     public static int levelTwoIndex => (int)LevelIndexEnum.towLevel;
     public static int levelThreeIndex => (int)LevelIndexEnum.threeLevel;
     public static int levelFourIndex => (int)LevelIndexEnum.fourLevel;
     public static int levelFiveIndex => (int)LevelIndexEnum.fiveLevel;
+    public static int levelSixIndex => (int)LevelIndexEnum.sixLevel;
 }

FastMail/Assets/0A2_Scripts/Services/BattleConfig.cs

@@ -83,6 +83,8 @@ public class LevelConfig
     public string fifthLevelGoalName3 = "SM_Primitive_Sphere_02";
     [Header("第六关目标名称")]
     public string sixthLevelGoalName = "SM_Primitive_Pyramid_01";
+    [Header("第七关目标名称")]
+    public string seventhLevelGoalName = "SM_Primitive_Cube_04 (1)";
 }
 [Serializable]
 public class AudioConfig

FastMail/Assets/0A3_Prefabs/BattleUI.prefab

@@ -1127,7 +1127,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &7990636835775695375
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1511,7 +1511,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2474524826504723085
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1659,7 +1659,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2824622350015635226
 RectTransform:
   m_ObjectHideFlags: 0
@@ -4297,7 +4297,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &6020807040361613247
 RectTransform:
   m_ObjectHideFlags: 0
@@ -7319,7 +7319,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: '?'
+  m_Text: 7
 --- !u!1 &6020807041533965610
 GameObject:
   m_ObjectHideFlags: 0
@@ -11564,6 +11564,8 @@ GameObject:
   - component: {fileID: 6064464677866441004}
   - component: {fileID: 6064464677866441006}
   - component: {fileID: 6064464677866441005}
+  - component: {fileID: 2656687428046891388}
+  - component: {fileID: 996895475291153384}
   m_Layer: 5
   m_Name: Case (7)
   m_TagString: Untagged
@@ -11622,7 +11624,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: a40909543a92f234399ecd9f72def59d, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03b62a6533b97bf428f151a5820f3ec4, type: 3}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -11632,6 +11634,74 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &2656687428046891388
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6064464677866441003}
+  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: 6064464677866441005}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 996895475291153384}
+        m_MethodName: OnClickLevel
+        m_Mode: 3
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 6
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
+--- !u!114 &996895475291153384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6064464677866441003}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a8ba38326c7546e449f8c538a5c9b48f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_gameBestTime: {fileID: 6020807040361613246}
+  m_level: 6
 --- !u!1 &6064464677995419504
 GameObject:
   m_ObjectHideFlags: 0

FastMail/Assets/Res/Prefabs/Levels/Level4.prefab

@@ -99,6 +99,19 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.13999999, y: 0.4755726, z: 0.31376255}
   m_Center: {x: -0.61, y: -0.36721373, z: 0.044430614}
+--- !u!65 &441077963452909082
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 594364595004000242}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 1
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 0.1, y: 0.3, z: 0.13}
+  m_Center: {x: -0.56, y: -0.46, z: 0.04443061}
 --- !u!65 &1598980543506738139
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -138,18 +151,6 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.05, y: 0.05, z: 0.13}
   m_Center: {x: -0.45, y: -0.89, z: 0.04443061}
---- !u!114 &3357952321133857634
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 594364595004000242}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7352b9d95b7732f42b18521ddd988058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
 --- !u!65 &7284129733352523749
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -176,19 +177,18 @@ BoxCollider:
   serializedVersion: 2
   m_Size: {x: 0.1, y: 0.1, z: 0.13}
   m_Center: {x: -0.56, y: -0.26, z: 0.04443061}
---- !u!65 &441077963452909082
-BoxCollider:
+--- !u!114 &3357952321133857634
+MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 594364595004000242}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 1
   m_Enabled: 1
-  serializedVersion: 2
-  m_Size: {x: 0.1, y: 0.3, z: 0.13}
-  m_Center: {x: -0.56, y: -0.46, z: 0.04443061}
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7352b9d95b7732f42b18521ddd988058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!64 &2070327823639923834
 MeshCollider:
   m_ObjectHideFlags: 0
@@ -1623,7 +1623,7 @@ MeshCollider:
   m_GameObject: {fileID: 4302667697878385617}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
-  m_Enabled: 1
+  m_Enabled: 0
   serializedVersion: 4
   m_Convex: 0
   m_CookingOptions: 30
@@ -3561,7 +3561,7 @@ MonoBehaviour:
   m_chainView: {fileID: 7198446250177743246}
   m_chainRopeView: {fileID: 8087320179844999554}
   m_camera: {fileID: 7933939996859291373}
-  curLevelIndex: 3
+  curLevelIndex: 4
 --- !u!1 &7933939997491614226
 GameObject:
   m_ObjectHideFlags: 0
@@ -5687,7 +5687,7 @@ PrefabInstance:
     - target: {fileID: 7121262441108316557, guid: b707501011ea5dd42acc6e60ba1b8529,
         type: 3}
       propertyPath: InitialModule.startSize.scalar
-      value: 1.8
+      value: 2
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b707501011ea5dd42acc6e60ba1b8529, type: 3}