From bf9d063af5655f93db17578cfe52d8abbb60c596 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 03 十二月 2025 17:42:40 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs | 41 ++++
Main/System/Launch/MapLoadingWin.cs.meta | 11 +
Main/System/Battle/BattleConst.cs | 37 +++-
Main/System/ClientVersion/VersionUtility.cs | 2
Main/System/Login/LoginWin.cs | 6
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs | 12 +
Main/System/Battle/BattleField/OperationAgent/AutoModeOperationAgent.cs | 2
Main/System/Arena/ArenaBattleFailWin.cs | 2
Main/System/Battle/BaseBattleWin.cs | 1
Main/System/Settlement/BoneBattleVictoryWin.cs | 2
Main/System/PlayerProfile/ExchangeCodeWin.cs | 2
Main/System/Settlement/BattleSettlementManager.cs | 135 ++++++++++++++
Main/System/Settlement/TianziBillboradVictoryWin.cs | 2
Main/Main.cs | 2
Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs.meta | 11 +
Main/SDK/SDKUtils.cs | 1
Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs.meta | 11 +
Main/System/Guild/GuildManager.cs | 4
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/BattleManager.cs | 5
Main/System/Settlement/BattleFailWin.cs | 2
Main/System/Arena/ArenaBattleVictoryWin.cs | 2
Main/System/Login/ServerListCenter.cs | 16 +
Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs | 1
Main/System/Settlement/BoneBattleFailWin.cs | 2
Main/System/Settlement/BattleVictoryWin.cs | 16 +
Main/System/TianziBillborad/TianziBillboradManager.cs | 2
Main/Core/NetworkPackage/GameNetPackBasic.cs | 25 ++
Main/System/Guild/GuildBaseWin.cs | 5
Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs | 2
Main/System/Launch/MapLoadingWin.cs | 76 ++++++++
34 files changed, 470 insertions(+), 70 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/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs
new file mode 100644
index 0000000..af11ae1
--- /dev/null
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs
@@ -0,0 +1,12 @@
+using UnityEngine;
+using System.Collections;
+
+// B4 31 鎴樻枟鎴樻姤缁撴灉 #tagSCTurnFightRet
+
+public class DTCB431_tagSCTurnFightRet : DtcBasic {
+ public override void Done(GameNetPackBasic vNetPack) {
+ base.Done(vNetPack);
+ HB431_tagSCTurnFightRet vNetData = vNetPack as HB431_tagSCTurnFightRet;
+ BattleSettlementManager.Instance.UpdateSettlementData(vNetData);
+ }
+}
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs.meta b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs.meta
new file mode 100644
index 0000000..0a198ea
--- /dev/null
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/HB4_FightDefine/DTCB431_tagSCTurnFightRet.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3a9eccf6a3501c24d89018d298e2cf70
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
index d703417..fc27882 100644
--- a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
@@ -130,6 +130,7 @@
Register(typeof(HB119_tagSCModelInfo), typeof(DTCB119_tagSCModelInfo));
Register(typeof(HB126_tagSCTitleInfo), typeof(DTCB126_tagSCTitleInfo));
Register(typeof(HB127_tagSCChatBoxInfo), typeof(DTCB127_tagSCChatBoxInfo));
+ Register(typeof(HB431_tagSCTurnFightRet), typeof(DTCB431_tagSCTurnFightRet));
}
diff --git a/Main/Core/NetworkPackage/GameNetPackBasic.cs b/Main/Core/NetworkPackage/GameNetPackBasic.cs
index 56f9dbe..77914ab 100644
--- a/Main/Core/NetworkPackage/GameNetPackBasic.cs
+++ b/Main/Core/NetworkPackage/GameNetPackBasic.cs
@@ -962,6 +962,10 @@
{
try
{
+ if (vInts.IsNullOrEmpty())
+ {
+ return;
+ }
if (vInts.Length != vLockLeng)
Array.Resize(ref vInts, vLockLeng);
this.WriteBytes(vInts, vType);
@@ -978,6 +982,10 @@
{
try
{
+ if (vInts.IsNullOrEmpty())
+ {
+ return;
+ }
if (vInts.Length != vLockLeng)
Array.Resize(ref vInts, vLockLeng);
this.WriteBytes(vInts, vType);
@@ -993,6 +1001,10 @@
{
try
{
+ if (vInts.IsNullOrEmpty())
+ {
+ return;
+ }
if (vWriteLen == StrWriteLen.BYTE)
this.WriteBytes(new Byte[] { (byte)vInts.Length });
else if (vWriteLen == StrWriteLen.WORD)
@@ -1012,6 +1024,10 @@
{
try
{
+ if (vInts.IsNullOrEmpty())
+ {
+ return;
+ }
int l = vInts.Length;
byte[] vRst;
int i;
@@ -1051,6 +1067,10 @@
{
try
{
+ if (vInts.IsNullOrEmpty())
+ {
+ return;
+ }
int l = vInts.Length;
byte[] vRst;
int i;
@@ -1147,6 +1167,11 @@
{
try
{
+ if (vBytes.IsNullOrEmpty())
+ {
+ return;
+ }
+
Array.Resize(ref _writedBytes, _writeIndex + vBytes.Length);
vBytes.CopyTo(_writedBytes, _writeIndex);
_writeIndex = _writedBytes.Length;
diff --git a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs
new file mode 100644
index 0000000..0296a8b
--- /dev/null
+++ b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs
@@ -0,0 +1,41 @@
+using UnityEngine;
+using System.Collections;
+
+// B4 31 鎴樻枟鎴樻姤缁撴灉 #tagSCTurnFightRet
+
+public class HB431_tagSCTurnFightRet : GameNetPackBasic {
+ public uint MapID; // 鑷畾涔夊湴鍥綢D锛屽彲鐢ㄤ簬缁戝畾鎴樻枟鍦板浘鍦烘櫙鍔熻兘锛堝涓荤嚎boss銆佺埇濉斻�佺珵鎶�鍦虹瓑锛�
+ public uint FuncLineID; // MapID瀵瑰簲鐨勬墿灞曞�硷紝濡傚叿浣撴煇涓叧鍗＄瓑
+ public byte TagType; // 鐩爣绫诲瀷锛�0-NPC闃靛锛�1-鐜╁
+ public uint TagID; // 鐩爣绫诲瀷瀵瑰簲鐨処D锛屽鐜╁ID
+ public byte ValueCount;
+ public uint[] ValueList; // 闄勫姞鍊煎垪琛紝鍙�夛紝鍏蜂綋鍚箟鐢盡apID鍐冲畾
+ public byte IsWin; //鏄惁鑾疯儨
+ public ushort AwardLen;
+ public string AwardMsg; //鍔熻兘缁撶畻濂栧姳淇℃伅锛屼笉鍚垬鏂楃浉鍏崇粺璁′俊鎭�
+ public ushort BatLen;
+ public string BatStatMsg; //鎴樻枟鐩稿叧缁熻淇℃伅
+ public string PathDate; //鎴樻姤璺緞鏃ユ湡, yyyyMMdd, 涓虹┖鏃朵唬琛ㄥ叕鍏辩被鐨勬垬鎶ワ紝涓嶄负绌烘椂涓虹帺瀹朵釜浜虹被鎴樻姤
+ public string GUID; //鎴樻姤guid锛屽墠绔牴鎹姛鑳組apID鍒ゆ柇鏄惁璺ㄦ湇鍔熻兘锛屾槸鐨勮瘽浠庤法鏈嶆湇鍔″櫒涓嬭浇鎴樻姤锛屽惁鐨勮瘽浠庢湰鏈嶄笅杞�
+
+ public HB431_tagSCTurnFightRet () {
+ _cmd = (ushort)0xB431;
+ }
+
+ public override void ReadFromBytes (byte[] vBytes) {
+ TransBytes (out MapID, vBytes, NetDataType.DWORD);
+ TransBytes (out FuncLineID, vBytes, NetDataType.DWORD);
+ TransBytes (out TagType, vBytes, NetDataType.BYTE);
+ TransBytes (out TagID, vBytes, NetDataType.DWORD);
+ TransBytes (out ValueCount, vBytes, NetDataType.BYTE);
+ TransBytes (out ValueList, vBytes, NetDataType.DWORD, ValueCount);
+ TransBytes (out IsWin, vBytes, NetDataType.BYTE);
+ TransBytes (out AwardLen, vBytes, NetDataType.WORD);
+ TransBytes (out AwardMsg, vBytes, NetDataType.Chars, AwardLen);
+ TransBytes (out BatLen, vBytes, NetDataType.WORD);
+ TransBytes (out BatStatMsg, vBytes, NetDataType.Chars, BatLen);
+ TransBytes (out PathDate, vBytes, NetDataType.Chars, 8);
+ TransBytes (out GUID, vBytes, NetDataType.Chars, 40);
+ }
+
+}
diff --git a/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs.meta b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs.meta
new file mode 100644
index 0000000..926521b
--- /dev/null
+++ b/Main/Core/NetworkPackage/ServerPack/HB4_FightDefine/HB431_tagSCTurnFightRet.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 9b2fa2d798559934896c3f09781aa94b
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/Main.cs b/Main/Main.cs
index d7874ee..7a45c34 100644
--- a/Main/Main.cs
+++ b/Main/Main.cs
@@ -133,7 +133,7 @@
}
else
{
- Debug.unityLogger.logEnabled = false;
+ Debug.unityLogger.logEnabled = true;
}
#endif
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index 20df1b8..cc798b7 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -521,6 +521,7 @@
case CodeA2U.SecretRuleOK:
{
IsAgreeSecret = true;
+ LocalSave.SetBool("secretToggleStart5", true);
break;
}
case CodeA2U.FreePlatformInitOk:
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/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index 5088f75..b6e68ed 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -37,6 +37,7 @@
protected override void OnPreOpen()
{
base.OnPreOpen();
+ UIManager.Instance.CloseWindow<MapLoadingWin>();
BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
RegisterBattleEvents();
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/BattleField/OperationAgent/AutoModeOperationAgent.cs b/Main/System/Battle/BattleField/OperationAgent/AutoModeOperationAgent.cs
index d904ee1..4c2b3a7 100644
--- a/Main/System/Battle/BattleField/OperationAgent/AutoModeOperationAgent.cs
+++ b/Main/System/Battle/BattleField/OperationAgent/AutoModeOperationAgent.cs
@@ -13,7 +13,7 @@
public override void Run()
{
//鏈�浣�1绉�
- if (Time.time - lastTime < 1f)
+ if (Time.time - lastTime < 0.2f)
return;
lastTime = Time.time;
if (AutoFightModel.Instance.isPause)
diff --git a/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs b/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
index 954ba4a..c4f1ed9 100644
--- a/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
+++ b/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
@@ -18,7 +18,7 @@
base.Run();
if (autoNext)
{
- if (Time.time - lastTime < 0.2f)
+ if (Time.time - lastTime < 0.1f)
return;
lastTime = Time.time;
if (storyBattleField.RequestFight())
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index e98dbec..f19be2d 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -635,6 +635,11 @@
pack.ValueCount = (byte)valueList.Length;
}
GameNetSystem.Instance.SendInfo(pack);
+ Debug.Log("鎴樻枟鏃跺簭 鍙戣捣 " + Time.time);
+ if (mapID != 1)
+ {
+ UIManager.Instance.OpenWindow<MapLoadingWin>();
+ }
}
// 鑾峰彇褰撳墠姝ｅ湪鏄剧ず鐨勬垬鏂楀満鏅悕绉帮紝濡傛灉娌℃湁鍒欒繑鍥炵┖瀛楃涓�
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/ClientVersion/VersionUtility.cs b/Main/System/ClientVersion/VersionUtility.cs
index 610a55d..0a79593 100644
--- a/Main/System/ClientVersion/VersionUtility.cs
+++ b/Main/System/ClientVersion/VersionUtility.cs
@@ -16,7 +16,7 @@
public class VersionUtility : Singleton<VersionUtility>
{
public static readonly string[] VERSION_URL = new string[] {
- "http://gamecenter.secondworld.net.cn:11000/center/appversion_new.php/?"};
+ "http://xssgcenter.secondworld.net.cn:11000/center/appversion_new.php/?"};
public string androidRoot { get { return string.Empty;/*StringUtility.Contact(SDKUtils.Instance.DeviceRootPath, "/", VersionConfig.Get().bundleIdentifier);*/ } }
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/GuildBaseWin.cs b/Main/System/Guild/GuildBaseWin.cs
index 8584a57..a7d6c73 100644
--- a/Main/System/Guild/GuildBaseWin.cs
+++ b/Main/System/Guild/GuildBaseWin.cs
@@ -1,3 +1,4 @@
+using System;
using System.Collections;
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
@@ -137,7 +138,7 @@
{
hawkerRect.localPosition = pos2.localPosition;
}
- hawkerModel.PlayAnimation("idle", true);
+ // hawkerModel.PlayAnimation("zoulu", true);
}
//isShow true璧板嚭鏉�,false璧板嚭鍘�
@@ -150,7 +151,7 @@
FuncNPCManager.Instance.isHawkerShowNow = isShow;
hawkerModel.PlayAnimation("zoulu", true);
FuncNPCManager.Instance.isHawkerStandBy = false;
- hawkerModel.transform.localScale = new Vector3(isShow ? hawkerModel.transform.localScale.x : -hawkerModel.transform.localScale.x, hawkerModel.transform.localScale.y, hawkerModel.transform.localScale.z);
+ hawkerModel.transform.localScale = new Vector3(isShow ? Math.Abs(hawkerModel.transform.localScale.x) : -Math.Abs(hawkerModel.transform.localScale.x), hawkerModel.transform.localScale.y, hawkerModel.transform.localScale.z);
hawkerRect.DOLocalMove(isShow ? pos1.localPosition : pos2.localPosition, 1f).onComplete = () =>
{
hawkerModel.PlayAnimation("idle", true);
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/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 2b72aa0..71066f3 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -47,12 +47,14 @@
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
+ TimeMgr.Instance.OnHourEvent += UpdateZBGRedpoint;
}
public override void Release()
{
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
+ TimeMgr.Instance.OnHourEvent -= UpdateZBGRedpoint;
}
@@ -946,6 +948,8 @@
{
return;
}
+ if (TimeUtility.ServerNow.Hour < 10)
+ return;
if (zhenbaogeCutState == 0)
{
diff --git a/Main/System/Launch/MapLoadingWin.cs b/Main/System/Launch/MapLoadingWin.cs
new file mode 100644
index 0000000..f6ba294
--- /dev/null
+++ b/Main/System/Launch/MapLoadingWin.cs
@@ -0,0 +1,76 @@
+
+using DG.Tweening;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class MapLoadingWin : UIBase
+{
+ [Header("鍔犺浇鍦板浘鏃堕暱姣")]
+ public int millSeconds = 1000;
+ [Header("瓒呰繃鏃堕暱鑷姩鍏抽棴姣")]
+ public int autoCloseMillSeconds = 3000;
+ [Header("娲炵缉灏忕殑鏃堕暱姣")]
+ public int holeCloseMillSeconds = 1000;
+ [SerializeField] Transform fbLoadRect;
+ [SerializeField] Image holeLoadImg;
+
+ [SerializeField] Transform chapterLoadRect;
+ [SerializeField] Text chapterName;
+ [SerializeField] Text mapName;
+ [SerializeField] Text processText;
+
+
+ float showTime = 0;
+ int closeTime = 0;
+ protected override void OnPreOpen()
+ {
+ showTime = Time.time;
+
+ if (functionOrder == 0)
+ {
+ fbLoadRect.SetActive(true);
+ chapterLoadRect.SetActive(false);
+ //鍓湰鍒囨崲
+ holeLoadImg.SetNativeSize();
+ //holeLoadImg鐨勫楂樺悓姣�1绉掑唴缂╁皬鍒�0锛屼絾鏄笉鐢╯cale鐨勬柟寮�
+ var rect = holeLoadImg.GetComponent<RectTransform>();
+ rect.DOSizeDelta(new Vector2(0, 0), holeCloseMillSeconds / 1000f);
+ closeTime = autoCloseMillSeconds;
+ }
+ else
+ {
+ //绔犺妭鍒囨崲
+ chapterLoadRect.SetActive(true);
+ fbLoadRect.SetActive(false);
+ int num = PlayerDatas.Instance.baseData.ExAttr1 / 10000;
+ chapterName.text = Language.Get("MapLoad1", UIHelper.ChineseNumber(num));
+ mapName.text = MainChapterConfig.Get(num).ChapterName;
+ processText.text = Language.Get("MapLoad2","0");
+ closeTime = millSeconds;
+ }
+ }
+
+ protected override void OnPreClose()
+ {
+ }
+
+
+ protected void LateUpdate()
+ {
+ var passTime = Time.time - showTime;
+
+ if (passTime > closeTime / 1000f)
+ {
+ CloseWindow();
+ }
+ if (functionOrder != 0)
+ {
+ var num = (int)(passTime*1000 / closeTime * 100) % 100;
+ if (num % 6 == 0)
+ {
+ processText.text = Language.Get("MapLoad2", num);
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/Main/System/Launch/MapLoadingWin.cs.meta b/Main/System/Launch/MapLoadingWin.cs.meta
new file mode 100644
index 0000000..544cb8e
--- /dev/null
+++ b/Main/System/Launch/MapLoadingWin.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 757f19ce49125ef4fa60d9c08fe48885
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Main/System/Login/LoginWin.cs b/Main/System/Login/LoginWin.cs
index 5f565ef..85b2e38 100644
--- a/Main/System/Login/LoginWin.cs
+++ b/Main/System/Login/LoginWin.cs
@@ -167,7 +167,7 @@
//m_WXLogin.SetActive(false);
// 鐢ㄦ埛鍗忚 todo
- checkRead.isOn = LocalSave.GetBool("tqsecretToggle");
+ checkRead.isOn = LocalSave.GetBool("secretToggleStart5");
}
private void OnLoginOk(SDKUtils.FP_LoginOk arg0)
@@ -235,11 +235,11 @@
if (!checkRead.isOn)
{
ConfirmCancel.ShowPopConfirm(Language.Get("agreementTitle"), Language.Get("agreementInfo"));
- LocalSave.SetBool("tqsecretToggle", false); //鏂逛究娴嬭瘯
+ LocalSave.SetBool("secretToggleStart5", false); //鏂逛究娴嬭瘯
return;
}
- LocalSave.SetBool("tqsecretToggle", true);
+ LocalSave.SetBool("secretToggleStart5", true);
SDKUtils.Instance.SendHideFloatWin();
diff --git a/Main/System/Login/ServerListCenter.cs b/Main/System/Login/ServerListCenter.cs
index 05d5ba0..5678479 100644
--- a/Main/System/Login/ServerListCenter.cs
+++ b/Main/System/Login/ServerListCenter.cs
@@ -7,7 +7,7 @@
public class ServerListCenter : Singleton<ServerListCenter>
{
- public static readonly string[] JUMP_URL = new string[] { "http://gamecenter.secondworld.net.cn:11000/center/server_list.php/?" };
+ public static readonly string[] JUMP_URL = new string[] { "http://xssgcenter.secondworld.net.cn:11000/center/server_list.php/?" };
public static string SERVERLIST_URL_COMMON = "";
public static string SERVERLIST_URL_PLAYER = "";
@@ -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())
@@ -187,7 +199,7 @@
return;
}
- var url = StringUtility.Contact(JUMP_URL[0], "game=xbqy&flag=", VersionConfig.Get().appId, "_", VersionConfig.Get().branch, "_", VersionConfig.Get().version);
+ var url = StringUtility.Contact(JUMP_URL[0], "game=xssg&flag=", VersionConfig.Get().appId, "_", VersionConfig.Get().branch, "_", VersionConfig.Get().version);
jumpUrlIndex++;
serverUrl = url;
Debug.Log("http鍦板潃:serverlist " + url);
diff --git a/Main/System/PlayerProfile/ExchangeCodeWin.cs b/Main/System/PlayerProfile/ExchangeCodeWin.cs
index 3bcebb0..aeed9db 100644
--- a/Main/System/PlayerProfile/ExchangeCodeWin.cs
+++ b/Main/System/PlayerProfile/ExchangeCodeWin.cs
@@ -6,7 +6,7 @@
{
[SerializeField] InputField input;
[SerializeField] Button receiveBtn;
- const string exchangeUrl = "http://gamecenter.secondworld.net.cn:53003/Coupon/CouponCode.php?";
+ const string exchangeUrl = "http://xssgcenter.secondworld.net.cn:53003/Coupon/CouponCode.php?";
bool isCool = false;
float time = 0;
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 6f29276..169607e 100644
--- a/Main/System/Settlement/BattleSettlementManager.cs
+++ b/Main/System/Settlement/BattleSettlementManager.cs
@@ -1,13 +1,18 @@
锘�
+using System;
using System.Collections.Generic;
using System.Linq;
+using System.Text;
using LitJson;
+using UnityEngine;
public partial class BattleSettlementManager : GameSystemManager<BattleSettlementManager>
{
//缁撶畻鍚庨渶娓呴櫎 <battleName,JsonData>
Dictionary<string, JsonData> battleSettlementDic = new Dictionary<string, JsonData>();
+ Dictionary<string, JsonData> battleAwardDic = new Dictionary<string, JsonData>(); //B431 鍙﹀閫氭姤濂栧姳
+
// public string notifyGuid = string.Empty;
@@ -28,6 +33,7 @@
public void OnBeforePlayerDataInitialize()
{
battleSettlementDic.Clear();
+ battleAwardDic.Clear();
}
public void AddPop(string battleName, int result)
@@ -35,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:
@@ -55,7 +61,7 @@
bool isWin = result == 1;
switch (battleName)
{
- case "ArenaBattleField":
+ case BattleConst.ArenaBattleField:
if (isWin)
{
UIManager.Instance.OpenWindow<ArenaBattleVictoryWin>();
@@ -65,7 +71,7 @@
UIManager.Instance.OpenWindow<ArenaBattleFailWin>();
}
break;
- case "BoneBattleField":
+ case BattleConst.BoneBattleField:
if (isWin)
{
UIManager.Instance.OpenWindow<BoneBattleVictoryWin>();
@@ -75,7 +81,7 @@
UIManager.Instance.OpenWindow<BoneBattleFailWin>();
}
break;
- case "TianziBillboradBattleField":
+ case BattleConst.TianziBillboradBattleField:
TianziBillboradManager.Instance.isSweepVictory = false;
UIManager.Instance.OpenWindow<TianziBillboradVictoryWin>();
break;
@@ -107,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();
@@ -129,6 +144,7 @@
public void WinShowOver(string battleName)
{
battleSettlementDic.Remove(battleName);
+ battleAwardDic.Remove(battleName);
var battle = BattleManager.Instance.GetActiveBattleFieldByName(battleName);
if (battle != null)
@@ -143,5 +159,112 @@
}
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 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 = ServerListCenter.Instance.GetServerUrl(serverID);
+ string assetVersionUrl = string.Empty;
+
+ if (string.IsNullOrEmpty(date))
+ {
+ //鍏叡鎴樻姤 璺緞锛� C:\TurnFightReport\S鏈嶅姟鍣ㄧ紪鍙穃鍔熻兘鍦板浘ID\鎴樻姤GUID
+ assetVersionUrl = $"{url}/S{serverID}/{mapID}/{guid}.tfr";
+ }
+ else
+ {
+ //涓汉鎴樻姤 璺緞锛� 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);
+ }
+
+ void OnGetTurnFightData(bool _ok, string guid, byte[] _result)
+ {
+ if (_ok)
+ {
+ ReadTurnFightInfo(_result);
+ }
+ }
+
+ //鎴樻姤瀛樺偍鐨勬槸B430灏佸寘锛屾墍浠ラ渶瑕佽浆鍙態430灏佸寘
+ private void ReadTurnFightInfo(byte[] vBytes)
+ {
+ try
+ {
+ byte[] vPackBytes = vBytes;
+ GameNetPackBasic vNetpack;
+ byte[] vCmdBytes = new byte[2];
+ ServerType socketType = ServerType.B430;
+
+ Array.Copy(vPackBytes, 0, vCmdBytes, 0, 2);
+ var cmd = (ushort)((ushort)(vCmdBytes[0] << 8) + vCmdBytes[1]);
+
+ // 澶勭悊涓诲伐绋嬬殑灏佸寘
+ if (PackageRegedit.Contain(cmd))
+ {
+ vNetpack = PackageRegedit.TransPack(socketType, cmd, vPackBytes);
+ if (vNetpack != null)
+ {
+ GameNetSystem.Instance.PushPackage(vNetpack, socketType);
+ }
+ }
+
+ }
+ catch (Exception ex)
+ {
+ Debug.LogErrorFormat("ReadTurnFightInfo 鍒嗘瀽鎴樻姤寮傚父锛歿0}", ex);
+ }
+
+ }
+
+
+
}
diff --git a/Main/System/Settlement/BattleVictoryWin.cs b/Main/System/Settlement/BattleVictoryWin.cs
index 9cf7e25..e6b3f8e 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;
@@ -87,6 +87,8 @@
{
scroller.OnRefreshCell -= OnRefreshCell;
BattleSettlementManager.Instance.WinShowOver(battleName);
+ // 濡傛灉鐐瑰嚮鍥炴斁绛夛紝璇锋牴鎹〃鐜版儏鍐典笉琛ㄧ幇鍔犺浇
+ OpenLoading();
}
List<Item> showItems = new List<Item>();
@@ -108,13 +110,13 @@
var resultStr = jsonData["itemInfo"];
for (int i = 0; i < resultStr.Count; i++)
- {
+ {
showItems.Add(new Item((int)resultStr[i]["ItemID"], (long)resultStr[i]["Count"]));
}
showItems.Sort(SortItem);
for (int i = 0; i < showItems.Count; i++)
- {
+ {
scroller.AddCell(ScrollerDataType.Header, i);
}
scroller.Restart();
@@ -139,4 +141,12 @@
_cell?.Display(item.id, item.countEx);
}
+
+ void OpenLoading()
+ {
+ if (PlayerDatas.Instance.baseData.ExAttr1 / 100 % 100 == 1)
+ {
+ UIManager.Instance.OpenWindow<MapLoadingWin>(1);
+ }
+ }
}
\ No newline at end of file
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