From 1ad03cc2f91d75e80fc3dc42e2ac1fadc9a2bfec Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 11 二月 2026 16:10:43 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Guild/GuildManager.cs |  342 +++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 273 insertions(+), 69 deletions(-)

diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 23369b2..4366d50 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -8,8 +8,14 @@
 using UnityEngine;
 
 
-public class GuildManager : GameSystemManager<GuildManager>
+public partial class GuildManager : GameSystemManager<GuildManager>
 {
+    // 瀹舵棌鑷畾涔夎褰曠被鍨�
+    public const int MemberChangeActionType = 12;      //鍏細鍙樻洿璁板綍
+    public const int FamilyActionsType = 15;     // 鍏細璁板綍寰界珷绫诲瀷15
+    public const int ZBGFamilyActionType = 16;  // 鐝嶅疂闃佽褰曠被鍨�
+    public const int GuildBossActionType = 18;  //璁ㄤ紣
+
     // 鐢宠鐨勫叕浼氬垪琛�
     private List<int> m_FairyRequesteds = new List<int>();
     // 鍏細鑷畾涔夎褰曢檮鍔犳暟鎹紝鎸夌被鍨嬪瓨鍌�
@@ -32,27 +38,45 @@
 
     public byte[] donateCntList;
     public event Action DonateCntListEvent;
-    public event Action<bool> EnterOrQuitGuildEvent;   //杩涘叆鎴栭��鍑哄叕浼氫簨浠�
+    public event Action<bool> EnterOrQuitGuildEvent;   //true杩涘叆鎴杅alse閫�鍑哄叕浼氫簨浠�
 
 
     public override void Init()
     {
         ParseConfig();
-        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
+        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitialize;
+        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitializeEx;
         DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
         PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
+        TimeMgr.Instance.OnHourEvent += UpdateZBGRedpoint;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
     }
     public override void Release()
     {
-        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;
+        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitialize;
+        DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitializeEx;
         DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
         PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
+        TimeMgr.Instance.OnHourEvent -= UpdateZBGRedpoint;
+        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
     }
 
+    private void OnRefreshFairyInfo()
+    {
+        UpdateRequestRedpoint();
+    }
 
     void OnBeforePlayerDataInitialize()
     {
+        zoneID = 0;
+        crossServerIDList.Clear();
         ClearGuildData();
+        donateCntList = null;
+    }
+
+    void OnBeforePlayerDataInitializeEx()
+    {
+        isQueryZBGYet = false;
     }
 
     void OnPlayerLoginOk()
@@ -60,10 +84,10 @@
         UpdateDonateRedPoint();
         QueryZBGFamilyInfo();
     }
-    
+
     void PlayerDataRefreshEvent(PlayerDataType type)
     {
-        if(type == PlayerDataType.default33)
+        if (type == PlayerDataType.default33)
         {
             UpdateDonateRedPoint();
         }
@@ -71,13 +95,18 @@
 
     void ClearGuildData()
     {
+        PlayerDatas.Instance.baseData.FamilyId = 0;
         m_FairyRequesteds.Clear();
         familyActions.Clear();
-        guildChanged = false;
         applyList.Clear();
         PlayerDatas.Instance.fairyData.ClearData();
+
+        isQueryZBGYet = false;
+        zhenbaogeCutState = 0;
+        familyZBGActions.Clear();
+        sortPlayerCut.Clear();
     }
-    
+
     //閫�鍑哄叕浼�
     public void AfterQuitGuild()
     {
@@ -87,23 +116,24 @@
         UIManager.Instance.GetUI<MainWin>()?.ClickFunc(0);
 
 
-        isQueryZBGYet = false;
-        zhenbaogeCutState = 0;
-        familyZBGActions.Clear();
-        sortPlayerCut.Clear();
-        
+        // isQueryZBGYet = false;
+        // zhenbaogeCutState = 0;
+        // familyZBGActions.Clear();
+        // sortPlayerCut.Clear();
+
         UpdateZBGRedpoint();
         UpdateDonateRedPoint();
         EnterOrQuitGuildEvent?.Invoke(false);
     }
 
-    //娉ㄦ剰涓婄嚎閫氱煡鍏細鏁版嵁鏃朵篃浼氳Е鍙�
+    //娉ㄦ剰涓婄嚎閫氱煡鍏細鏁版嵁鏃朵篃浼氳Е鍙�; 浣嗘柇绾块噸杩炰笉浼氳Е鍙�
     public async UniTask AfterEnterGuild()
     {
         //杩欓噷杩樻病鏈夊叕浼氭暟鎹�, 鍚庣画鐨勫寘浼氭洿鏂板叕浼氭暟鎹�
         await UniTask.Delay(100);
         UpdateDonateRedPoint();
         UpdateZBGRedpoint();
+        QueryZBGFamilyInfo();
         EnterOrQuitGuildEvent?.Invoke(true);
     }
 
@@ -137,7 +167,7 @@
     public int renameFairyNameMoneyType;
 
 
-    
+
 
     //鐝嶅疂闃�(琛屽晢)
     public int zhenbaogeCutState = 0;
@@ -146,7 +176,7 @@
     public event Action UpdateZhenbaogeEvent;
     public bool isQueryZBGYet = false;
     public float lastZBGStartTime = 0; //杩囧ぉ鍒锋柊鐢�
-    public const int ZBGFamilyActionType = 16;
+
     //{id:鏁版嵁} 鐮嶄环琛屼负锛寁alue1涓虹帺瀹禝D锛岀壒娈婄害瀹氫负1鏃朵负瀹舵棌鐨勬暟鎹�
     public Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction> familyZBGActions = new Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction>();
     public List<int> sortPlayerCut = new List<int>();
@@ -155,7 +185,7 @@
     public int zbgOrgPriceValue;
     public int zbgChangFamilyCD;
     public List<int> cutCntListForTalk = new List<int>();
-
+    public int familyRecordMaxCount;
 
     void ParseConfig()
     {
@@ -194,6 +224,14 @@
         zbgOrgPriceValue = int.Parse(config.Numerical2);
         zbgChangFamilyCD = int.Parse(config.Numerical3);
         cutCntListForTalk = JsonMapper.ToObject<List<int>>(config.Numerical4);
+
+        config = FuncConfigConfig.Get("FamilyNote");
+        familyRecordMaxCount = int.Parse(config.Numerical1);
+
+
+        config = FuncConfigConfig.Get("FamilyBillboardSet");
+        pageCnt = int.Parse(config.Numerical1);
+        queryPointNum = int.Parse(config.Numerical2);
     }
 
 
@@ -313,7 +351,7 @@
                 punishTime = quitGuildPunishTime[Math.Min(quitCount, quitGuildPunishTime.Length - 1)];
         }
 
-        return punishTime * 60 - (TimeUtility.AllSeconds - PlayerDatas.Instance.baseData.leaveFamilyTime);
+        return punishTime * 60 - (TimeUtility.GetCommServerTick(zoneID)- PlayerDatas.Instance.baseData.leaveFamilyTime);
     }
 
 
@@ -384,7 +422,6 @@
 
 
 
-
     #region 浠欑洘鍟嗗簵寮�鍚�
     public int fairyStoreLimit = 0;
     public bool fairyStoreOpen
@@ -422,13 +459,36 @@
     #region  鍏細鑷畾涔夎褰�
     public void UpdateFamilyAction(HA513_tagMCFamilyActionInfo _package)
     {
-        if (PlayerDatas.Instance.fairyData == null ||
-            PlayerDatas.Instance.fairyData.fairy == null ||
-            PlayerDatas.Instance.fairyData.fairy.FamilyID != _package.FamilyID)
+        if (PlayerDatas.Instance.baseData.FamilyId != _package.FamilyID)
         {
             return;
         }
 
+        // 琛屽晢 鐮嶄环
+        if (UpdateHawkerAction(_package))
+        {
+            return;
+        }
+
+        // 寰界珷
+        if (GuildEmblemModel.Instance.UpdateEmblemAction(_package))
+        {
+            return;
+        }
+
+        // 鍏細璁ㄤ紣
+        if (GuildBossManager.Instance.UpdateGuildBossInfo(_package))
+        {
+            return;
+        }
+
+        //涓婇潰鍚勪釜鍔熻兘瑕乺eturn
+        UpdataCommonAction(_package);
+    }
+
+    // 閫氱敤璁板綍 鍙�傜敤鍗曟潯鏁版嵁鐨勮褰曟儏鍐� 鎴栨湁鏈嶅姟绔繚璇佸垪琛ㄥ叏閮ㄤ俊鎭洿鎺ヨ鐩栵紝鍏朵粬鍔熻兘姣旇緝澶嶆潅鍚勮嚜璐熻矗瀛樺偍
+    void UpdataCommonAction(HA513_tagMCFamilyActionInfo _package)
+    {
         if (!familyActions.ContainsKey((int)_package.FamilyID))
         {
             familyActions.Add((int)_package.FamilyID, new Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction[]>());
@@ -436,11 +496,10 @@
 
         familyActions[(int)_package.FamilyID][_package.ActionType] = _package.FamilyActionList;
 
-        UpdateHawkerAction(_package);
-
         FamilyActionInfoEvent?.Invoke((int)_package.FamilyID, _package.ActionType);
     }
 
+    // 閫氱敤璁板綍 
     public bool TryGetFamilyActions(int actionType, out HA513_tagMCFamilyActionInfo.tagMCFamilyAction[] familyAction)
     {
         familyAction = null;
@@ -476,10 +535,70 @@
 
     // 鏌ユ壘鐨勫叕浼欼D锛氬叕浼氭暟鎹�
     public Dictionary<int, FairyData> guildsDict = new Dictionary<int, FairyData>();
+    public int myFairyRank;
     // 鎸夋煡璇㈤〉瀛樺偍
     public List<int> pageIndexList = new List<int>();  //姝e父鏄寜椤垫煡璇紝椤哄簭娣诲姞鍗冲彲
     public int curPageIndex;
     public int totalPageCount;
+
+    public int lastPage = -1;
+    public int pageCnt; //姣忛〉鏌ヨ鏉℃暟
+    int queryPointNum;  //鏌ヨ鐐�
+
+    public bool isPowerSort
+    {
+        get
+        {
+            return LocalSave.GetBool($"GuildApplyList_IsPowerSort_{PlayerDatas.Instance.PlayerId}");
+        }
+        set
+        {
+            LocalSave.SetBool($"GuildApplyList_IsPowerSort_{PlayerDatas.Instance.PlayerId}", value);
+        }
+    }
+
+
+    public FairyData GetFairyDataByRank(int rank)
+    {
+        if (rank < 1)
+            return null;
+        int index = rank - 1;
+        FairyData fairyData = GetFairyDataByIndex(index);
+        return fairyData;
+    }
+
+    public FairyData GetFairyDataByIndex(int index)
+    {
+        if (pageIndexList.IsNullOrEmpty() || index < 0 || index >= pageIndexList.Count)
+            return null;
+        int fairyID = pageIndexList[index];
+        FairyData fairyData = GetFairyData(fairyID);
+        return fairyData;
+    }
+
+    public FairyData GetFairyData(int fairyID)
+    {
+        return guildsDict.TryGetValue(fairyID, out var data) ? data : null;
+    }
+
+    public void ResetQueryParam()
+    {
+        pageCnt = 20;
+        lastPage = -1;
+        queryPointNum = 12;
+    }
+
+    public void ListenRankPage(int index)
+    {
+        int page = index / pageCnt;
+        if (index > page * pageCnt + queryPointNum)
+        {
+            if (lastPage >= page)
+                return;
+            lastPage = page;
+            SendFindGuild(string.Empty, page + 1, pageCnt);
+        }
+    }
 
     //鏌ユ壘鍏細鍒楄〃
     public void OnRefreshGuildViewList(HA523_tagMCFamilyViewList vNetData)
@@ -494,7 +613,7 @@
             SetFairyViewData(data, guildInfo);
             pageIndexList.Add((int)guildInfo.FamilyID);
         }
-
+        myFairyRank = (int)vNetData.Rank;   //0-娌℃湁鍏細鎴栨病鏈夊湪姒滀笂锛�>0-瀵瑰簲鎺掑悕
 
         if (OnRefreshFairyList != null)
         {
@@ -527,13 +646,13 @@
         GameNetSystem.Instance.SendInfo(pack);
     }
 
-
     public static void SetFairyViewData(FairyData data, HA523_tagMCFamilyViewList.tagMCFamilyView view)
     {
         data.Rank = view.Rank;
         data.FamilyID = (int)view.FamilyID;
         data.FamilyName = view.FamilyName;
         data.LeaderID = (int)view.LeaderID;
+        data.LeaderServerID = (int)view.LeaderServerID;
         data.LeaderName = view.LeaderName;
         data.FamilyLV = view.FamilyLV;
         data.JoinReview = view.JoinReview;
@@ -543,16 +662,52 @@
         data.EmblemWord = view.EmblemWord;
         data.totalFightPower = view.FightPowerEx * Constants.ExpPointValue + view.FightPower;
         data.MemberCount = view.MemberCount;
-
     }
 
+    #endregion
+
+    #region 鏌ョ湅鐩爣鍏細
+    public Dictionary<int, FairyData> viewGuildsDict = new Dictionary<int, FairyData>();
+
+    public event Action OnUpdateViewFamilyInfo;
+
+    public void UpdateViewFamilyInfo(HA519_tagSCTagFamilyInfo pack)
+    {
+        FairyData data = new FairyData();
+        SetFairyViewData(data, pack);
+        viewGuildsDict[(int)data.FamilyID] = data;
+        OnUpdateViewFamilyInfo?.Invoke();
+    }
+
+    public static void SetFairyViewData(FairyData data, HA519_tagSCTagFamilyInfo view)
+    {
+        data.FamilyID = (int)view.FamilyID;
+        data.FamilyName = view.FamilyName;
+        data.LeaderID = (int)view.LeaderID;
+        data.LeaderServerID = (int)view.LeaderServerID;
+        data.LeaderName = view.LeaderName;
+        data.FamilyLV = view.FamilyLV;
+        data.ServerID = (int)view.ServerID;
+        data.EmblemID = (int)view.EmblemID;
+        data.EmblemWord = view.EmblemWord;
+        data.totalFightPower = view.FightPowerEx * Constants.ExpPointValue + view.FightPower;
+        data.MemberCount = view.MemberCount;
+    }
+
+    public void SendViewGuild(int fairyID, int serverID)
+    {
+        var pack = new CA619_tagCSViewTagFamily();
+        pack.FamilyID = (uint)fairyID;
+        pack.DataServerID = (uint)serverID;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
     #endregion
 
     #region 鐢宠鍒楄〃
     public event Action OnRefreshApplyList;
     private List<FairyApply> applyList = new List<FairyApply>();
     private Redpoint memberRedpoint = new Redpoint(107, 10702);
-    private Redpoint applyRedpoint = new Redpoint(10702, 1070201);
+    private Redpoint applyRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, 1070201);
 
     //鐢宠鍔犲叆鐨勭帺瀹朵俊鎭�
     public void OnRefreshRequestJoinPlayerInfo(HA522_tagMCFamilyReqJoinInfo vNetData)
@@ -581,6 +736,9 @@
         }
         UpdateRequestRedpoint();
     }
+
+
+
 
     void UpdateRequestRedpoint()
     {
@@ -636,6 +794,12 @@
                     SysNotifyMgr.Instance.ShowTip("jiazu_lhs_202580");
                     return;
                 }
+
+                if (guildsDict[id].JoinLVMin > PlayerDatas.Instance.baseData.realmLevel && RealmConfig.HasKey(guildsDict[id].JoinLVMin))
+                {
+                    SysNotifyMgr.Instance.ShowTip("GuildApply01", RealmConfig.Get(guildsDict[id].JoinLVMin).Name);
+                    return;
+                }
             }
         }
 
@@ -663,39 +827,64 @@
         return 0;
     }
 
+    public void SendJoinFamilyReply(int tagPlayerID, bool isOK)
+    {
+        CA621_tagCMJoinFamilyReply pack = new CA621_tagCMJoinFamilyReply();
+        pack.TagPlayerID = (uint)tagPlayerID;
+        pack.IsOK = (byte)(isOK ? 1 : 0);
+        GameNetSystem.Instance.SendInfo(pack);
+    }
 
+    public void SendChangeFamilyJoin(int joinReview, int joinLVMin)
+    {
+        CA622_tagCMChangeFamilyJoin pack = new CA622_tagCMChangeFamilyJoin();
+        pack.JoinReview = (byte)joinReview;
+        pack.JoinLVMin = (ushort)joinLVMin;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
 
+    public void SendRequestJoinFamilyByPlayer(int tagPlayerID)
+    {
+        CA601_tagCMRequestJoinFamilyByPlayer pack = new CA601_tagCMRequestJoinFamilyByPlayer();
+        pack.TagPlayerID = (uint)tagPlayerID;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
+
+    List<string> optionStrings = null;
+    List<int> options = null;
+    public bool TryGetApplyOptions(out List<int> optionKeys, out List<string> optionValues)
+    {
+        optionKeys = null;
+        optionValues = null;
+
+        if (options == null)
+        {
+            options = new List<int>();
+            options = new List<int>(RealmConfig.GetKeys());
+            options.Sort();
+            options.Remove(0);
+        }
+
+        if (optionStrings == null)
+        {
+            optionStrings = new List<string>();
+            foreach (int lv in options)
+            {
+                if (!RealmConfig.HasKey(lv))
+                    continue;
+                RealmConfig realmConfig = RealmConfig.Get(lv);
+                optionStrings.Add(UIHelper.AppendColor(OfficialRankManager.Instance.GetOfficialRankColor(realmConfig.Quality), realmConfig.Name));
+            }
+        }
+
+        if (options.IsNullOrEmpty() || optionStrings.IsNullOrEmpty() || options.Count != optionStrings.Count)
+            return false;
+        optionKeys = options;
+        optionValues = optionStrings;
+        return true;
+    }
     #endregion
 
-    float lastChangeMarkTime = 0;   //鎵撳紑鐣岄潰鎯呭喌涓嬮伩鍏嶇煭鏃堕棿澶氭绔嬪嵆璇锋眰锛孋/S閫氫俊涔熸槸鏈夋椂闂撮棿闅�
-    public bool guildChanged = false;
-    //Type锛�0-鏃狅紱1-鎴愬憳鍔犲叆锛�2-鎴愬憳閫�鍑猴紱3-鏀朵汉璁剧疆淇敼锛�4-鍏憡淇敼锛�5-寰界珷淇敼锛�6-鐩熶富鍙樻洿锛�7-鎴愬憳鑱屼綅鍙樻洿锛�8-鎴愬憳涓婄嚎锛�9-鎴愬憳绂荤嚎锛�
-    //鍏細鏁版嵁鍙樺寲锛岃姹傛柊鐨勫叕浼氫俊鎭紝濡傚湪鎵撳紑鍏細鍒楄〃鏃惰姹傦紝鍏朵粬鍔熻兘鏍规嵁鑷韩鎯呭喌璇锋眰
-    public void UpdateGuildDataChangeMark(HA521_tagMCFamilyChange netPack)
-    {
-        guildChanged = true;
-        if (Time.time - lastChangeMarkTime < 0.2f)
-        {
-            //灏忎紭鍖� 濡傛灉鏈夐棶棰樹篃鍙互鍘婚櫎
-            return;
-        }
-        lastChangeMarkTime = Time.time;
-        if (UIManager.Instance.IsOpened<GuildHallWin>())
-        {
-            RequestGuildData();
-        }
-    }
-
-    public void RequestGuildData()
-    {
-        if (guildChanged)
-        {
-            guildChanged = false;
-            var pack = new CA626_tagCMGetFamilyInfo();
-            GameNetSystem.Instance.SendInfo(pack);
-
-        }
-    }
 
     public void SendKickFairy(uint playerID)
     {
@@ -764,7 +953,7 @@
     #endregion
 
     #region 鐝嶅疂闃�
-        
+
 
     public void UpdateZhenbaogeInfo(HA512_tagMCFamilyZhenbaogeInfo netPack)
     {
@@ -781,10 +970,15 @@
     //鐧诲綍鍚庨娆℃墦寮�鏌ヨ锛屾崲鏂颁粰鐩熸煡璇�
     public void QueryZBGFamilyInfo()
     {
+        if (PlayerDatas.Instance.baseData.FamilyId == 0)
+        {
+            return;
+        }
         if (isQueryZBGYet)
             return;
 
-        QueryFamilyAction((int)PlayerDatas.Instance.baseData.FamilyId, 16);
+
+        QueryFamilyAction((int)PlayerDatas.Instance.baseData.FamilyId, ZBGFamilyActionType);
 
         isQueryZBGYet = true;
     }
@@ -792,15 +986,21 @@
 
 
     //鏇存柊鐮嶄环淇℃伅
-    public void UpdateHawkerAction(HA513_tagMCFamilyActionInfo vNetData)
+    public bool UpdateHawkerAction(HA513_tagMCFamilyActionInfo vNetData)
     {
         if (vNetData.ActionType != ZBGFamilyActionType)
         {
-            return;
+            return false;
         }
         bool restart = false;
-        if (vNetData.FamilyActionList.Length == 1 && vNetData.FamilyActionList[0].Value1 == 1)
+
+        for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
         {
+            int playerID = (int)vNetData.FamilyActionList[i].Value1;
+            if (playerID != 1)
+            {
+                continue;
+            }
             if (familyZBGActions.ContainsKey(1) && familyZBGActions[1].Time != vNetData.FamilyActionList[0].Time)
             {
                 familyZBGActions.Clear();
@@ -808,6 +1008,7 @@
                 restart = true;
             }
         }
+
 
         for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
         {
@@ -834,6 +1035,8 @@
 
         UpdateFamilyActionEvent?.Invoke(restart);
         UpdateZBGRedpoint();
+
+        return true;
     }
 
     //鐮嶄环浜烘暟
@@ -871,7 +1074,7 @@
     }
 
 
-    public Dictionary <int, FairyMember> tmpNoCutMembers = new Dictionary<int, FairyMember>();
+    public Dictionary<int, FairyMember> tmpNoCutMembers = new Dictionary<int, FairyMember>();
 
     //鏈浠锋垚鍛�
     public void CalcNoCutMembers()
@@ -883,7 +1086,7 @@
             return;
         }
 
-        foreach(var playerID in fairy.memberIDList)
+        foreach (var playerID in fairy.memberIDList)
         {
             if (!familyZBGActions.ContainsKey(playerID))
             {
@@ -894,12 +1097,11 @@
 
     #endregion
 
-
     #region 绾㈢偣
-    Redpoint hallRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.guildHallRedpointID);
-    Redpoint donateRedpoint = new Redpoint(MainRedDot.guildHallRedpointID, MainRedDot.guildHallRedpointID * 10);
+
+    Redpoint donateRedpoint = new Redpoint(MainRedDot.guildHallRedpointID, MainRedDot.donateRedpointID);
     //鐝嶅疂闃�(琛屽晢)
-    Redpoint zbgRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.MainGuildRedpoint * 100 + 1);
+    Redpoint zbgRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.hawkerRedpointID);
 
     void UpdateDonateRedPoint()
     {
@@ -930,7 +1132,7 @@
             }
         }
     }
-    
+
     public void UpdateZBGRedpoint()
     {
         zbgRedpoint.state = RedPointState.None;
@@ -939,6 +1141,8 @@
         {
             return;
         }
+        if (TimeUtility.GetCommServerNow(zoneID).Hour < 10)
+            return;
 
         if (zhenbaogeCutState == 0)
         {

--
Gitblit v1.8.0