From 7db03efb59236fff31f9aa2b893db1c371ba743a Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 01 九月 2025 19:34:54 +0800
Subject: [PATCH] 50 【主界面】核心主体-npc阵容增加词条字段，主线关卡表 新增战力字段
---
Main/Config/Configs/MainLevelConfig.cs | 5 ++++-
Main/Config/Configs/NPCLineupConfig.cs | 20 +++++++++++++++++++-
Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs | 2 ++
Main/System/Equip/EquipExchangeCell.cs | 1 +
Main/System/Battle/BattleField/StoryBattleField.cs | 12 +++++++++---
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs | 1 -
6 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/Main/Config/Configs/MainLevelConfig.cs b/Main/Config/Configs/MainLevelConfig.cs
index 58b63e4..379e9f1 100644
--- a/Main/Config/Configs/MainLevelConfig.cs
+++ b/Main/Config/Configs/MainLevelConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�8鏈�5鏃�
+// [ Date ]: 2025骞�9鏈�1鏃�
//--------------------------------------------------------
using System.Collections.Generic;
@@ -27,6 +27,7 @@
public int[] WaveLineupIDList6;
public int[] BossLineupIDList;
public int[][] AwardItemList;
+ public long FightPower;
public override int LoadKey(string _key)
{
@@ -143,6 +144,8 @@
}
AwardItemList = JsonMapper.ToObject<int[][]>(tables[10].Replace("(", "[").Replace(")", "]"));
+
+ long.TryParse(tables[11],out FightPower);
}
catch (Exception exception)
{
diff --git a/Main/Config/Configs/NPCLineupConfig.cs b/Main/Config/Configs/NPCLineupConfig.cs
index b618ad6..b8c85d4 100644
--- a/Main/Config/Configs/NPCLineupConfig.cs
+++ b/Main/Config/Configs/NPCLineupConfig.cs
@@ -1,6 +1,6 @@
锘�//--------------------------------------------------------
// [Author]: YYL
-// [ Date ]: 2025骞�8鏈�5鏃�
+// [ Date ]: Monday, September 1, 2025
//--------------------------------------------------------
using System.Collections.Generic;
@@ -25,6 +25,8 @@
public int PosNPCID6;
public int PosNPCID7;
public int BossID;
+ public int[] SkillIDExList;
+ public int SkillExCnt;
public override int LoadKey(string _key)
{
@@ -53,6 +55,22 @@
int.TryParse(tables[7],out PosNPCID7);
int.TryParse(tables[8],out BossID);
+
+ if (tables[9].Contains("["))
+ {
+ SkillIDExList = JsonMapper.ToObject<int[]>(tables[9]);
+ }
+ else
+ {
+ string[] SkillIDExListStringArray = tables[9].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]);
+ }
+ }
+
+ int.TryParse(tables[10],out SkillExCnt);
}
catch (Exception exception)
{
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
index e160113..8f49ec0 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0418_tagObjInfoRefresh.cs
@@ -37,7 +37,6 @@
{
if (PlayerDatas.Instance.PlayerId == vNetData.ObjID)
{
- // 鎴樻枟涓鏋滄垬閿ゆ秷鑰� 鐣岄潰鑷繁鍘荤洃鍚秷鎭�
PlayerDatas.Instance.RefreshPlayerData(vNetData);
}
else
diff --git a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
index 28dc512..b6dd785 100644
--- a/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
+++ b/Main/Core/NetworkPackage/DataToCtl/PackageRegedit.cs
@@ -112,6 +112,8 @@
Register(typeof(HA338_tagMCInvestInfo), typeof(DTCA338_tagMCInvestInfo));
Register(typeof(HB121_tagMCTreeInfo), typeof(DTCB121_tagMCTreeInfo));
Register(typeof(HA720_tagMCCreateRoleAwardState), typeof(DTCA720_tagMCCreateRoleAwardState));
+ Register(typeof(HB405_tagMCAddExp), typeof(DTCB405_tagMCAddExp));
+ Register(typeof(HB123_tagSCDropBootyInfo), typeof(DTCB123_tagSCDropBootyInfo));
}
//涓诲伐绋嬫敞鍐屽皝鍖�
diff --git a/Main/System/Battle/BattleField/StoryBattleField.cs b/Main/System/Battle/BattleField/StoryBattleField.cs
index bf0e810..d260c12 100644
--- a/Main/System/Battle/BattleField/StoryBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBattleField.cs
@@ -122,7 +122,7 @@
public override void OnTurnFightState(int turnNum, int State, int FuncLineID, JsonData extendData)
{
base.OnTurnFightState(turnNum, State, FuncLineID, extendData);
-
+ RequestFight();
}
protected void OnTeamChange(TeamType teamType)
@@ -177,8 +177,8 @@
{
if (IsPause)
{
+ //澶栭儴鎺у埗 IsPause
//杩橀渶鑰冭檻鍏朵粬涓嶅彲鎴樻枟鐘跺喌锛屼富绾跨殑BOSS鎴樻枟涔熸槸鍙﹀涓�涓満鏅笖涓嶈兘鍒囧嚭鏉� 绛夎烦杩囨垨鑰呯粨鏉�
- //澶栭儴缁熶竴鎺у埗 IsPause
return;
}
if (BattleManager.Instance.isWaitServerStory)
@@ -218,8 +218,14 @@
// 璇锋眰涓嬩竴涓垬鏂楀寘 鎴栬�呮鏌ユ垬鏂楁槸鍚︾粨鏉�
// ReqType; // 0-鍋滄鎴樻枟鍥炲煄锛�1-璁剧疆娑堣�楀�嶅�硷紱2-鎸戞垬鍏冲崱灏忔�紱3-鎸戞垬鍏冲崱boss锛�4-缁х画鎴樻枟锛�
- // 鎴樻枟涓彧瑕佷竴鐩村彂4灏卞彲浠ワ紝闇�瑕佸彂2鐨勬儏鍐碉細浼戞伅杞彉涓烘垬鏂�
+ // 闇�瑕佸彂2鐨勬儏鍐碉細浼戞伅杞彉涓烘垬鏂�
// 杩涘叆浼戞伅鐨勯�昏緫锛�1.涓诲姩鐐瑰嚮 2.娌℃湁鎴橀敜 3.鏂嚎閲嶈繛澶箙锛堢害瀹�1鍒嗛挓锛変粛鍋滅暀鍦ㄦ父鎴忓唴 4.鍥炲埌鐧诲綍鐣岄潰锛堝惈鏂嚎瓒呮椂锛�
+ // 闇�瑕佸彂4鐨勬儏鍐碉細鎴樺満杩涜涓兘鍙�4
+ // 1.姝﹀皢鎴樻枟鏈夋秷鑰楅敜瀛�
+ // 2.鎴樻枟缁撴潫锛屽紑濮嬩笅涓�锛堝皬锛夋尝锛屾鏃跺彂4 涓嶆墸閿ゅ瓙鍙湁鍒濆鍖栨垬鍦�
+ // 3.鎸戞垬BOSS缁撴潫鍚�
+ // BOSS鎸戞垬璇存槑锛氫紤鎭腑鎸戞垬BOSS鎭㈠鍒颁紤鎭姸鎬� 涓嶅彂鍖咃紱
+ // 鎴樻枟涓寫鎴楤OSS鎭㈠鍒版垬鏂楃姸鎬� 鍙�4鍖咃紱鏈嶅姟绔寫鎴榖oss宸茬粡娓呭皬鎬満
BattleDebug.LogError("HandModeOperationAgent DoNext 3");
byte reqType;
diff --git a/Main/System/Equip/EquipExchangeCell.cs b/Main/System/Equip/EquipExchangeCell.cs
index 3c39c5e..7120976 100644
--- a/Main/System/Equip/EquipExchangeCell.cs
+++ b/Main/System/Equip/EquipExchangeCell.cs
@@ -164,6 +164,7 @@
}
else
{
+ uieffect.Stop();
uieffect.effectId = effectID;
//璁＄畻楂樺害缂╂斁姣斾緥 鐗规晥鏄剧ず渚濊禆rect鐨勬帓鐗�
uieffect.transform.localScale = new Vector3(0.98f, bgRect.rect.height / uieffect.GetComponent<RectTransform>().rect.height, 1);
--
Gitblit v1.8.0