From fbc7f855aa676d2a623bec2cfb07e19d91b6bc26 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期二, 20 一月 2026 16:49:23 +0800
Subject: [PATCH] 411 定军阁-客户端 开出展示npc配置，隐藏敌将信息按钮，隐藏定军阁战场血条相关信息
---
Main/System/Battle/WarlordPavilionBattleWin.cs | 10 +++++-----
Main/Config/Configs/FBDJGLevelConfig.cs | 20 +++++++++++++++++++-
Main/System/WarlordPavilion/WarlordPavilionManager.cs | 16 ++++------------
Main/System/WarlordPavilion/WarlordPavilionWin.cs | 11 +++++------
4 files changed, 33 insertions(+), 24 deletions(-)
diff --git a/Main/Config/Configs/FBDJGLevelConfig.cs b/Main/Config/Configs/FBDJGLevelConfig.cs
index c47f867..1c68374 100644
--- a/Main/Config/Configs/FBDJGLevelConfig.cs
+++ b/Main/Config/Configs/FBDJGLevelConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: Thursday, January 8, 2026
+// [ Date ]: Tuesday, January 20, 2026
//--------------------------------------------------------
using System.Collections.Generic;
@@ -23,6 +23,8 @@
public int[][] AwardList;
public int[] LineupIDList;
public long FightPower;
+ public int NPCID;
+ public int[] SkillIDExList;
public override int LoadKey(string _key)
{
@@ -59,6 +61,22 @@
}
long.TryParse(tables[6],out FightPower);
+
+ int.TryParse(tables[7],out NPCID);
+
+ if (tables[8].Contains("["))
+ {
+ SkillIDExList = JsonMapper.ToObject<int[]>(tables[8]);
+ }
+ else
+ {
+ string[] SkillIDExListStringArray = tables[8].Trim().Split(StringUtility.splitSeparator,StringSplitOptions.RemoveEmptyEntries);
+ SkillIDExList = new int[SkillIDExListStringArray.Length];
+ for (int i=0;i<SkillIDExListStringArray.Length;i++)
+ {
+ int.TryParse(SkillIDExListStringArray[i],out SkillIDExList[i]);
+ }
+ }
}
catch (Exception exception)
{
diff --git a/Main/System/Battle/WarlordPavilionBattleWin.cs b/Main/System/Battle/WarlordPavilionBattleWin.cs
index 691adde..96a4b03 100644
--- a/Main/System/Battle/WarlordPavilionBattleWin.cs
+++ b/Main/System/Battle/WarlordPavilionBattleWin.cs
@@ -143,7 +143,7 @@
bossHeadCell.SetTeamHero(teamHero);
txtBossName.text = teamHero.name;
NPCConfig npcConfig = NPCConfig.Get(teamHero.NPCID);
- bossLifeBar.SetBaseInfo(Mathf.Max(1, npcConfig.LifeBarCount), (ulong)teamHero.curHp, (ulong)teamHero.maxHp);
+ //bossLifeBar.SetBaseInfo(Mathf.Max(1, npcConfig.LifeBarCount), (ulong)teamHero.curHp, (ulong)teamHero.maxHp);
bossBattleObject.buffMgr.onBuffChanged -= OnBuffChanged;
bossBattleObject.buffMgr.onBuffChanged += OnBuffChanged;
}
@@ -151,7 +151,7 @@
{
bossHeadCell.SetTeamHero(null);
txtBossName.text = string.Empty;
- bossLifeBar.SetBaseInfo(2, 2, 2);
+ //bossLifeBar.SetBaseInfo(2, 2, 2);
Debug.LogError("鎵句笉鍒癰oss");
}
@@ -182,7 +182,7 @@
if (null != bossBattleObject)
{
TeamHero teamHero = bossBattleObject.teamHero;
- bossLifeBar.Show((ulong)teamHero.curHp, (ulong)teamHero.maxHp);
+ //bossLifeBar.Show((ulong)teamHero.curHp, (ulong)teamHero.maxHp);
}
}
@@ -200,11 +200,11 @@
// 鈽呪槄鈽� 瀹屽叏浣跨敤 StoryBossBattleWin 鐨勯�昏緫 鈽呪槄鈽�
if (info.battleHurtParam.hurter.hurtObj != null && bossBattleObject.teamHero.ObjID == info.battleHurtParam.hurter.hurtObj.teamHero.ObjID)
{
- bossLifeBar.Show((ulong)info.battleHurtParam.hurter.toHp, (ulong)bossBattleObject.teamHero.maxHp);
+ //bossLifeBar.Show((ulong)info.battleHurtParam.hurter.toHp, (ulong)bossBattleObject.teamHero.maxHp);
}
else if (info.battleHurtParam.caster.casterObj != null && bossBattleObject.teamHero.ObjID == info.battleHurtParam.caster.casterObj.teamHero.ObjID)
{
- bossLifeBar.Show((ulong)info.battleHurtParam.caster.toHp, (ulong)bossBattleObject.teamHero.maxHp);
+ //bossLifeBar.Show((ulong)info.battleHurtParam.caster.toHp, (ulong)bossBattleObject.teamHero.maxHp);
}
}
diff --git a/Main/System/WarlordPavilion/WarlordPavilionManager.cs b/Main/System/WarlordPavilion/WarlordPavilionManager.cs
index ada23cf..361025e 100644
--- a/Main/System/WarlordPavilion/WarlordPavilionManager.cs
+++ b/Main/System/WarlordPavilion/WarlordPavilionManager.cs
@@ -596,23 +596,15 @@
return true;
}
- public bool TryGetNPCConfig(int layerNum, int levelNum, out NPCLineupConfig npcLineupConfig, out NPCConfig npcConfig)
+ public bool TryGetNPCConfig(int layerNum, int levelNum, out NPCConfig npcConfig)
{
npcConfig = null;
- npcLineupConfig = null;
if (!FBDJGLevelConfig.TryGetFBDJGLevelConfig(layerNum, levelNum, out var config))
return false;
- int[] lineupIDList = config.LineupIDList;
- if (lineupIDList.IsNullOrEmpty())
+ int npcID = config.NPCID;
+ if (!NPCConfig.HasKey(npcID))
return false;
- int lineupID = lineupIDList[0];
- if (!NPCLineupConfig.HasKey(lineupID))
- return false;
- npcLineupConfig = NPCLineupConfig.Get(lineupID);
- int bossId = npcLineupConfig.BossID;
- if (!NPCConfig.HasKey(bossId))
- return false;
- npcConfig = NPCConfig.Get(bossId);
+ npcConfig = NPCConfig.Get(npcID);
return true;
}
diff --git a/Main/System/WarlordPavilion/WarlordPavilionWin.cs b/Main/System/WarlordPavilion/WarlordPavilionWin.cs
index f627ce5..a75ff76 100644
--- a/Main/System/WarlordPavilion/WarlordPavilionWin.cs
+++ b/Main/System/WarlordPavilion/WarlordPavilionWin.cs
@@ -135,7 +135,6 @@
int showLayerNum;
int showLevelNum;
FBDJGLevelConfig config;
- NPCLineupConfig npcLineupConfig;
NPCConfig npcConfig;
private void Display()
{
@@ -148,13 +147,13 @@
return;
if (!FBDJGLevelConfig.TryGetFBDJGLevelConfig(showLayerNum, showLevelNum, out config))
return;
- if (!manager.TryGetNPCConfig(showLayerNum, showLevelNum, out npcLineupConfig, out npcConfig))
+ if (!manager.TryGetNPCConfig(showLayerNum, showLevelNum, out npcConfig))
return;
txtCurrentLevel.text = Language.Get("WarlordPavilion22", showLayerNum, showLevelNum);
txtBossName.text = npcConfig.NPCName;
uiHeroController.Create(npcConfig.SkinID, modelSize);
- DisplaySkillWordsList(npcLineupConfig);
+ DisplaySkillWordsList(config.SkillIDExList);
DisplayItemCell(firstAwards, config.PassAwardList);
manager.DisplayItemCell(challengeAwards, config.AwardList);
DisplayButtons();
@@ -249,16 +248,16 @@
}
}
- public void DisplaySkillWordsList(NPCLineupConfig lineUPConfig)
+ public void DisplaySkillWordsList(int[] skillIDExList)
{
if (skillWords.IsNullOrEmpty())
return;
for (int i = 0; i < skillWords.Count; i++)
{
- if (i < lineUPConfig.SkillIDExList.Length)
+ if (i < skillIDExList.Length)
{
skillWords[i].SetActive(true);
- int skillID = lineUPConfig.SkillIDExList[i];
+ int skillID = skillIDExList[i];
skillWords[i].Init(skillID, () =>
{
SmallTipWin.showText = Language.Get("SmallTipFomat", SkillConfig.Get(skillID)?.SkillName, SkillConfig.Get(skillID)?.Description);
--
Gitblit v1.8.0