From eca2ad1e47a2ab01fd41174da16700ee415daa52 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 18 十二月 2025 15:25:27 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/BoneField/BoneFieldManager.cs | 7 ---
Main/System/Chat/ChatManager.cs | 9 ++--
Main/System/FirstCharge/FirstChargeManager.cs | 15 ++++---
Main/System/PlayerProfile/RenameManager.cs | 6 +-
Main/System/LineupRecommend/LineupRecommendManager.cs | 6 +-
Main/System/PhantasmPavilion/PhantasmPavilionManager.cs | 6 +-
Main/System/Arena/ArenaManager.cs | 7 +--
Main/System/Mail/MailManager.cs | 6 +-
Main/System/TianziBillborad/TianziBillboradManager.cs | 9 +---
Main/System/TianziBillborad/TianziBillboradRankWin.cs | 1
10 files changed, 31 insertions(+), 41 deletions(-)
diff --git a/Main/System/Arena/ArenaManager.cs b/Main/System/Arena/ArenaManager.cs
index 7428ad2..a713e4b 100644
--- a/Main/System/Arena/ArenaManager.cs
+++ b/Main/System/Arena/ArenaManager.cs
@@ -41,7 +41,7 @@
public event Action OnUpdateGameRecInfo;
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += BeforePlayerDataInitializeEventOnRelogin;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
InitTable();
InitRedpoint();
@@ -49,15 +49,14 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= BeforePlayerDataInitializeEventOnRelogin;
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
}
- public void OnBeforePlayerDataInitializeEvent()
+ public void BeforePlayerDataInitializeEventOnRelogin()
{
matchInfoList.Clear();
gameRecDict.Clear();
- allFaceInfoDict.Clear();
}
void InitRedpoint()
diff --git a/Main/System/BoneField/BoneFieldManager.cs b/Main/System/BoneField/BoneFieldManager.cs
index 2cbd76b..45ac59e 100644
--- a/Main/System/BoneField/BoneFieldManager.cs
+++ b/Main/System/BoneField/BoneFieldManager.cs
@@ -9,7 +9,6 @@
public Redpoint parentRedpoint = new Redpoint(MainRedDot.MainChallengeRedpoint, MainRedDot.BoneFieldRepoint);
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEvent;
DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -18,7 +17,6 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEvent;
DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
@@ -51,11 +49,6 @@
if (mapId != DataMapID)
return;
UpdateRedPoint();
- }
-
- public void OnBeforePlayerDataInitializeEvent()
- {
- //mailDataDict.Clear();
}
public void UpdateRedPoint()
diff --git a/Main/System/Chat/ChatManager.cs b/Main/System/Chat/ChatManager.cs
index 701fede..4de0244 100644
--- a/Main/System/Chat/ChatManager.cs
+++ b/Main/System/Chat/ChatManager.cs
@@ -38,7 +38,7 @@
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
@@ -100,11 +100,13 @@
b = (byte)(sysBubbleColorArr.Length > 2 ? sysBubbleColorArr[2] : 0),
a = (byte)(sysBubbleColorArr.Length > 3 ? sysBubbleColorArr[3] : 255),
};
+
+ ParseChatBubbleConfig();
}
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
GuildManager.Instance.EnterOrQuitGuildEvent -= EnterOrQuitGuildEvent;
}
@@ -119,12 +121,11 @@
}
}
- private void OnBeforePlayerDataInitializeEvent()
+ private void OnBeforePlayerDataInitializeEventOnRelogin()
{
talkDict.Clear();
playerInfoDict.Clear();
currentDay = -1;
- ParseChatBubbleConfig();
nowChatChannel = ChatChannel.World;
nowChatTab = ChatTab.World;
}
diff --git a/Main/System/FirstCharge/FirstChargeManager.cs b/Main/System/FirstCharge/FirstChargeManager.cs
index 7eea873..950f46d 100644
--- a/Main/System/FirstCharge/FirstChargeManager.cs
+++ b/Main/System/FirstCharge/FirstChargeManager.cs
@@ -25,17 +25,22 @@
public event Action OnUpdateFirstChargeInfo;
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
RechargeManager.Instance.rechargeCountEvent += OnRechargeCountEvent;
TaskManager.Instance.OnTaskUpdate += OnTaskUpdate;
+
+ FuncConfigConfig config = FuncConfigConfig.Get("FirstCharge");
+ taskID = int.Parse(config.Numerical1);
+ nextTaskID = int.Parse(config.Numerical2);
+
InitClickTabDict();
InitRedPoint();
}
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
RechargeManager.Instance.rechargeCountEvent -= OnRechargeCountEvent;
TaskManager.Instance.OnTaskUpdate -= OnTaskUpdate;
@@ -113,13 +118,9 @@
}
}
- public void OnBeforePlayerDataInitializeEvent()
+ public void OnBeforePlayerDataInitializeEventOnRelogin()
{
firstChargeInfoDict.Clear();
-
- FuncConfigConfig config = FuncConfigConfig.Get("FirstCharge");
- taskID = int.Parse(config.Numerical1);
- nextTaskID = int.Parse(config.Numerical2);
}
public void OnPlayerLoginOk()
diff --git a/Main/System/LineupRecommend/LineupRecommendManager.cs b/Main/System/LineupRecommend/LineupRecommendManager.cs
index aeff54d..cc37550 100644
--- a/Main/System/LineupRecommend/LineupRecommendManager.cs
+++ b/Main/System/LineupRecommend/LineupRecommendManager.cs
@@ -20,7 +20,7 @@
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
HeroManager.Instance.onHeroChangeEvent += OnHeroChangeEvent;
HeroManager.Instance.onHeroDeleteEvent += OnHeroDeleteEvent;
@@ -30,7 +30,7 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
HeroManager.Instance.onHeroChangeEvent -= OnHeroChangeEvent;
HeroManager.Instance.onHeroDeleteEvent -= OnHeroDeleteEvent;
@@ -64,7 +64,7 @@
UpdateRedPoint();
}
- private void OnBeforePlayerDataInitializeEvent()
+ private void OnBeforePlayerDataInitializeEventOnRelogin()
{
haveDict.Clear();
}
diff --git a/Main/System/Mail/MailManager.cs b/Main/System/Mail/MailManager.cs
index 90f0f5c..3a0e309 100644
--- a/Main/System/Mail/MailManager.cs
+++ b/Main/System/Mail/MailManager.cs
@@ -27,16 +27,16 @@
{
tabRedpoint0 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Personal));
tabRedpoint1 = new Redpoint(MainRedDot.MailRepoint, GetTabRedpointId(MailCategory.Global));
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
personalMailMaxLimitCount = int.Parse(FuncConfigConfig.Get("PersonalMail").Numerical1);
}
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
}
- public void OnBeforePlayerDataInitializeEvent()
+ public void OnBeforePlayerDataInitializeEventOnRelogin()
{
mailDataDict.Clear();
}
diff --git a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
index 31e4118..b373111 100644
--- a/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
+++ b/Main/System/PhantasmPavilion/PhantasmPavilionManager.cs
@@ -47,7 +47,7 @@
public event Action OnTimeOut;
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
PlayerDatas.Instance.playerDataRefreshEvent += OnPlayerDataRefreshEvent;
PackManager.Instance.RefreshItemEvent += OnRefreshItemEvent;
@@ -59,7 +59,7 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
PlayerDatas.Instance.playerDataRefreshEvent -= OnPlayerDataRefreshEvent;
PackManager.Instance.RefreshItemEvent -= OnRefreshItemEvent;
@@ -97,7 +97,7 @@
UpdateRedPoint();
}
- public void OnBeforePlayerDataInitializeEvent()
+ public void OnBeforePlayerDataInitializeEventOnRelogin()
{
dataDict.Clear();
nowIDDict.Clear();
diff --git a/Main/System/PlayerProfile/RenameManager.cs b/Main/System/PlayerProfile/RenameManager.cs
index 8668324..5237e52 100644
--- a/Main/System/PlayerProfile/RenameManager.cs
+++ b/Main/System/PlayerProfile/RenameManager.cs
@@ -7,7 +7,7 @@
public int moneyNeed;
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
FuncConfigConfig config = FuncConfigConfig.Get("PlayerRename");
int[] arr = ConfigParse.GetMultipleStr<int>(config.Numerical3);
@@ -17,10 +17,10 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
}
- private void OnBeforePlayerDataInitializeEvent()
+ private void OnBeforePlayerDataInitializeEventOnRelogin()
{
RenameManagerCount = 0;
}
diff --git a/Main/System/TianziBillborad/TianziBillboradManager.cs b/Main/System/TianziBillborad/TianziBillboradManager.cs
index 1e1ae9e..7575e63 100644
--- a/Main/System/TianziBillborad/TianziBillboradManager.cs
+++ b/Main/System/TianziBillborad/TianziBillboradManager.cs
@@ -8,7 +8,6 @@
public readonly int rankType = 2; // 姒滃崟绫诲瀷
public readonly int funcId = 39; // 鍔熻兘Id
public readonly int DataMapID = 30020;
- public int nowTabIndex; // 0 鎺掕姒� 1 濂栧姳
public byte todayLineID; //浠婃棩鏄摢涓猯ineID锛屽搴斿壇鏈〃鐨勫姛鑳界嚎璺疘D
public ulong historyHurt; //鏈�冮獙鍘嗗彶鏈�澶т激瀹�
public ulong todayHurt; //鏈�冮獙浠婃棩鏈�澶т激瀹�
@@ -21,7 +20,7 @@
{
EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -36,7 +35,7 @@
{
EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.RemoveListener<string, JsonData>(EventName.BATTLE_END, OnSettlement);
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
@@ -44,13 +43,11 @@
UpdateTianziKYInfoExent -= OnUpdateTianziKYInfoExent;
}
- private void OnBeforePlayerDataInitializeEvent()
+ private void OnBeforePlayerDataInitializeEventOnRelogin()
{
- nowTabIndex = 0;
todayLineID = 0;
historyHurt = 0;
todayHurt = 0;
- // ClearBar();
isSkipSweepTip = false;
}
diff --git a/Main/System/TianziBillborad/TianziBillboradRankWin.cs b/Main/System/TianziBillborad/TianziBillboradRankWin.cs
index 77c663c..f8f4654 100644
--- a/Main/System/TianziBillborad/TianziBillboradRankWin.cs
+++ b/Main/System/TianziBillborad/TianziBillboradRankWin.cs
@@ -80,7 +80,6 @@
protected override void OpenSubUIByTabIndex()
{
- TianziBillboradManager.Instance.nowTabIndex = functionOrder;
transRank.SetActive(functionOrder == 0);
transAward.SetActive(functionOrder == 1);
Display();
--
Gitblit v1.8.0