修改关卡预制体

Storage/Assembly-CSharp.csproj

@@ -343,15 +343,18 @@
     <None Include="Assets\#E1_Plugins\MegaFiers\Mega-Fiers\ReadMe.txt" />
     <None Include="Assets\#D2_Shaders\CustomLightingToon.shader" />
     <None Include="Assets\#D1_Effects\Epic Toon FX\Prefabs\Environment\Environment FX.txt" />
+    <None Include="Assets\#C1_Models\PolygonPrototype\Shaders\Prototype_Glass_Global.shader" />
     <None Include="Assets\#D1_Effects\Epic Toon FX\Prefabs\Combat\Combat FX.txt" />
     <None Include="Assets\#D2_Shaders\Shaders 2.0\Rim Lighting.shader" />
     <None Include="Assets\#D2_Shaders\RimShader.shader" />
+    <None Include="Assets\#C1_Models\PolygonPrototype\Shaders\Prototype_Object.shader" />
     <None Include="Assets\#D2_Shaders\Water.shader" />
     <None Include="Assets\Demigiant\readme_DOTweenPro.txt" />
     <None Include="Assets\#D2_Shaders\Shaders 2.0\Rim Alpha.shader" />
     <None Include="Assets\#A2_Scripts\项目文件说明文档.txt" />
     <None Include="Assets\#C1_Models\PolygonKids\Shaders\POLYGON_Zombies.shader" />
     <None Include="Assets\#D2_Shaders\Shaders 2.0\Regular.shader" />
+    <None Include="Assets\#C1_Models\PolygonPrototype\Shaders\Prototype_Global.shader" />
     <None Include="Assets\#D2_Shaders\BlockTextrue.shader" />
     <None Include="Assets\#D1_Effects\Epic Toon FX\Prefabs\Interactive\Interactive FX.txt" />
     <None Include="Assets\#D2_Shaders\LiquidBottle.shader" />
@@ -361,6 +364,7 @@
     <None Include="Assets\#D2_Shaders\moveLight 1.shader" />
     <None Include="Assets\#D2_Shaders\Shaders 2.0\Rim Outline.shader" />
     <None Include="Assets\Demigiant\DOTween\readme.txt" />
+    <None Include="Assets\#C1_Models\PolygonPrototype\Shaders\Prototype_Glass_Object.shader" />
     <None Include="Assets\unity3d.txt" />
     <None Include="Assets\#D2_Shaders\CustomCartoons.shader" />
     <Reference Include="UnityEngine">

Storage/Assets/#A2_Scripts/Enum/LevelEnum.cs

@@ -11,6 +11,9 @@ public class LevelEnum
         fourLevel,
         fiveLevel,
         sixLevel,
+        sevenLevel,
+        eightLevel,
+        nineLevel,
     }
     public static int levelOneIndex => (int)LevelIndexEnum.oneLevel;
     public static int levelTwoIndex => (int)LevelIndexEnum.towLevel;
@@ -18,4 +21,7 @@ public class LevelEnum
     public static int levelFourIndex => (int)LevelIndexEnum.fourLevel;
     public static int levelFiveIndex => (int)LevelIndexEnum.fiveLevel;
     public static int levelSixIndex => (int)LevelIndexEnum.sixLevel;
+    public static int levelSevenIndex => (int)LevelIndexEnum.sevenLevel;
+    public static int levelEightIndex => (int)LevelIndexEnum.eightLevel;
+    public static int levelNineIndex => (int)LevelIndexEnum.nineLevel;
 }

Storage/Assets/#A2_Scripts/Level/LevelCtrl.cs

@@ -10,10 +10,10 @@ using UnityEngine.Profiling;
 public class LevelCtrl : MonoBehaviour
 {
 
-    public ChainView m_chainView;//爪钩view
-    public ChainRopeView m_chainRopeView;//娃娃机爪钩
+    private ChainView m_chainView;//爪钩view
+    private ChainRopeView m_chainRopeView;//娃娃机爪钩
     public Camera m_camera;
-    public CarView m_carView;//车
+    private CarView m_carView;//车
     public StorageView m_storageView;
     //public TargetView m_targetView;//触发器
     public ChainView chainView => m_chainView;

Storage/Assets/#A2_Scripts/Services/GlobalConfig.cs

@@ -34,6 +34,50 @@ public class GlobalConfig
 
 
     public static float CanvaUIScaleX = BattleCtrl.instance.battleUI.gameObject.transform.localScale.x;//uicanva适配大小
+
+
+    //通过当前关卡返回总的数量
+    public static int TotalNum()
+    {
+        int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
+        int num = 0;
+        if(varLevel == LevelEnum.levelOneIndex)
+        {
+            num = 3;
+        }
+        else if(varLevel == LevelEnum.levelTwoIndex || varLevel == LevelEnum.levelThreeIndex
+            || varLevel == LevelEnum.levelFourIndex || varLevel == LevelEnum.levelFiveIndex)
+        {
+            num = 4;
+        }
+        else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex
+            || varLevel == LevelEnum.levelEightIndex || varLevel == LevelEnum.levelNineIndex)
+        {
+            num = 6;
+        }
+        return num;
+    }
+    //通过当前关卡返回盒子高度
+    public static float BoxHeight()
+    {
+        int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
+        float varHeight = 0;
+        if (varLevel == LevelEnum.levelOneIndex
+            || varLevel == LevelEnum.levelFourIndex || varLevel == LevelEnum.levelFiveIndex
+            || varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
+        {
+            varHeight = 1.1f;
+        }
+        else if (varLevel == LevelEnum.levelTwoIndex || varLevel == LevelEnum.levelThreeIndex)
+        {
+            varHeight = 1.8f;
+        }
+        else if (varLevel == LevelEnum.levelEightIndex || varLevel == LevelEnum.levelNineIndex)
+        {
+            varHeight = 4.0f;
+        }
+        return varHeight;
+    }
 }
 
 public enum LangeType

Storage/Assets/Res/Levels/Level4.prefab

@@ -52540,7 +52540,7 @@ GameObject:
   - component: {fileID: 1686006853241719565}
   - component: {fileID: 1411365057041450796}
   m_Layer: 0
-  m_Name: Level1
+  m_Name: Level4
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -52577,12 +52577,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ceb21212bec2e9541b2306de7f6baba0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_chainView: {fileID: 0}
-  m_chainRopeView: {fileID: 0}
   m_camera: {fileID: 1686006852630990541}
-  m_carView: {fileID: 0}
   m_storageView: {fileID: 5512450211701749961}
-  curLevelIndex: 0
+  curLevelIndex: 3
 --- !u!1 &1686006853777943203
 GameObject:
   m_ObjectHideFlags: 0
@@ -81677,6 +81674,7 @@ MonoBehaviour:
   m_planeObj: {fileID: 7401041434687572437}
   m_fixedTrans: {fileID: 0}
   m_rotateSpeed: 1.5
+  m_parent: {fileID: 1243971526296356416}
 --- !u!65 &2933638863570084076
 BoxCollider:
   m_ObjectHideFlags: 0

Storage/Assets/Res/Levels/Level5.prefab

@@ -19834,6 +19834,7 @@ MonoBehaviour:
   m_planeObj: {fileID: 1125055352834747768}
   m_fixedTrans: {fileID: 3626798845874155703}
   m_rotateSpeed: 1.5
+  m_parent: {fileID: 8676819762422325997}
 --- !u!65 &4728596101341234241
 BoxCollider:
   m_ObjectHideFlags: 0
@@ -119129,7 +119130,7 @@ GameObject:
   - component: {fileID: 9100893407295123360}
   - component: {fileID: 8844811367371711361}
   m_Layer: 0
-  m_Name: Level2
+  m_Name: Level5
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -119166,12 +119167,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ceb21212bec2e9541b2306de7f6baba0, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_chainView: {fileID: 0}
-  m_chainRopeView: {fileID: 0}
   m_camera: {fileID: 9100893406668532320}
-  m_carView: {fileID: 0}
   m_storageView: {fileID: 2713718237360528484}
-  curLevelIndex: 1
+  curLevelIndex: 4
 --- !u!1 &9100893407832903182
 GameObject:
   m_ObjectHideFlags: 0