From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式
---
Main/System/Guild/GuildManager.cs | 292 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 287 insertions(+), 5 deletions(-)
diff --git a/Main/System/Guild/GuildManager.cs b/Main/System/Guild/GuildManager.cs
index f195061..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;
@@ -28,20 +30,43 @@
}
}
+ public byte[] donateCntList;
+ public event Action DonateCntListEvent;
+ public event Action<bool> EnterOrQuitGuildEvent; //杩涘叆鎴栭��鍑哄叕浼氫簨浠�
+
+
public override void Init()
{
ParseConfig();
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += OnBeforePlayerDataInitialize;
+ DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
+ PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefreshEvent;
}
public override void Release()
{
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()
@@ -53,15 +78,35 @@
PlayerDatas.Instance.fairyData.ClearData();
}
- public void ClearGuildWhenQuit()
+ //閫�鍑哄叕浼�
+ public void AfterQuitGuild()
{
//閫�鍑哄叕浼�
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 閰嶇疆
@@ -91,6 +136,27 @@
public int renameFairyNameCD;
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()
{
@@ -124,6 +190,11 @@
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);
}
@@ -352,6 +423,12 @@
#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))
{
@@ -359,6 +436,9 @@
}
familyActions[(int)_package.FamilyID][_package.ActionType] = _package.FamilyActionList;
+
+ UpdateHawkerAction(_package);
+
FamilyActionInfoEvent?.Invoke((int)_package.FamilyID, _package.ActionType);
}
@@ -382,7 +462,7 @@
public void QueryFamilyAction(int familyID, int actionType)
{
var pack = new CA617_tagCMQueryFamilyAction();
- pack.FamilyID = (ushort)familyID;
+ pack.FamilyID = (uint)familyID;
pack.ActionType = (byte)actionType;
GameNetSystem.Instance.SendInfo(pack);
}
@@ -524,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;
}
@@ -674,6 +754,208 @@
}
+ #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 鍔犲瘑鏁板瓧
//1. 灏嗘暟瀛楄ˉ鍏呭埌10浣嶏紝涓嶈冻琛�0
--
Gitblit v1.8.0