From c124d98bdf9659cf764bebb799bee42c30eb152f Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 17 十月 2025 11:19:21 +0800
Subject: [PATCH] 125 战斗 战场开关接口
---
Main/System/Battle/BattleField/BattleField.cs | 5 ++
Main/System/Battle/BattleField/BoneBattleField.cs | 1
Main/System/Battle/BattleConst.cs | 13 ++----
Main/System/Battle/StoryBossBattleWin.cs | 2
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs | 22 +----------
Main/System/Battle/BattleObject/BattleObjectFactory.cs | 13 ++++++
Main/System/Battle/BattleField/StoryBossBattleField.cs | 12 +++++-
Main/System/Main/HomeWin.cs | 14 +++---
Main/System/Battle/BattleField/StoryBattleField.cs | 13 +++++-
Main/System/Battle/StoryBossBattleWin.cs.meta | 2
10 files changed, 54 insertions(+), 43 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
index 7a819b7..66ac5ac 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB424_tagSCTurnFightInit.cs
@@ -6,6 +6,7 @@
// B4 24 鍥炲悎鎴樻枟鍒濆鍖� #tagSCTurnFightInit
public class DTCB424_tagSCTurnFightInit : DtcBasic {
+
public override void Done(GameNetPackBasic vNetPack)
{
base.Done(vNetPack);
@@ -66,25 +67,6 @@
BattleDebug.LogError("鍒涘缓鎴樺満 guid:" + guid + " MapID:" + vNetData.MapID + " FuncLineID:" + vNetData.FuncLineID + " " + battleField.GetType().ToString());
-
- if (vNetData.MapID == 1)
- {
- BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
- if (null != battleWin)
- {
- battleWin.SetBattleField(battleField);
- }
- }
- else
- {
-
-
- FullScreenBattleWin fsBattleWin = UIManager.Instance.GetUI<FullScreenBattleWin>();
- if (null == fsBattleWin)
- {
- fsBattleWin = UIManager.Instance.OpenWindow<FullScreenBattleWin>();
- }
- fsBattleWin.SetBattleField(battleField);
- }
+ battleField.ShowWindow(vNetData);
}
}
diff --git a/Main/System/Battle/BattleConst.cs b/Main/System/Battle/BattleConst.cs
index b83efe9..ede50bd 100644
--- a/Main/System/Battle/BattleConst.cs
+++ b/Main/System/Battle/BattleConst.cs
@@ -8,6 +8,10 @@
public const int BattlePointItemID = 3;//鎴橀敜ID
+ public const int BattleTotalDamageType = 100001; // 鎬讳激瀹崇被鍨婭D
+
+ public const int BattleTotalRecoverType = 100002; // 鎬绘不鐤楃被鍨婭D
+
// 1000~10000涔嬮棿鐨勬垬鏂楀眰绾�
// 闇�瑕佽�冭檻鏍规嵁UI 鐗规晥 鎴樻枟瑙掕壊涓夋柟鐨勫眰绾у叧绯�
@@ -25,13 +29,6 @@
// 婵�娲昏嫳闆勫悗鐗规晥|婵�娲昏嫳闆剕婵�娲昏嫳闆勫墠鐗规晥
-
- // 搴旇濡備綍绠＄悊灞傜骇?
-
- // RendererAdjuster濡備綍鏇挎崲EffectPenetrationBlocker?
- // RendererAdjuster搴旇涓嶅弬涓庣鐞嗗瓙RendererAdjuster
- // RendererAdjuster鎬庝箞鑱旂郴璧锋潵
-
public const int BattleBlackTransparentMaskOffset = 100;
@@ -45,7 +42,7 @@
{
return battleWin.GetSortingOrder();
}
- FullScreenBattleWin fsBattleWin = UIManager.Instance.GetUI<FullScreenBattleWin>();
+ StoryBossBattleWin fsBattleWin = UIManager.Instance.GetUI<StoryBossBattleWin>();
if (fsBattleWin != null)
{
return fsBattleWin.GetSortingOrder();
diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index 93bfe57..75c53b2 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -580,4 +580,9 @@
battleObj.buffMgr.RemoveBuff(vNetData);
}
}
+
+ public virtual void ShowWindow(HB424_tagSCTurnFightInit vNetData)
+ {
+
+ }
}
diff --git a/Main/System/Battle/BattleField/BoneBattleField.cs b/Main/System/Battle/BattleField/BoneBattleField.cs
index b57c857..c7a1155 100644
--- a/Main/System/Battle/BattleField/BoneBattleField.cs
+++ b/Main/System/Battle/BattleField/BoneBattleField.cs
@@ -81,7 +81,6 @@
public override void WhaleFall()
{
- UIManager.Instance.CloseWindow<FullScreenBattleWin>();
AutoFightModel.Instance.isPause = false;
UIManager.Instance.OpenWindow<BoneFieldWin>();
Destroy();
diff --git a/Main/System/Battle/BattleField/StoryBattleField.cs b/Main/System/Battle/BattleField/StoryBattleField.cs
index 9b510dc..48a7882 100644
--- a/Main/System/Battle/BattleField/StoryBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBattleField.cs
@@ -189,7 +189,7 @@
return true;
}
if (BattleManager.Instance.isWaitServerStory)
- {
+ {
return true;
}
@@ -265,7 +265,7 @@
return true;
}
else
- {
+ {
}
}
else
@@ -278,6 +278,15 @@
}
return false;
}
+
+ public override void ShowWindow(HB424_tagSCTurnFightInit vNetData)
+ {
+ BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
+ if (null != battleWin)
+ {
+ battleWin.SetBattleField(this);
+ }
+ }
protected override void SetRootNodePosition()
{
diff --git a/Main/System/Battle/BattleField/StoryBossBattleField.cs b/Main/System/Battle/BattleField/StoryBossBattleField.cs
index 637590d..d85faf3 100644
--- a/Main/System/Battle/BattleField/StoryBossBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBossBattleField.cs
@@ -81,7 +81,7 @@
public override void WhaleFall()
{
- UIManager.Instance.CloseWindow<FullScreenBattleWin>();
+ UIManager.Instance.CloseWindow<StoryBossBattleWin>();
AutoFightModel.Instance.isPause = false;
Destroy();
}
@@ -119,5 +119,13 @@
BattleManager.Instance.DistributeNextReportPackage(guid);
}
-
+ public override void ShowWindow(HB424_tagSCTurnFightInit vNetData)
+ {
+ StoryBossBattleWin fsBattleWin = UIManager.Instance.GetUI<StoryBossBattleWin>();// as FullScreenBattleWin;
+ if (null == fsBattleWin)
+ {
+ fsBattleWin = UIManager.Instance.OpenWindow<StoryBossBattleWin>();
+ }
+ fsBattleWin.SetBattleField(this);
+ }
}
\ No newline at end of file
diff --git a/Main/System/Battle/BattleObject/BattleObjectFactory.cs b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
index e738e1c..e9668f3 100644
--- a/Main/System/Battle/BattleObject/BattleObjectFactory.cs
+++ b/Main/System/Battle/BattleObject/BattleObjectFactory.cs
@@ -9,8 +9,19 @@
// 鏈剰鏄鍦ㄨ繖閲屽仛姹犵殑鍐呭鐨� 浣嗘槸鎯充簡涓�涓� 鍒╃敤鏁堢巼鏈夌偣宸� 鏈�澶氬仛涓�涓嬬孩鑹叉柟鐨勭紦瀛� 钃濊壊鏂圭殑鍗虫椂鐢� 鍗虫椂鍒犻櫎 鎴栬�呯紦瀛樹笂涓�娆℃垬鏂楃殑灏辫
// private static int AutoIncrementID = 100000;
- private static float modelScaleRate => float.Parse(FuncConfigConfig.Get("BattleModelScale").Numerical1);
+ private static float m_modelScaleRate = 0f;
+ private static float modelScaleRate
+ {
+ get
+ {
+ if (m_modelScaleRate <= 0f)
+ {
+ m_modelScaleRate = float.Parse(FuncConfigConfig.Get("BattleModelScale").Numerical1);
+ }
+ return m_modelScaleRate;
+ }
+ }
// 杩欓噷鎶ラ敊浜嗘鏌ヤ竴涓�
public static BattleObject CreateBattleObject(BattleField _battleField, List<GameObject> posNodeList, TeamHero teamHero, BattleCamp _Camp)
{
diff --git a/Main/System/Battle/FullScreenBattleWin.cs b/Main/System/Battle/StoryBossBattleWin.cs
similarity index 98%
rename from Main/System/Battle/FullScreenBattleWin.cs
rename to Main/System/Battle/StoryBossBattleWin.cs
index 5cc439d..f72ac31 100644
--- a/Main/System/Battle/FullScreenBattleWin.cs
+++ b/Main/System/Battle/StoryBossBattleWin.cs
@@ -2,7 +2,7 @@
using UnityEngine;
using UnityEngine.UI;
-public class FullScreenBattleWin : UIBase
+public class StoryBossBattleWin : UIBase
{
// 缁勪欢寮曠敤
diff --git a/Main/System/Battle/FullScreenBattleWin.cs.meta b/Main/System/Battle/StoryBossBattleWin.cs.meta
similarity index 83%
rename from Main/System/Battle/FullScreenBattleWin.cs.meta
rename to Main/System/Battle/StoryBossBattleWin.cs.meta
index d46b4fa..e27591a 100644
--- a/Main/System/Battle/FullScreenBattleWin.cs.meta
+++ b/Main/System/Battle/StoryBossBattleWin.cs.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: b6123261c7e438e46a128ac22a8dbf9b
+guid: 3b93d6e08b58ee84da625e83d665509c
MonoImporter:
externalObjects: {}
serializedVersion: 2
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index a05fdd2..6f28648 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -172,14 +172,14 @@
private void OnClickEnterBoss()
{
- BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
+ // BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
- if (null != battleField)
- {
- FullScreenBattleWin fsBattleWin = UIManager.Instance.OpenWindow<FullScreenBattleWin>();
- fsBattleWin.SetBattleField(battleField);
- return;
- }
+ // if (null != battleField)
+ // {
+ // StoryBossBattleWin fsBattleWin = UIManager.Instance.OpenWindow<StoryBossBattleWin>();
+ // fsBattleWin.SetBattleField(battleField);
+ // return;
+ // }
UIManager.Instance.OpenWindow<MainBossEnterWin>();
}
--
Gitblit v1.8.0