From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version
---
Main/System/Guild/GuildBossManager.cs | 309 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 295 insertions(+), 14 deletions(-)
diff --git a/Main/System/Guild/GuildBossManager.cs b/Main/System/Guild/GuildBossManager.cs
index 107246f..02c70f1 100644
--- a/Main/System/Guild/GuildBossManager.cs
+++ b/Main/System/Guild/GuildBossManager.cs
@@ -1,8 +1,45 @@
+using System;
+using System.Collections.Generic;
using LitJson;
public class GuildBossManager : GameSystemManager<GuildBossManager>
{
+
+ public Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction> bossActions = new Dictionary<int, HA513_tagMCFamilyActionInfo.tagMCFamilyAction>();
+ // 鐜╁浼ゅ鎺掕
+ public List<HA513_tagMCFamilyActionInfo.tagMCFamilyAction> playerBossHurtRank = new List<HA513_tagMCFamilyActionInfo.tagMCFamilyAction>();
+ //鏃堕棿鎴筹細璁ㄤ紣鏁版嵁; 鐢ㄤ簬鎾斁姣忔鏀诲嚮
+ public Dictionary<int, TaofaAtkData> taofaAtkData = new Dictionary<int, TaofaAtkData>();
+ //鎸夋椂闂撮『搴忔挱鏀撅紝褰撳墠鎾斁鐨則ick锛屽鏋滄壘涓嶅埌鍒欎粠绗竴涓紑濮�
+ public int lastPlayTick
+ {
+ get
+ {
+ return LocalSave.GetInt("lastPlayTick" + PlayerDatas.Instance.baseData.PlayerID);
+ }
+ set
+ {
+ LocalSave.SetInt("lastPlayTick" + PlayerDatas.Instance.baseData.PlayerID, value);
+ }
+ }
+ //鐜╁ID锛氱帺瀹舵暟鎹� 锛堥��鍑哄叕浼氱殑鐜╁锛�
+ public Dictionary<int, MemberData> taofaPlayerData = new Dictionary<int, MemberData>();
+ public event Action BossHurtEvent;
+
+ //鑷繁鐨勬暟鎹�
+ public byte m_BuZhenState; // 鏄惁宸插竷闃�
+ public ushort m_AtkCount; // 宸叉柀鏉�娆℃暟锛岀敤浜庤绠楀墿浣欐鏁�=鍏嶈垂娆℃暟+閬撳叿澧炲姞娆℃暟-宸叉柀鏉�娆℃暟
+ public ushort m_ItemAddCount; // 閬撳叿澧炲姞鏂╂潃娆℃暟
+ public ushort m_Anger; // 褰撳墠鎬掓皵鍊�
+ public ushort m_BoxUnGetCount; // 褰撳墠鏈鍙栫殑瀹濈鏁帮紝鍗冲彲棰嗗彇鐨�
+ public long m_BoxHurt; // 浠婃棩浼ゅ
+ public long m_BoxHurtHis; // 鍘嗗彶浼ゅ
+
+ //鏀诲嚮鏁版嵁
+ public HA504_tagSCFamilyTaofaAtkRet atkResult;
+ public event Action AtkResultEvent;
+
//閰嶇疆
public int initSuperHitRate;
public int[] bzAddAttrs;
@@ -12,13 +49,18 @@
public int[][] atkItemList;
public int maxAngerValue;
- public int[] bxCumulativeDamageList;
+ long[] bxCumulativeDamageList;
+ public List<long> allBXCumulativeDamageList = new List<long>();
public int bxDailyMax; //涓汉姣忔棩浜у嚭涓婇檺
- public int bxDailyAwardMax; //涓汉姣忔棩棰嗗彇濂栧姳涓婇檺
+ public long lastDmgAddValue; // 鏈�鍚庝竴妗ｄ激瀹冲鍊煎惊鐜敤
+ public int addAtkCntItemID = 17; //澧炲姞璁ㄤ紣娆℃暟閬撳叿ID
+ public int bossSkinID = 7100300;
+
+
void ParseConfig()
{
// 鏁板��1锛氬垵濮嬫毚鍑荤巼涓囧垎鐜囷紝鍔熻兘鐙珛鐨勬毚鍑荤巼锛屼笌瑙掕壊鏆村嚮鏃犲叧
- // 鏁板��3锛氬竷闃垫渶澶у眰绾э紝鏆傚浐瀹氭瘡浜�1娆★紝1娆�1灞�
+ // 鏁板��3锛氬竷闃垫渶澶у眰绾�
var config = FuncConfigConfig.Get("FamilyTaofaBuzhen");
initSuperHitRate = int.Parse(config.Numerical1);
bzAddAttrs = ConfigParse.GetMultipleStr<int>(config.Numerical2);
@@ -36,18 +78,70 @@
// 鏁板��2锛氭瘡鏃ヤ釜浜鸿础鐚疂绠辨暟涓婇檺锛屾渶鍚庝竴妗ｅ彲寰幆锛屼笂闄愭帶鍒�
// 鏁板��3锛氭瘡鏃ヤ釜浜洪鍙栧疂绠卞鍔变釜鏁颁笂闄�
config = FuncConfigConfig.Get("FamilyTaofaBox");
- bxCumulativeDamageList = JsonMapper.ToObject<int[]>(config.Numerical1);
+ bxCumulativeDamageList = JsonMapper.ToObject<long[]>(config.Numerical1);
bxDailyMax = int.Parse(config.Numerical2);
- bxDailyAwardMax = int.Parse(config.Numerical3);
+ lastDmgAddValue = bxCumulativeDamageList[bxCumulativeDamageList.Length - 1] - bxCumulativeDamageList[bxCumulativeDamageList.Length - 2];
+ //鏈�鍚庝竴妗ｅ惊鐜�
+ for (int i = 0; i < bxDailyMax; i++)
+ {
+ if (i < bxCumulativeDamageList.Length)
+ {
+ allBXCumulativeDamageList.Add(bxCumulativeDamageList[i]);
+ }
+ else
+ {
+ allBXCumulativeDamageList.Add(allBXCumulativeDamageList[i - 1] + lastDmgAddValue);
+ }
+ }
+
}
public override void Init()
{
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin += OnBeforePlayerDataInitializeEventOnRelogin;
+ GuildManager.Instance.EnterOrQuitGuildEvent += EnterOrQuitGuildEvent;
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += OnRefreshFairyInfo;
ParseConfig();
}
public override void Release()
{
+ DTC0102_tagCDBPlayer.beforePlayerDataInitializeEventOnRelogin -= OnBeforePlayerDataInitializeEventOnRelogin;
+ GuildManager.Instance.EnterOrQuitGuildEvent -= EnterOrQuitGuildEvent;
+ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= OnRefreshFairyInfo;
}
+
+ void OnBeforePlayerDataInitializeEventOnRelogin()
+ {
+ bossActions.Clear();
+ playerBossHurtRank.Clear();
+ m_BuZhenState = 0;
+ m_AtkCount = 0;
+ m_ItemAddCount = 0;
+ m_Anger = 0;
+ m_BoxUnGetCount = 0;
+ m_BoxHurt = 0;
+ m_BoxHurtHis = 0;
+ taofaAtkData.Clear();
+ taofaPlayerData.Clear();
+ }
+
+ private void OnRefreshFairyInfo()
+ {
+ UpdateRedpoint();
+ }
+
+ void EnterOrQuitGuildEvent(bool isEnter)
+ {
+ if (!isEnter)
+ {
+ bossActions.Clear();
+ playerBossHurtRank.Clear();
+ taofaAtkData.Clear();
+ taofaPlayerData.Clear();
+ }
+ UpdateRedpoint();
+ }
+
//// 鎿嶄綔锛�0-鏂╂潃鏀诲嚮锛�1-甯冮樀
public void TaofaBoss(int opType)
@@ -57,8 +151,31 @@
GameNetSystem.Instance.SendInfo(pack);
}
+ public void UpdataMyBossData(HA503_tagSCFamilyTaofaInfo netPack)
+ {
+ m_BuZhenState = netPack.BuZhenState;
+ m_AtkCount = netPack.AtkCount;
+ m_ItemAddCount = netPack.ItemAddCount;
+ m_Anger = netPack.Anger;
+ m_BoxUnGetCount = netPack.BoxUnGetCount;
+ m_BoxHurt = netPack.BoxHurt + netPack.BoxHurtEx * Constants.ExpPointValue;
+ m_BoxHurtHis = netPack.BoxHurtHis + netPack.BoxHurtHisEx * Constants.ExpPointValue;
+
+ UpdateRedpoint();
+ BossHurtEvent?.Invoke();
+ }
+
+ public void UpdateAtkResult(HA504_tagSCFamilyTaofaAtkRet netPack)
+ {
+ atkResult = netPack;
+ AtkResultEvent?.Invoke();
+ }
+ public int GetHasAtkCnt()
+ {
+ return freeAtkCount + m_ItemAddCount - m_AtkCount;
+ }
// 銆愬叕浼氳涓恒��
// 澧炲姞琛屼负绫诲瀷18 - 鍏細璁ㄤ紣鐩稿叧鏁版嵁
@@ -75,12 +192,16 @@
// atkList - 璁ㄤ紣璁板綍鍒楄〃锛屽彲鐢ㄤ簬琛ㄧ幇鎴愬憳澶村儚鏀诲嚮锛� atkTime - 鏀诲嚮鏃堕棿鎴筹紝 atkType - 鏀诲嚮绫诲瀷锛�0-鏅�氭敾鍑伙紝 1-鎬掓皵鏀诲嚮锛�
// info - 涓嶄竴瀹氭湁璇ey锛屼粎閫�鍑虹殑鎴愬憳鎵嶆湁锛岀敤浜庢洿鏂伴��鍑烘垚鍛樼浉鍏冲熀纭�淇℃伅锛屽鍚嶅瓧銆佸ご鍍忕瓑锛岃繕鍦ㄥ叕浼氶噷鐨勬垚鍛橀�氳繃 // A5 20 鐜╁瀹舵棌淇℃伅 #tagMCRoleFamilyInfo 鍙栨垚鍛樹俊鎭�
// "info":{"LV":106,"Job":1,"Name":"涓诲叕3016219","FacePic":0,"FightPower":1831995,"RealmLV":12,"ServerID":86,"TitleID":0,"Face":0},
+
+ // boss璁ㄤ紣鐨勫叏灞�鏁版嵁
public HA513_tagMCFamilyActionInfo.tagMCFamilyAction GetGuildBossAction()
{
-
+ if (bossActions.ContainsKey(1))
+ {
+ return bossActions[1];
+ }
return null;
}
-
// 鑾峰彇鍏細涓殑浼ゅ璁板綍鍋氭帓鍚�
public bool UpdateGuildBossInfo(HA513_tagMCFamilyActionInfo vNetData)
@@ -90,19 +211,179 @@
return false;
}
+ //鍒ゆ柇鏄惁鏂扮殑鍏細鏁版嵁
+ for (int i = 0; i < vNetData.Count; i++)
+ {
+ var playerID = (int)vNetData.FamilyActionList[i].Value1;
+ if (playerID != 1)
+ {
+ continue;
+ }
+ if (bossActions.ContainsKey(1) && bossActions[1].Time != vNetData.FamilyActionList[0].Time)
+ {
+ bossActions.Clear();
+ playerBossHurtRank.Clear();
+ }
+ }
+
+
+ for (int i = 0; i < vNetData.Count; i++)
+ {
+ bossActions[(int)vNetData.FamilyActionList[i].Value1] = vNetData.FamilyActionList[i];
+ }
+
+ SortPlayerHurt();
+ RefreshAtkList();
+ BossHurtEvent?.Invoke();
return true;
}
+ void SortPlayerHurt()
+ {
+ playerBossHurtRank.Clear();
+ foreach (var item in bossActions)
+ {
+ if (item.Value.Value1 != 1)
+ {
+ if (item.Value.Value4 == 0 && item.Value.Value5 == 0)
+ {
+ continue;
+ }
+ playerBossHurtRank.Add(item.Value);
+ }
+
+ }
+
+ playerBossHurtRank.Sort((a, b) => (b.Value4 + b.Value5 * Constants.ExpPointValue).CompareTo(a.Value4 + a.Value5 * Constants.ExpPointValue));
+ }
+
+ //瑙ｆ瀽鏀诲嚮璁板綍 鍜� 鐜╁淇℃伅锛堥��鍑哄叕浼氱殑锛�
+ void RefreshAtkList()
+ {
+ //{"atkList":[[atkTime, 鏈璐＄尞绠卞瓙鏁�, 鏈鎬讳激瀹�, atkType], ...], "info":{k:v, ...}}
+ //"info":{"LV":106,"Job":1,"Name":"涓诲叕3016219","FacePic":0,"FightPower":1831995,"RealmLV":12,"ServerID":86,"TitleID":0,"Face":0},
+ taofaAtkData.Clear();
+ taofaPlayerData.Clear();
+ foreach (var item in playerBossHurtRank)
+ {
+ JsonData jsonData = JsonMapper.ToObject(item.UseData);
+ if (!jsonData.ContainsKey("atkList"))
+ {
+ continue;
+ }
+ var arr = JsonMapper.ToObject<long[][]>(jsonData["atkList"].ToJson());
+ for (int i = 0; i < arr.Length; i++)
+ {
+ taofaAtkData[(int)arr[i][0]] = new TaofaAtkData()
+ {
+ playerID = (int)item.Value1,
+ atkType = (int)arr[i][3],
+ hurt = arr[i][2],
+ };
+ }
+
+ if (jsonData.ContainsKey("info"))
+ {
+ taofaPlayerData[(int)item.Value1] = JsonMapper.ToObject<MemberData>(jsonData["info"].ToJson());
+ }
+ }
+
+ }
+
+ // 鑾峰彇鎴戠殑鎺掑悕
+ public int GetMyRank()
+ {
+ int rank = 0;
+ for (int i = 0; i < playerBossHurtRank.Count; i++)
+ {
+ if (playerBossHurtRank[i].Value1 == PlayerDatas.Instance.baseData.PlayerID)
+ {
+ rank = i + 1;
+ break;
+ }
+ }
+ return rank;
+ }
+
+ //鑾峰彇鎴愬憳澶栬鏁版嵁 澶村儚鍚嶅瓧绛�
+ public MemberData GetMemberData(int playerId)
+ {
+ var playerInfo = PlayerDatas.Instance.fairyData.GetMember(playerId);
+ if (playerInfo == null)
+ {
+ return taofaPlayerData.ContainsKey(playerId) ? taofaPlayerData[playerId] : new MemberData();
+ }
+
+ return new MemberData()
+ {
+ LV = playerInfo.LV,
+ Job = playerInfo.Job,
+ Name = playerInfo.Name,
+ FacePic = playerInfo.FacePic,
+ FightPower = playerInfo.FightPower,
+ RealmLV = playerInfo.RealmLV,
+ ServerID = playerInfo.ServerID,
+ TitleID = playerInfo.TitleID,
+ Face = playerInfo.Face
+
+ };
+
+ }
+
+ #region 绾㈢偣
+ Redpoint redPoint = new Redpoint(MainRedDot.MainGuildRedpoint, MainRedDot.bossTaofaRedpointID);
+
+ void UpdateRedpoint()
+ {
+ redPoint.state = RedPointState.None;
+
+ if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.GuildBoss))
+ {
+ return;
+ }
+ if (PlayerDatas.Instance.fairyData.fairy == null)
+ {
+ return;
+ }
+ if (m_BuZhenState == 0)
+ {
+ redPoint.state = RedPointState.Simple;
+ return;
+ }
+
+ if (GetHasAtkCnt() > 0)
+ {
+ redPoint.state = RedPointState.Simple;
+ return;
+ }
+
+ if (m_BoxUnGetCount > 0)
+ {
+ redPoint.state = RedPointState.Simple;
+ return;
+ }
+ }
+ #endregion
+
}
-public class PlayerGuildBossAtkInfo
+public class TaofaAtkData
{
public int playerID;
- public int atkTime;
- public int bzTime;
- public int atkCount;
- public long totalHurtValue;
- public int boxCnt;
-
+ public int atkType;
+ public long hurt;
}
+public class MemberData
+{
+ public int LV;
+ public int Job;
+ public string Name;
+ public int FacePic;
+ public long FightPower;
+ public int RealmLV;
+ public int ServerID;
+ public int TitleID;
+ public int Face;
+
+}
--
Gitblit v1.8.0