From 0c589b36181e570c3e345dfc455b5c5e35f5d9ee Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 02 十二月 2025 23:09:20 +0800
Subject: [PATCH] 129 【战斗】战斗系统 - 增加战报下载，同步像素正式环境配置
---
Main/System/ClientVersion/VersionConfig.cs | 2
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs | 63 ++++++------
Main/System/FirstCharge/FirstChargeManager.cs | 2
Main/System/Guild/GuildBossManager.cs | 35 +++++++
Main/System/Battle/BattleConst.cs | 37 +++++-
Main/System/Battle/BattleManager.cs | 1
Main/System/Settlement/BattleFailWin.cs | 2
Main/System/Arena/ArenaBattleVictoryWin.cs | 2
Main/System/Arena/ArenaBattleFailWin.cs | 2
Main/System/Login/ServerListCenter.cs | 12 ++
Main/System/Settlement/BoneBattleVictoryWin.cs | 2
Main/System/Settlement/BattleSettlementManager.cs | 88 ++++++++++++-----
Main/System/Settlement/TianziBillboradVictoryWin.cs | 2
Main/System/Settlement/BoneBattleFailWin.cs | 2
Main/System/Settlement/BattleVictoryWin.cs | 2
Main/System/TianziBillborad/TianziBillboradManager.cs | 2
16 files changed, 181 insertions(+), 75 deletions(-)
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs
index 46bde9e..0e8a908 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB430_tagSCTurnFightReport.cs
@@ -21,6 +21,7 @@
string guid = UIHelper.ServerStringTrim(vNetData.GUID);
canAddPack = false;
+ Debug.Log("鎴樻枟鏃跺簭 B430 寮�濮嬪鐞嗘垬鏂� " + Time.time);
//绾﹀畾 B430 鍐呭锛堝皬鍖�1闀垮害WORD + 鍖�1 + 灏忓寘2闀垮害WORD + 鍖�2锛�
//绾﹀畾绗竴涓寘鏄疊424锛屽厛鍙戣繃鏉ョ殑杩囨护鎶ラ敊閫氱煡
try
@@ -86,11 +87,11 @@
#if UNITY_EDITOR
string originPack = string.Empty;
BattleField battleField = BattleManager.Instance.GetBattleField(guid);
-
+
for (int i = 0; i < vPackList.Count; i++)
{
var pack = vPackList[i];
-
+
if (pack is HB427_tagSCUseSkill skill)
{
string heroName = skill.ObjID.ToString();
@@ -102,7 +103,7 @@
heroName = battleObj.teamHero.name;
}
}
-
+
string skillName = SkillConfig.Get((int)skill.SkillID)?.SkillName ?? "Unknown";
originPack += $"[{pack.packUID}] HB427_tagSCUseSkill - ObjID:{skill.ObjID} HeroName:{heroName} SkillID:{skill.SkillID} SkillName:{skillName}\n";
}
@@ -134,36 +135,36 @@
vPackList = AnalysisPackQueueAndDistribute(guid, vPackList);
#if UNITY_EDITOR
-if (Launch.Instance.isOpenSkillLogFile)
-{
-string packDetail = "澶勭悊鍓� : " + originPack + "\n";
-packDetail += "AnalysisPackQueueAndDistribute 澶勭悊鍚庣殑鍖呭垪琛�:\n";
-packDetail += PrintPackListDetail(vPackList, 0, guid);
+ if (Launch.Instance.isOpenSkillLogFile)
+ {
+ string packDetail = "澶勭悊鍓� : " + originPack + "\n";
+ packDetail += "AnalysisPackQueueAndDistribute 澶勭悊鍚庣殑鍖呭垪琛�:\n";
+ packDetail += PrintPackListDetail(vPackList, 0, guid);
-// 鍒嗘鎵撳嵃锛岄伩鍏嶆秷鎭鎴柇
-int chunkSize = 15000; // Unity鏃ュ織鍗曟潯娑堟伅鏈�澶ч暱搴︾害16000瀛楃
-if (packDetail.Length > chunkSize)
-{
- int totalChunks = (packDetail.Length + chunkSize - 1) / chunkSize;
- for (int i = 0; i < totalChunks; i++)
- {
- int startIndex = i * chunkSize;
- int length = Mathf.Min(chunkSize, packDetail.Length - startIndex);
- string chunk = packDetail.Substring(startIndex, length);
- Debug.LogError($"[Part {i + 1}/{totalChunks}]\n{chunk}");
- }
-}
-else
-{
- Debug.LogError(packDetail);
-}
+ // 鍒嗘鎵撳嵃锛岄伩鍏嶆秷鎭鎴柇
+ int chunkSize = 15000; // Unity鏃ュ織鍗曟潯娑堟伅鏈�澶ч暱搴︾害16000瀛楃
+ if (packDetail.Length > chunkSize)
+ {
+ int totalChunks = (packDetail.Length + chunkSize - 1) / chunkSize;
+ for (int i = 0; i < totalChunks; i++)
+ {
+ int startIndex = i * chunkSize;
+ int length = Mathf.Min(chunkSize, packDetail.Length - startIndex);
+ string chunk = packDetail.Substring(startIndex, length);
+ Debug.LogError($"[Part {i + 1}/{totalChunks}]\n{chunk}");
+ }
+ }
+ else
+ {
+ Debug.LogError(packDetail);
+ }
-// 鎴栬�呭啓鍏ユ枃浠�
-string filePath = Application.dataPath + "/../BattleReport/PackageAnalysis_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
-System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(filePath));
-System.IO.File.WriteAllText(filePath, packDetail);
-Debug.LogError("鍖呭垎鏋愮粨鏋滃凡淇濆瓨鍒�: " + filePath);
-}
+ // 鎴栬�呭啓鍏ユ枃浠�
+ string filePath = Application.dataPath + "/../BattleReport/PackageAnalysis_" + DateTime.Now.ToString("yyyyMMdd_HHmmss") + ".txt";
+ System.IO.Directory.CreateDirectory(System.IO.Path.GetDirectoryName(filePath));
+ System.IO.File.WriteAllText(filePath, packDetail);
+ Debug.LogError("鍖呭垎鏋愮粨鏋滃凡淇濆瓨鍒�: " + filePath);
+ }
#endif
for (int i = 0; i < vPackList.Count; i++)
diff --git a/Main/System/Arena/ArenaBattleFailWin.cs b/Main/System/Arena/ArenaBattleFailWin.cs
index 768d7ed..f0dd663 100644
--- a/Main/System/Arena/ArenaBattleFailWin.cs
+++ b/Main/System/Arena/ArenaBattleFailWin.cs
@@ -15,7 +15,7 @@
[SerializeField] TextEx txtFuncName;
[SerializeField] ScrollerController scroller;
JsonData jsonData;
- string battleName = "ArenaBattleField";
+ string battleName = BattleConst.ArenaBattleField;
protected override void InitComponent()
{
diff --git a/Main/System/Arena/ArenaBattleVictoryWin.cs b/Main/System/Arena/ArenaBattleVictoryWin.cs
index 664e23e..443f8c9 100644
--- a/Main/System/Arena/ArenaBattleVictoryWin.cs
+++ b/Main/System/Arena/ArenaBattleVictoryWin.cs
@@ -79,7 +79,7 @@
[SerializeField] TextEx txtFuncName;
[SerializeField] ScrollerController scroller;
JsonData jsonData;
- string battleName = "ArenaBattleField";
+ string battleName = BattleConst.ArenaBattleField;
protected override void OnPreOpen()
{
scroller.OnRefreshCell += OnRefreshCell;
diff --git a/Main/System/Battle/BattleConst.cs b/Main/System/Battle/BattleConst.cs
index 088ffa2..c8f190a 100644
--- a/Main/System/Battle/BattleConst.cs
+++ b/Main/System/Battle/BattleConst.cs
@@ -14,22 +14,41 @@
typeof(TianziBillboradBattleWin),
};
+ // 鎴樺満鍚嶇О
+ public const string StoryBattleField = "StoryBattleField";
+ public const string StoryBossBattleField = "StoryBossBattleField";
+ public const string ArenaBattleField = "ArenaBattleField";
+ public const string BoneBattleField = "BoneBattleField";
+ public const string TianziBillboradBattleField = "TianziBillboradBattleField";
+
public static Dictionary<string, string> battleNameToWinName = new Dictionary<string, string>()
{
- { "StoryBattleField", "BattleWin" },
- { "StoryBossBattleField", "StoryBossBattleWin" },
- { "ArenaBattleField", "ArenaBattleWin" },
- { "BoneBattleField", "BoneFieldBattleWin" },
- { "TianziBillboradBattleField", "TianziBillboradBattleWin" },
+ { StoryBattleField, "BattleWin" },
+ { StoryBossBattleField, "StoryBossBattleWin" },
+ { ArenaBattleField, "ArenaBattleWin" },
+ { BoneBattleField, "BoneFieldBattleWin" },
+ { TianziBillboradBattleField, "TianziBillboradBattleWin" },
};
public static Dictionary<string, int> FieldNameToIndex = new Dictionary<string, int>()
{
- { "StoryBossBattleField", 1 },
- { "ArenaBattleField", 2 },
- { "BoneBattleField", 3},
- { "TianziBillboradBattleField", 4 },
+ { StoryBossBattleField, 1 },
+ { ArenaBattleField, 2 },
+ { BoneBattleField, 3},
+ { TianziBillboradBattleField, 4 },
};
+
+ //鍜� CreateBattleField 閲岀殑瀵瑰簲
+ public static Dictionary<int, string> mapIDToBattleNameDic = new Dictionary<int, string>()
+ {
+ {1, StoryBattleField},
+ {2, StoryBossBattleField},
+ {3, ArenaBattleField},
+ {30010, BoneBattleField},
+ {30020, TianziBillboradBattleField},
+ };
+
+
#endregion
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index e98dbec..14656c6 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -635,6 +635,7 @@
pack.ValueCount = (byte)valueList.Length;
}
GameNetSystem.Instance.SendInfo(pack);
+ Debug.Log("鎴樻枟鏃跺簭 鍙戣捣 " + Time.time);
}
// 鑾峰彇褰撳墠姝ｅ湪鏄剧ず鐨勬垬鏂楀満鏅悕绉帮紝濡傛灉娌℃湁鍒欒繑鍥炵┖瀛楃涓�
diff --git a/Main/System/ClientVersion/VersionConfig.cs b/Main/System/ClientVersion/VersionConfig.cs
index 2053938..544fdd2 100644
--- a/Main/System/ClientVersion/VersionConfig.cs
+++ b/Main/System/ClientVersion/VersionConfig.cs
@@ -79,7 +79,7 @@
}
else
{
- m_GameId = "xbqy";
+ m_GameId = "xssg";
}
}
diff --git a/Main/System/FirstCharge/FirstChargeManager.cs b/Main/System/FirstCharge/FirstChargeManager.cs
index bc6f145..34f8ba8 100644
--- a/Main/System/FirstCharge/FirstChargeManager.cs
+++ b/Main/System/FirstCharge/FirstChargeManager.cs
@@ -140,7 +140,7 @@
{
if (battleName == null || battleName == string.Empty)
return;
- if (battleName == "TianziBillboradBattleField")
+ if (battleName == BattleConst.TianziBillboradBattleField)
return;
if (!IsFuncOpen())
return;
diff --git a/Main/System/Guild/GuildBossManager.cs b/Main/System/Guild/GuildBossManager.cs
index 6c9e237..72b8fd7 100644
--- a/Main/System/Guild/GuildBossManager.cs
+++ b/Main/System/Guild/GuildBossManager.cs
@@ -92,5 +92,40 @@
return null;
}
+ int lastGuildBossTime;
+
+ // 鑾峰彇鍏細涓殑浼ゅ璁板綍鍋氭帓鍚�
+ public void UpdateGuildBossInfo(HA513_tagMCFamilyActionInfo vNetData)
+ {
+ if (vNetData.ActionType != GuildManager.GuildBossActionType)
+ {
+ return;
+ }
+
+ GuildManager.Instance.TryGetFamilyActions(GuildManager.GuildBossActionType, out var familyActions);
+ if (familyActions == null)
+ {
+ return;
+ }
+ foreach (var action in familyActions)
+ {
+ if (action.Value1 == 1)
+ {
+ return;
+ }
+ }
+ }
+
+}
+
+public class PlayerGuildBossAtkInfo
+{
+ public int playerID;
+ public int atkTime;
+ public int bzTime;
+ public int atkCount;
+ public long totalHurtValue;
+ public int boxCnt;
+
}
diff --git a/Main/System/Login/ServerListCenter.cs b/Main/System/Login/ServerListCenter.cs
index 05d5ba0..1900c06 100644
--- a/Main/System/Login/ServerListCenter.cs
+++ b/Main/System/Login/ServerListCenter.cs
@@ -180,6 +180,18 @@
return data.name.Replace("@gm", "");
}
+ // 鑾峰彇鏈嶅姟鍣ㄥ湴鍧�
+ public string GetServerUrl(int id, string defaultHead = "http://", int replacePort = 0)
+ {
+ var data = GetServerDataEx(id);
+ if (replacePort > 0)
+ {
+ return $"{defaultHead}{data.region_domain}:{replacePort}";
+ }
+ return $"{defaultHead}{data.region_domain}:{data.login_port}";
+
+ }
+
public void RequestJumpUrl()
{
if (VersionUtility.Instance.InIosAuditTime())
diff --git a/Main/System/Settlement/BattleFailWin.cs b/Main/System/Settlement/BattleFailWin.cs
index 168e7a6..0c1a11e 100644
--- a/Main/System/Settlement/BattleFailWin.cs
+++ b/Main/System/Settlement/BattleFailWin.cs
@@ -11,7 +11,7 @@
[SerializeField] Button tipEquipBtn;
[SerializeField] Button tipHeroPosBtn;
- string battleName = "StoryBossBattleField";
+ string battleName = BattleConst.StoryBossBattleField;
protected override void InitComponent()
{
tipEquipBtn.AddListener(() =>
diff --git a/Main/System/Settlement/BattleSettlementManager.cs b/Main/System/Settlement/BattleSettlementManager.cs
index 812d3e1..ee541c3 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -11,6 +11,8 @@
{
//缁撶畻鍚庨渶娓呴櫎 <battleName,JsonData>
Dictionary<string, JsonData> battleSettlementDic = new Dictionary<string, JsonData>();
+ Dictionary<string, JsonData> battleAwardDic = new Dictionary<string, JsonData>(); //B431 鍙﹀閫氭姤濂栧姳
+
// public string notifyGuid = string.Empty;
@@ -31,6 +33,7 @@
public void OnBeforePlayerDataInitialize()
{
battleSettlementDic.Clear();
+ battleAwardDic.Clear();
}
public void AddPop(string battleName, int result)
@@ -38,13 +41,13 @@
bool isWin = result == 1;
switch (battleName)
{
- case "ArenaBattleField":
+ case BattleConst.ArenaBattleField:
PopupWindowsProcessor.Instance.Add(isWin ? "ArenaBattleVictoryWin" : "ArenaBattleFailWin", false);
break;
- case "BoneBattleField":
+ case BattleConst.BoneBattleField:
PopupWindowsProcessor.Instance.Add(isWin ? "BoneBattleVictoryWin" : "BoneBattleFailWin", false);
break;
- case "TianziBillboradBattleField":
+ case BattleConst.TianziBillboradBattleField:
PopupWindowsProcessor.Instance.Add("TianziBillboradVictoryWin", false);
break;
default:
@@ -58,7 +61,7 @@
bool isWin = result == 1;
switch (battleName)
{
- case "ArenaBattleField":
+ case BattleConst.ArenaBattleField:
if (isWin)
{
UIManager.Instance.OpenWindow<ArenaBattleVictoryWin>();
@@ -68,7 +71,7 @@
UIManager.Instance.OpenWindow<ArenaBattleFailWin>();
}
break;
- case "BoneBattleField":
+ case BattleConst.BoneBattleField:
if (isWin)
{
UIManager.Instance.OpenWindow<BoneBattleVictoryWin>();
@@ -78,7 +81,7 @@
UIManager.Instance.OpenWindow<BoneBattleFailWin>();
}
break;
- case "TianziBillboradBattleField":
+ case BattleConst.TianziBillboradBattleField:
TianziBillboradManager.Instance.isSweepVictory = false;
UIManager.Instance.OpenWindow<TianziBillboradVictoryWin>();
break;
@@ -110,6 +113,15 @@
return;
var battleName = battle.ToString();
battleSettlementDic[battleName] = _data;
+ if (battleAwardDic.ContainsKey(battleName))
+ {
+ //鍚堝苟鎴樻姤鍜岀粨绠楁暟鎹�
+ JsonData extendData = battleAwardDic[battleName];
+ foreach (var key in extendData.Keys)
+ {
+ _data[key] = extendData[key];
+ }
+ }
string activeBattleName = BattleManager.Instance.GetActiveBattleName();
@@ -132,6 +144,7 @@
public void WinShowOver(string battleName)
{
battleSettlementDic.Remove(battleName);
+ battleAwardDic.Remove(battleName);
var battle = BattleManager.Instance.GetActiveBattleFieldByName(battleName);
if (battle != null)
@@ -147,29 +160,66 @@
return battleSettlementDic[battleName];
}
+ public JsonData GetBattleSettlementByMapID(int mapID)
+ {
+ if (BattleConst.mapIDToBattleNameDic.ContainsKey(mapID))
+ {
+ return GetBattleSettlement(BattleConst.mapIDToBattleNameDic[mapID]);
+ }
+ return null;
+ }
+
public void UpdateSettlementData(HB431_tagSCTurnFightRet netData)
{
+ // 鍏堣幏寰楁垬鏂楃粨鏋滐紝濡傛灉闇�瑕佸睍绀烘垬鏂楋紝鍒欒姹傛垬鎶� 锛堝鏈変簺璺宠繃鎴樻枟琛ㄧ幇鐩存帴缁撶畻锛�
+ bool needBattleData = true;
var guid = UIHelper.ServerStringTrim(netData.GUID);
- var date = UIHelper.ServerStringTrim(netData.PathDate);
- RequestTurnFightData(guid, date, (int)netData.MapID);
+ var mapID = (int)netData.MapID;
+ JsonData extendData2 = JsonMapper.ToObject(netData.AwardMsg);
+
+ battleAwardDic[BattleConst.mapIDToBattleNameDic[mapID]] = extendData2;
+
+ if (needBattleData)
+ {
+ Debug.Log("鎴樻枟鏃跺簭 鏀跺埌B431 骞惰姹備笅杞芥垬鎶�" + Time.time);
+ var date = UIHelper.ServerStringTrim(netData.PathDate);
+ RequestTurnFightData(guid, date, mapID);
+ }
+ else
+ {
+ JsonData extendData1 = JsonMapper.ToObject(netData.BatStatMsg);
+
+ JsonData turnFightStateData = new JsonData();
+ foreach (var key in extendData1.Keys)
+ {
+ turnFightStateData[key] = extendData1[key];
+ }
+ foreach (var key in extendData2.Keys)
+ {
+ turnFightStateData[key] = extendData2[key];
+ }
+
+ EventBroadcast.Instance.Broadcast<string, JsonData>(EventName.BATTLE_END, guid, turnFightStateData);
+ }
}
public void RequestTurnFightData(string guid, string date, int mapID)
{
//mobile.secondworld.net.cn:53080\S9006\20251202\3042602\5b11338f-cf2c-11f0-a0a0-000c29b22418.tfr
var serverID = UIHelper.GetServerIDByAccount(PlayerDatas.Instance.baseData.AccID);
- var url = "http://mobile.secondworld.net.cn:53080";
+
+ var url = ServerListCenter.Instance.GetServerUrl(serverID, replacePort:53080);
string assetVersionUrl = string.Empty;
if (string.IsNullOrEmpty(date))
{
//鍏叡鎴樻姤 璺緞锛� C:\TurnFightReport\S鏈嶅姟鍣ㄧ紪鍙穃鍔熻兘鍦板浘ID\鎴樻姤GUID
- assetVersionUrl = $"{url}/S{serverID}/{mapID}//{guid}.tfr";
+ assetVersionUrl = $"{url}/S{serverID}/{mapID}/{guid}.tfr";
}
else
{
- //涓汉鎴樻姤 璺緞锛� C:\TurnFightReport\S鏈嶅姟鍣ㄧ紪鍙穃鏃ユ湡\鐜╁ID\鎴樻姤GUID
- assetVersionUrl = $"{url}/S{serverID}/{date}/{PlayerDatas.Instance.baseData.PlayerID}/{guid}.tfr";
+ //涓汉鎴樻姤 璺緞锛� C:\TurnFightReport\S鏈嶅姟鍣ㄧ紪鍙穃鏃ユ湡\鐜╁ID\鍔熻兘鍦板浘ID\鎴樻姤GUID
+ assetVersionUrl = $"{url}/S{serverID}/{date}/{PlayerDatas.Instance.baseData.PlayerID}/{mapID}/{guid}.tfr";
}
HttpRequest.Instance.UnityWebRequestTurnFightGet(assetVersionUrl, guid, 3, OnGetTurnFightData);
@@ -183,8 +233,7 @@
}
}
- GameNetEncode encoder = new GameNetEncode();
- //鍗曠嫭
+ //鎴樻姤瀛樺偍鐨勬槸B430灏佸寘锛屾墍浠ラ渶瑕佽浆鍙態430灏佸寘
private void ReadTurnFightInfo(byte[] vBytes)
{
try
@@ -194,11 +243,8 @@
byte[] vCmdBytes = new byte[2];
ServerType socketType = ServerType.B430;
-
- // vPackBytes = encoder.BaseXorSub(vPackBytes);
Array.Copy(vPackBytes, 0, vCmdBytes, 0, 2);
var cmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);
- bool isRegist = false; // 鏈敞鍐屽皝鍖呭鐞�
// 澶勭悊涓诲伐绋嬬殑灏佸寘
if (PackageRegedit.Contain(cmd))
@@ -207,17 +253,9 @@
if (vNetpack != null)
{
GameNetSystem.Instance.PushPackage(vNetpack, socketType);
- isRegist = true;
}
}
- // 鏈敞鍐屽皝鍖呭鐞�
- if (!isRegist)
- {
-#if UNITY_EDITOR
- PackageRegedit.TransPack(socketType, cmd, vPackBytes);
-#endif
- }
}
catch (Exception ex)
{
diff --git a/Main/System/Settlement/BattleVictoryWin.cs b/Main/System/Settlement/BattleVictoryWin.cs
index 9cf7e25..e327122 100644
--- a/Main/System/Settlement/BattleVictoryWin.cs
+++ b/Main/System/Settlement/BattleVictoryWin.cs
@@ -75,7 +75,7 @@
[SerializeField] ScrollerController scroller;
- string battleName = "StoryBossBattleField";
+ string battleName = BattleConst.StoryBossBattleField;
protected override void OnPreOpen()
{
scroller.OnRefreshCell += OnRefreshCell;
diff --git a/Main/System/Settlement/BoneBattleFailWin.cs b/Main/System/Settlement/BoneBattleFailWin.cs
index f3f8bfd..0f2ff50 100644
--- a/Main/System/Settlement/BoneBattleFailWin.cs
+++ b/Main/System/Settlement/BoneBattleFailWin.cs
@@ -11,7 +11,7 @@
[SerializeField] TextEx txtFuncName;
[SerializeField] Button tipEquipBtn;
[SerializeField] Button tipHeroPosBtn;
- string battleName = "BoneBattleField";
+ string battleName = BattleConst.BoneBattleField;
protected override void InitComponent()
{
tipEquipBtn.AddListener(() =>
diff --git a/Main/System/Settlement/BoneBattleVictoryWin.cs b/Main/System/Settlement/BoneBattleVictoryWin.cs
index f5c4dba..4623c16 100644
--- a/Main/System/Settlement/BoneBattleVictoryWin.cs
+++ b/Main/System/Settlement/BoneBattleVictoryWin.cs
@@ -7,7 +7,7 @@
[SerializeField] TextEx txtFuncName;
[SerializeField] ScrollerController scroller;
- string battleName = "BoneBattleField";
+ string battleName = BattleConst.BoneBattleField;
protected override void OnPreOpen()
{
scroller.OnRefreshCell += OnRefreshCell;
diff --git a/Main/System/Settlement/TianziBillboradVictoryWin.cs b/Main/System/Settlement/TianziBillboradVictoryWin.cs
index 7d27b83..4d81bd0 100644
--- a/Main/System/Settlement/TianziBillboradVictoryWin.cs
+++ b/Main/System/Settlement/TianziBillboradVictoryWin.cs
@@ -7,7 +7,7 @@
[SerializeField] ScrollerController scroller;
[SerializeField] TextEx txtHunt;
bool isSweepVictory = false;
- string battleName = "TianziBillboradBattleField";
+ string battleName = BattleConst.TianziBillboradBattleField;
protected override void OnPreOpen()
{
base.OnPreOpen();
diff --git a/Main/System/TianziBillborad/TianziBillboradManager.cs b/Main/System/TianziBillborad/TianziBillboradManager.cs
index 3bef2f5..1e1ae9e 100644
--- a/Main/System/TianziBillborad/TianziBillboradManager.cs
+++ b/Main/System/TianziBillborad/TianziBillboradManager.cs
@@ -113,7 +113,7 @@
if (battle == null)
return;
var battleName = battle.ToString();
- if (battleName != "TianziBillboradBattleField")
+ if (battleName != BattleConst.TianziBillboradBattleField)
return;
if (data == null || !data.ContainsKey("totalHurt"))
return;
--
Gitblit v1.8.0