From 71365e5c15d81759c04d7aab953fa757fb183f9b Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 12 十一月 2025 18:54:59 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Guild/GuildManager.cs |  483 ++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 438 insertions(+), 45 deletions(-)

diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index 1bb39f7..1b5706e 100644
--- a/Main/System/Guild/GuildManager.cs
+++ b/Main/System/Guild/GuildManager.cs
@@ -1,7 +1,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Text;
+using Cysharp.Threading.Tasks;
 using LitJson;
 using UnityEngine;
 
@@ -15,20 +17,59 @@
     public Dictionary<int, Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction[]>> familyActions = new Dictionary<int, Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction[]>>();
     public event Action<int, int> FamilyActionInfoEvent;    //鍏細鑷畾涔夎褰�, 鍏朵粬鍔熻兘浠庤繖鑾峰彇
 
+    //瑕佹搷浣滃摢涓垚鍛樼殑绱㈠紩
+    int m_MemberOPIndex = -1;
+    public event Action MemberOPIndexEvent;
+    public int memberOPIndex
+    {
+        get { return m_MemberOPIndex; }
+        set
+        {
+            m_MemberOPIndex = value;
+            MemberOPIndexEvent?.Invoke();
+        }
+    }
+
+    public byte[] donateCntList;
+    public event Action DonateCntListEvent;
+    public event Action<bool> EnterOrQuitGuildEvent;   //杩涘叆鎴栭��鍑哄叕浼氫簨浠�
+
+
     public override void Init()
     {
         ParseConfig();
-        // PlayerDatas.Instance.fairyData.OnRefreshFairyMine += OnRefreshFairyMine;
         DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
+        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
+        PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
     }
     public override void Release()
     {
-        // PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= OnRefreshFairyMine;
         DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= OnBeforePlayerDataInitialize;
+        DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent -= OnPlayerLoginOk;
+        PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefreshEvent;
     }
 
 
-    public void OnBeforePlayerDataInitialize()
+    void OnBeforePlayerDataInitialize()
+    {
+        ClearGuildData();
+    }
+
+    void OnPlayerLoginOk()
+    {
+        UpdateDonateRedPoint();
+        
+    }
+    
+    void PlayerDataRefreshEvent(PlayerDataType type)
+    {
+        if(type == PlayerDataType.default33)
+        {
+            UpdateDonateRedPoint();
+        }
+    }
+
+    void ClearGuildData()
     {
         m_FairyRequesteds.Clear();
         familyActions.Clear();
@@ -36,18 +77,36 @@
         applyList.Clear();
         PlayerDatas.Instance.fairyData.ClearData();
     }
-
-
-
-    private void OnRefreshFairyMine()
+    
+    //閫�鍑哄叕浼�
+    public void AfterQuitGuild()
     {
-        if (!PlayerDatas.Instance.fairyData.HasFairy)
-        {
-            //閫�鍑哄叕浼�
-            familyActions.Clear();
-        }
+        //閫�鍑哄叕浼�
+        ClearGuildData();
+        //闇�瑕佽浆鍒癏omeWin鐣岄潰 涓斿叧闂叕浼氱浉鍏崇晫闈�(鐖跺瓙缁ф壙鍏抽棴)
+        UIManager.Instance.GetUI<MainWin>()?.ClickFunc(0);
+
+
+        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);
+    }
 
 
     #region 閰嶇疆
@@ -78,8 +137,32 @@
     public int renameFairyNameCost;
     public int renameFairyNameMoneyType;
 
+
+    
+
+    //鐝嶅疂闃�(琛屽晢)
+    public int zhenbaogeCutState = 0;
+    public int zhenbaogeBuyState = 0;
+    public bool needCheckCutCD = false;
+    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>();
+    public event Action<bool> UpdateFamilyActionEvent;
+    public int zbgPriceType;
+    public int zbgOrgPriceValue;
+    public int zbgChangFamilyCD;
+    public List<int> cutCntListForTalk = new List<int>();
+
+
     void ParseConfig()
     {
+        DirtyWordConfig.DirtyWordInit();
+        DirtyNameConfig.DirtyNameInit();
+
         var config = FuncConfigConfig.Get("CreateFamily");
         createFairyCost = int.Parse(config.Numerical1);
         createMoneyType = int.Parse(config.Numerical2);
@@ -104,9 +187,14 @@
         config = FuncConfigConfig.Get("FamilyRename");
         renameFairyNameCD = int.Parse(config.Numerical2);
         var arr = ConfigParse.GetMultipleStr<int>(config.Numerical1);
-        renameFairyNameCost = arr[0];
-        renameFairyNameMoneyType = arr[1];
+        renameFairyNameMoneyType = arr[0];
+        renameFairyNameCost = arr[1];
 
+        config = FuncConfigConfig.Get("Zhenbaoge");
+        zbgPriceType = int.Parse(config.Numerical1);
+        zbgOrgPriceValue = int.Parse(config.Numerical2);
+        zbgChangFamilyCD = int.Parse(config.Numerical3);
+        cutCntListForTalk = JsonMapper.ToObject<List<int>>(config.Numerical4);
     }
 
 
@@ -212,19 +300,21 @@
         if (quitType == 0)
         {
             //琚涪
-            quitCount = PlayerDatas.Instance.baseData.leaveGuildInfo / 10 % 10;
+            quitCount = PlayerDatas.Instance.baseData.leaveGuildInfo / 10 % 10 - 1;
+            if (quitCount < 0) return 0;
             if (beQuitGuildPunishTime.Length != 0)
                 punishTime = beQuitGuildPunishTime[Math.Min(quitCount, beQuitGuildPunishTime.Length - 1)];
         }
         else if (quitType == 1)
         {
             //涓诲姩閫�鍑�
-            quitCount = PlayerDatas.Instance.baseData.leaveGuildInfo / 100;
+            quitCount = PlayerDatas.Instance.baseData.leaveGuildInfo / 100 - 1;
+            if (quitCount < 0) return 0;
             if (quitGuildPunishTime.Length != 0)
                 punishTime = quitGuildPunishTime[Math.Min(quitCount, quitGuildPunishTime.Length - 1)];
         }
 
-        return TimeUtility.AllSeconds - PlayerDatas.Instance.baseData.leaveFamilyTime - punishTime * 60;
+        return punishTime * 60 - (TimeUtility.AllSeconds - PlayerDatas.Instance.baseData.leaveFamilyTime);
     }
 
 
@@ -249,27 +339,8 @@
             return;
         }
 
-        int error;
-
-        //鑾峰彇name鐨勫瓧鑺傞暱搴︼紝name鍙兘鏄腑鏂� 鎴栬�呭叾浠栧崰鐢�3涓瓧绗︾殑绗﹀彿
-        if (!UIHelper.SatisfyNameLength(name, out error))
+        if (!CheckName(name))
         {
-            // TODO 鏆傛椂鎸変腑鏂囬暱搴︽彁绀�, 涓嶅悓璇█鍙牴鎹儏鍐典慨鏀�
-            if (error == 1)
-            {
-                SysNotifyMgr.Instance.ShowTip("NameError2", 7);
-                return;
-            }
-            else if (error == 2)
-            {
-                SysNotifyMgr.Instance.ShowTip("NameError1", 2);
-                return;
-            }
-        }
-
-        if (!CheckFairyNameLimit(name, out error))
-        {
-            ShowFairyNameErrorTip(error);
             return;
         }
 
@@ -279,6 +350,35 @@
         pack.EmblemWord = emblemWord;
         GameNetSystem.Instance.SendInfo(pack);
 
+    }
+
+    public bool CheckName(string name)
+    {
+        int error;
+
+        //鑾峰彇name鐨勫瓧鑺傞暱搴︼紝name鍙兘鏄腑鏂� 鎴栬�呭叾浠栧崰鐢�3涓瓧绗︾殑绗﹀彿
+        if (!UIHelper.SatisfyNameLength(name, out error))
+        {
+            // TODO 鏆傛椂鎸変腑鏂囬暱搴︽彁绀�, 涓嶅悓璇█鍙牴鎹儏鍐典慨鏀�
+            if (error == 1)
+            {
+                SysNotifyMgr.Instance.ShowTip("NameError2", 7);
+                return false;
+            }
+            else if (error == 2)
+            {
+                SysNotifyMgr.Instance.ShowTip("NameError1", 2);
+                return false;
+            }
+        }
+
+        if (!CheckFairyNameLimit(name, out error))
+        {
+            ShowFairyNameErrorTip(error);
+            return false;
+        }
+
+        return true;
     }
 
     #endregion
@@ -320,9 +420,15 @@
 
 
 
-    // 鍏細鑷畾涔夎褰�
+    #region  鍏細鑷畾涔夎褰�
     public void UpdateFamilyAction(HA513_tagMCFamilyActionInfo _package)
     {
+        if (PlayerDatas.Instance.fairyData == null ||
+            PlayerDatas.Instance.fairyData.fairy == null ||
+            PlayerDatas.Instance.fairyData.fairy.FamilyID != _package.FamilyID)
+        {
+            return;
+        }
 
         if (!familyActions.ContainsKey((int)_package.FamilyID))
         {
@@ -330,6 +436,9 @@
         }
 
         familyActions[(int)_package.FamilyID][_package.ActionType] = _package.FamilyActionList;
+
+        UpdateHawkerAction(_package);
+
         FamilyActionInfoEvent?.Invoke((int)_package.FamilyID, _package.ActionType);
     }
 
@@ -349,6 +458,16 @@
             return false;
         return true;
     }
+
+    public void QueryFamilyAction(int familyID, int actionType)
+    {
+        var pack = new CA617_tagCMQueryFamilyAction();
+        pack.FamilyID = (uint)familyID;
+        pack.ActionType = (byte)actionType;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
+
+    #endregion
 
 
 
@@ -485,7 +604,7 @@
     //id 0 浠ｈ〃涓�閿姞鍏�
     public void SendApplyGuild(int id, int type)
     {
-        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Fairy, true))
+        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Guild, true))
         {
             return;
         }
@@ -498,6 +617,12 @@
 
         if (type == 0)
         {
+            if (m_FairyRequesteds.Count >= requestGuildCount)
+            {
+                SysNotifyMgr.Instance.ShowTip("GuildSys9");
+                return;
+            }
+
             var cdSeconds = GetJoinCD();
             if (cdSeconds > 0)
             {
@@ -543,14 +668,22 @@
 
     #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)
     {
-        if (netPack.Type > 0)
+        guildChanged = true;
+        if (Time.time - lastChangeMarkTime < 0.2f)
         {
-            guildChanged = true;
+            //灏忎紭鍖� 濡傛灉鏈夐棶棰樹篃鍙互鍘婚櫎
+            return;
+        }
+        lastChangeMarkTime = Time.time;
+        if (UIManager.Instance.IsOpened<GuildHallWin>())
+        {
+            RequestGuildData();
         }
     }
 
@@ -572,6 +705,256 @@
         GameNetSystem.Instance.SendInfo(pak);
     }
 
+
+    //鑾峰彇闇�瑕佸叕浼氳亴浣嶇瓑绾�
+    public int GetNeedGuildJobLV(int guildFuncID)
+    {
+        if (guildWorkToLevel.ContainsKey(guildFuncID))
+        {
+            return guildWorkToLevel[guildFuncID];
+        }
+        return 0;
+    }
+
+
+    public void SendChangeMemberLV(int playerID, int lv)
+    {
+        var pack = new CA625_tagCMChangeFamilyMemLV();
+        pack.PlayerID = (uint)playerID;
+        pack.FmLV = (byte)lv;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
+
+    public void KickMember(int playerID)
+    {
+        var pack = new CA605_tagCMDeleteFamilyMember();
+        pack.MemberID = (uint)playerID;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
+
+    public void QuitGuild()
+    {
+
+        ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"),
+        Language.Get("Guild_46"), (bool isOK) =>
+            {
+                if (isOK)
+                {
+                    if (PlayerDatas.Instance.fairyData.fairy.MemberCount > 1 &&
+                    PlayerDatas.Instance.fairyData.mine.FmLV == 3)
+                    {
+                        SysNotifyMgr.Instance.ShowTip("GuildSys15");
+                        return;
+                    }
+                    var pack = new CA603_tagCMLeaveFamily();
+                    GameNetSystem.Instance.SendInfo(pack);
+                }
+            });
+
+
+    }
+
+    #region 鎹愯禒
+
+    public void UpdateDonateInfo(HA502_tagSCDonateCntInfo netPack)
+    {
+        donateCntList = netPack.DonateCntList;
+        DonateCntListEvent?.Invoke();
+        UpdateDonateRedPoint();
+    }
+    #endregion
+
+    #region 鐝嶅疂闃�
+        
+
+    public void UpdateZhenbaogeInfo(HA512_tagMCFamilyZhenbaogeInfo netPack)
+    {
+        //鐮嶄环鐘舵�侊細浠欑洘閲岃褰曞凡鐮嶄环鎵嶆槸鐪熺殑宸茬爫浠风姸鎬侊紝灏佸寘涓殑鐮嶄环鐘舵�佺敤浜庡垽鏂璫d闂撮殧浣跨敤
+        needCheckCutCD = netPack.CutState == 1;
+        zhenbaogeBuyState = netPack.BuyState;
+        UpdateZhenbaogeEvent?.Invoke();
+        UpdateZBGRedpoint();
+    }
+
+
+
+
+    //鐧诲綍鍚庨娆℃墦寮�鏌ヨ锛屾崲鏂颁粰鐩熸煡璇�
+    public void QueryZBGFamilyInfo()
+    {
+        if (isQueryZBGYet)
+            return;
+
+        QueryFamilyAction((int)PlayerDatas.Instance.baseData.FamilyId, ZBGFamilyActionType);
+
+        isQueryZBGYet = true;
+    }
+
+
+
+    //鏇存柊鐮嶄环淇℃伅
+    public void UpdateHawkerAction(HA513_tagMCFamilyActionInfo vNetData)
+    {
+        if (vNetData.ActionType != ZBGFamilyActionType)
+        {
+            return;
+        }
+        bool restart = false;
+        if (vNetData.FamilyActionList.Length == 1 && vNetData.FamilyActionList[0].Value1 == 1)
+        {
+            if (familyZBGActions.ContainsKey(1) && familyZBGActions[1].Time != vNetData.FamilyActionList[0].Time)
+            {
+                familyZBGActions.Clear();
+                sortPlayerCut.Clear();
+                restart = true;
+            }
+        }
+
+        for (int i = 0; i < vNetData.FamilyActionList.Length; i++)
+        {
+            int playerID = (int)vNetData.FamilyActionList[i].Value1;
+            familyZBGActions[playerID] = vNetData.FamilyActionList[i];
+
+        }
+
+        if (familyZBGActions.ContainsKey((int)PlayerDatas.Instance.baseData.PlayerID))
+        {
+            //鑷繁鏄惁宸茬爫浠� 浠庡垪琛ㄤ腑鏌ユ壘
+            zhenbaogeCutState = 1;
+        }
+        else
+        {
+            zhenbaogeCutState = 0;
+        }
+
+
+        sortPlayerCut = familyZBGActions.Keys.ToList();
+        if (sortPlayerCut.Contains(1))
+            sortPlayerCut.Remove(1);
+        sortPlayerCut.Sort((a, b) => { return familyZBGActions[a].Time.CompareTo(familyZBGActions[b].Time); });
+
+        UpdateFamilyActionEvent?.Invoke(restart);
+        UpdateZBGRedpoint();
+    }
+
+    //鐮嶄环浜烘暟
+    public int GetZBGFamilyActionCount()
+    {
+        return Math.Max(0, familyZBGActions.Count - 1);
+    }
+
+    public int GetTalkState()
+    {
+        int cnt = GetZBGFamilyActionCount();
+        for (int i = 0; i < cutCntListForTalk.Count; i++)
+        {
+            if (cnt < cutCntListForTalk[i])
+            {
+                return i;
+            }
+        }
+        return 0;
+    }
+
+    public int[][] GetZBGItems()
+    {
+        if (!familyZBGActions.ContainsKey(1))
+            return null;
+
+        return JsonMapper.ToObject<int[][]>(familyZBGActions[1].UseData);
+    }
+
+    public void OnZhenbaogeOP(byte type)
+    {
+        var pack = new CA616_tagCMZhenbaogeOP();
+        pack.OpType = type;
+        GameNetSystem.Instance.SendInfo(pack);
+    }
+
+
+    public Dictionary <int, FairyMember> tmpNoCutMembers = new Dictionary<int, FairyMember>();
+
+    //鏈浠锋垚鍛�
+    public void CalcNoCutMembers()
+    {
+        tmpNoCutMembers.Clear();
+        var fairy = PlayerDatas.Instance.fairyData;
+        if (fairy == null)
+        {
+            return;
+        }
+
+        foreach(var playerID in fairy.memberIDList)
+        {
+            if (!familyZBGActions.ContainsKey(playerID))
+            {
+                tmpNoCutMembers[playerID] = fairy.GetMember(playerID);
+            }
+        }
+    }
+
+    #endregion
+
+
+    #region 绾㈢偣
+    
+    Redpoint donateRedpoint = new Redpoint(MainRedDot.guildHallRedpointID, MainRedDot.donateRedpointID);
+    //鐝嶅疂闃�(琛屽晢)
+    Redpoint zbgRedpoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.hawkerRedpointID);
+
+    void UpdateDonateRedPoint()
+    {
+        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Guild))
+        {
+            return;
+        }
+        donateRedpoint.state = RedPointState.None;
+        if (PlayerDatas.Instance.fairyData.fairy == null)
+        {
+            return;
+        }
+
+        //鍙湁绗竴妗ｇ殑鎵嶉渶瑕佺孩鐐�
+        var config = FamilyDonateConfig.Get(1);
+        if (donateCntList == null)
+        {
+            if (UIHelper.CheckMoneyCount(config.MoneyType, config.MoneyValue))
+                donateRedpoint.state = RedPointState.Simple;
+            return;
+        }
+        if (donateCntList != null && donateCntList.Length > 0)
+        {
+            if (donateCntList[0] < config.DailyCnt)
+            {
+                if (UIHelper.CheckMoneyCount(config.MoneyType, config.MoneyValue))
+                    donateRedpoint.state = RedPointState.Simple;
+            }
+        }
+    }
+    
+    public void UpdateZBGRedpoint()
+    {
+        zbgRedpoint.state = RedPointState.None;
+
+        if (!PlayerDatas.Instance.fairyData.HasFairy)
+        {
+            return;
+        }
+
+        if (zhenbaogeCutState == 0)
+        {
+            zbgRedpoint.state = RedPointState.Simple;
+        }
+        else if (zhenbaogeBuyState == 0)
+        {
+            if (familyZBGActions[1].Value3 > 0)
+            {
+                zbgRedpoint.state = RedPointState.Simple;
+            }
+        }
+    }
+
+    #endregion
 
     #region 鍔犲瘑鏁板瓧
 
@@ -611,7 +994,7 @@
             SysNotifyMgr.Instance.ShowTip("GuildSys6");
             return "";
         }
-        
+
         encryptedStr = encryptedStr.Substring(1);
 
         if (reverseMap.IsNullOrEmpty())
@@ -629,8 +1012,8 @@
         }
         return originalStr.ToString().TrimStart('0'); // 鍘婚櫎鍓嶅闆�
     }
-    
-    
+
+
     int[] GenerateReverseMap(int[] map)
     {
         for (int i = 0; i < map.Length; i++)
@@ -643,4 +1026,14 @@
 
     #endregion
 
+}
+
+// 鏉冮檺ID: 1-鏀朵汉锛�2-鍙樻洿鑱屼綅锛�3-鍙戝竷鍏憡锛�4-韪汉
+public enum GuildFuncType
+{
+    Accept = 1,
+    ChangeJob = 2,
+    PublishNotice = 3,
+    Kick = 4,
+
 }
\ No newline at end of file

--
Gitblit v1.8.0