From d67e53ae6cb3136b8e1836978b93a3021460ba29 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 25 十二月 2025 16:56:16 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/BoneField/BoneFieldManager.cs | 45 +++++++--------------------------------------
1 files changed, 7 insertions(+), 38 deletions(-)
diff --git a/Main/System/BoneField/BoneFieldManager.cs b/Main/System/BoneField/BoneFieldManager.cs
index d7fc492..45ac59e 100644
--- a/Main/System/BoneField/BoneFieldManager.cs
+++ b/Main/System/BoneField/BoneFieldManager.cs
@@ -1,5 +1,4 @@
using System.Collections.Generic;
-using DG.DemiEditor;
using LitJson;
public class BoneFieldManager : GameSystemManager<BoneFieldManager>
{
@@ -10,8 +9,7 @@
public Redpoint parentRedpoint = new Redpoint(MainRedDot.MainChallengeRedpoint, MainRedDot.BoneFieldRepoint);
public override void Init()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEvent;
- DungeonManager.Instance.UpdateFBInfoChangeEvent += OnUpdateFBInfoChangeEvent;
+ DungeonManager.Instance.UpdateFBInfoListEvent += OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent += OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
TimeMgr.Instance.OnDayEvent += OnDayEvent;
@@ -19,8 +17,7 @@
public override void Release()
{
- DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEvent;
- DungeonManager.Instance.UpdateFBInfoChangeEvent -= OnUpdateFBInfoChangeEvent;
+ DungeonManager.Instance.UpdateFBInfoListEvent -= OnUpdateFBInfoChangeEvent;
AdsManager.Instance.OnAdsInfoListUpdateEvent -= OnAdsInfoListUpdateEvent;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
TimeMgr.Instance.OnDayEvent -= OnDayEvent;
@@ -38,26 +35,20 @@
UpdateRedPoint();
}
- private void OnUpdateFBInfoChangeEvent(int mapID, bool isADAddCntChange, bool isBuyAddCntChange, bool isItemAddCntChange)
+ private void OnUpdateFBInfoChangeEvent(int mapID)
{
int dataMapID = DataMapID;
if (mapID != dataMapID)
return;
- if (isADAddCntChange)
- return;
+
UpdateRedPoint();
}
- private void OnAdsInfoListUpdateEvent(int id, int mapId)
+ private void OnAdsInfoListUpdateEvent(int id, int type, int mapId)
{
if (mapId != DataMapID)
return;
UpdateRedPoint();
- }
-
- public void OnBeforePlayerDataInitializeEvent()
- {
- //mailDataDict.Clear();
}
public void UpdateRedPoint()
@@ -115,30 +106,10 @@
public bool TryGetShowSweepCount(out int showSweepMaxCount, out int showrealRemainSweepCount)
{
- showSweepMaxCount = 0;
- showrealRemainSweepCount = 0;
- int dataMapID = BoneFieldManager.Instance.DataMapID;
- if (!DungeonOpenTimeConfig.HasKey(dataMapID))
+ if (!DungeonManager.Instance.TryGetDungeonCount(DataMapID, out showSweepMaxCount, out showrealRemainSweepCount))
return false;
- if (!DungeonManager.Instance.TryGetFBInfoByMapID(dataMapID, out FBInfo fbInfo))
- return false;
- DungeonOpenTimeConfig dungeonOpenTimeConfig = DungeonOpenTimeConfig.Get(dataMapID);
- int baseCount = dungeonOpenTimeConfig.DayTimes + dungeonOpenTimeConfig.PayCntMax;
- int realMaxCount = baseCount + fbInfo.ADAddCnt + fbInfo.BuyAddCnt + fbInfo.ItemAddCnt;
- int realRemainSweepCount = realMaxCount - fbInfo.EnterCnt;
-
- showSweepMaxCount = realMaxCount - fbInfo.ADAddCnt - fbInfo.BuyAddCnt;
- showrealRemainSweepCount = realRemainSweepCount - fbInfo.BuyAddCnt;
return true;
- }
-
- public void SendTurnFight(int mapID, int funcLineID)
- {
- CB410_tagCMTurnFight pack = new CB410_tagCMTurnFight();
- pack.MapID = (uint)mapID;
- pack.FuncLineID = (uint)funcLineID;
- GameNetSystem.Instance.SendInfo(pack);
}
public void SendBBeginFBWipeOut(int mapID, int lineID)
@@ -150,8 +121,6 @@
GameNetSystem.Instance.SendInfo(pack);
}
-
-
public void SendBuyEnterCount(int FBID)
{
var pack = new CA575_tagCMBuyEnterCount();
@@ -161,7 +130,7 @@
public void UpdateFBEnd(H0320_tagFBEnd vNetData)
{
- if (vNetData.Msg.IsNullOrEmpty())
+ if (vNetData.Msg == null)
return;
ChallengeResultData result = ChallengeResultData.FromJson(vNetData.Msg);
if (result == null || result.itemInfo.IsNullOrEmpty())
--
Gitblit v1.8.0