Преглед изворни кода

波次显示错误 出兵间距调整

mengyin пре 2 година
родитељ
комит
7d6d9f2671

+ 3 - 3
Assets/Scene/BattleScenes/YLBattle_Defend.unity

@@ -1651,7 +1651,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 860092402}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 1.11, y: 0, z: -6.66}
+  m_LocalPosition: {x: -1.0500038, y: 0, z: -2.59}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2771,7 +2771,7 @@ PrefabInstance:
     - target: {fileID: 7994792307647346892, guid: 3d40a147a2afc6e41a881d0b448012b4,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 5.44
+      value: 9.83
       objectReference: {fileID: 0}
     - target: {fileID: 7994792307647346892, guid: 3d40a147a2afc6e41a881d0b448012b4,
         type: 3}
@@ -3019,7 +3019,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1456455647}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0.69, y: 0, z: 0.04}
+  m_LocalPosition: {x: 4.2999964, y: 0, z: -2.75}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 0 - 54
Assets/Scripts/Core/Client/NewBattle/BattleFrame/Procedure/ProcedureDefenseEntry.cs

@@ -15,13 +15,11 @@ namespace GameFrameworkYLSJ
     public class ProcedureDefenseEntry : ProcedureBase
     {
         ProcedureOwner _owner;
-        static public int nowWaveIndex = 0;
         sm_cfg_duplicate_defense defenseMo;
         public override void OnEnter(ProcedureOwner procedureOwner)
         {
             base.OnEnter(procedureOwner);
             this._owner = procedureOwner;
-            nowWaveIndex = 0;
             TaskEventProcessor.Instance.Init();
             GameDateManager.Instance.lastBattleType = BattleDefine.EBattleSceneType.EBattleType_Defense;
             sm_gate gateInfo = sm_gate.GetMoById(UserProxy.Instance.player.newMap.curMapId);
@@ -36,17 +34,8 @@ namespace GameFrameworkYLSJ
             UI_BaseMainWindow.Instance().SetDefenseWindow(true, tips);
             UI_BaseMainWindow.Instance().SetDefenseEscapeNum(0, defenseMo.escapeNum);
             LogHelper.Log("ProcedureNoviceGuideEntry");
-            TimeControl.Instance.GameNormal();
             TimeControl.Instance.SelfTimeNormal();
             TimeControl.Instance.EnemyTimeNormal();
-            //GameObject cameraObj = CameraManager.Instance.CameraManagerObj.transform.Find("Main Camera").gameObject;
-            //Camera c = cameraObj.GetComponent<Camera>();
-            //c.tag = "MainCamera";
-            //c.depth = 1;
-            //PanelHelper.Instance.ShowPanel("YL_FunctionGuide", (panel) =>
-            //{
-            //});
-            
             TimeControl.Instance.GameNormal();
             
             EventComponent e = GameEntry.GetComponent<EventComponent>();
@@ -58,8 +47,6 @@ namespace GameFrameworkYLSJ
             UI_TaskTracking.ShowState(false);
             UI_TipsWindow.InitStaticDialog("守卫言灵女神","请迅速清理来犯的敌人!", null, 3);
             // 通过无尽关卡数据 初始化 孵化器
-            sm_gate gateMo = sm_gate.GetMoById(GameDateManager.Instance.GateID);
-            CreateEndlessMonster();
             ChangeState<ProcedureDefenseInGame>(_owner);
         }
 
@@ -71,47 +58,6 @@ namespace GameFrameworkYLSJ
                 e.Unsubscribe(User_AddItemEvent.EventId, X2Battle.X2BattleManager.EquipWeapOrYanling);
             }
         }
-
-
-        public void CreateEndlessMonster()
-        {
-            string[] waveStr = defenseMo.monsterList.Split('|');
-            SpawnerSystem.Instance.crateGroupMax = waveStr.Length;
-            SpawnerSystem.Instance.crateGroupNowNum = ProcedureEndlessEntry.nowWaveIndex + 1;
-            if (nowWaveIndex >= waveStr.Length)
-            {
-                RoleManager.Instance.GameWin();
-                return;
-            }
-            string monsterStr = waveStr[nowWaveIndex];
-            string[] monsterListStr = monsterStr.Split(',');
-            SpawnerNodeBase spNode = GameObject.Find("Spawners").transform.Find("Spawner").GetComponent<SpawnerNodeBase>();
-            int guide = 0;
-            foreach (var item in monsterListStr)
-            {
-                string[] monsterInfo = item.Split('_');
-                int monsterId = int.Parse(monsterInfo[0]);
-                int monsterNum = int.Parse(monsterInfo[1]);
-
-                GameObject spNewNodeObj = GameObject.Instantiate(spNode.gameObject, spNode.transform.parent);
-                
-                SpawnerNodeBase spNewNode = spNewNodeObj.GetComponent<SpawnerNodeBase>();
-                spNewNode.index = guide;
-                spNewNode.gameObject.name = "spawner" + nowWaveIndex + "_" + (guide + 1).ToString();
-                spNewNode.maxNum = monsterNum;
-                ZoneSpawnerLogic logic;
-                if (!spNewNode.gameObject.TryGetComponent<ZoneSpawnerLogic>(out logic))
-                {
-                    spNewNode.gameObject.AddComponent<ZoneSpawnerLogic>();
-                }
-                SpawnPoint point = spNewNodeObj.transform.GetChild(0).GetComponent<SpawnPoint>();
-                point.unitId = monsterId;
-                spNewNodeObj.gameObject.SetActive(true);
-                ++guide;
-
-            }
-            nowWaveIndex++;
-        }
         
     }
 }

+ 7 - 3
Assets/Scripts/Core/Client/NewBattle/BattleFrame/Procedure/ProcedureDefenseInGame.cs

@@ -18,6 +18,7 @@ namespace GameFrameworkYLSJ
         BattleEventYLSkillFeatureS _featureS;
         public int escapeNum = 0;
         public int escapeMax;
+        static public int nowWaveIndex = 0;
         public override void OnEnter(ProcedureOwner procedureOwner)
         {
             base.OnEnter(procedureOwner);
@@ -45,6 +46,9 @@ namespace GameFrameworkYLSJ
             sm_gate gateInfo = sm_gate.GetMoById(UserProxy.Instance.player.newMap.curMapId);
             sm_cfg_duplicate_defense defenseMo = sm_cfg_duplicate_defense.GetMoById(gateInfo.duplicateDataId);
             escapeMax = defenseMo.escapeNum;
+            SpawnerSystem.Instance.crateGroupMax = escapeMax;
+            nowWaveIndex = 0;
+            CreateEndlessMonster();
         }
 
         public override void OnLeave(ProcedureOwner procedureOwner, bool isShutdown)
@@ -100,13 +104,14 @@ namespace GameFrameworkYLSJ
             sm_cfg_duplicate_defense defenseMo = sm_cfg_duplicate_defense.GetMoById(gateInfo.duplicateDataId);
             string[] waveStr = defenseMo.monsterList.Split('|');
             
-            if (ProcedureEndlessEntry.nowWaveIndex >= waveStr.Length)
+            if (nowWaveIndex >= waveStr.Length)
             {
                 FightProxy.Instance.EndlessTower_Up(GameDateManager.Instance.EndlessIndex ,(index) => {});
                 RoleManager.Instance.GameWin();
                 return;
             }
-            SpawnerSystem.Instance.crateGroupNowNum = ProcedureEndlessEntry.nowWaveIndex + 1;
+            nowWaveIndex += 1;
+            SpawnerSystem.Instance.crateGroupNowNum = nowWaveIndex;
             string monsterStr = waveStr[ProcedureEndlessEntry.nowWaveIndex];
             string[] monsterListStr = monsterStr.Split(',');
             SpawnerNodeBase spNode = GameObject.Find("Spawners").transform.Find("Spawner").GetComponent<SpawnerNodeBase>();
@@ -133,7 +138,6 @@ namespace GameFrameworkYLSJ
                 spNewNodeObj.gameObject.SetActive(true);
                 ++guide;
             }
-            ProcedureEndlessEntry.nowWaveIndex++;
         }
 
         public void MonsterEscape(object sender, GameEventArgs e)