From df326b8d0c5cf2c3953819018eb4abf722234e9e Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 29 八月 2025 15:10:00 +0800
Subject: [PATCH] 0312 修复战斗力 和 消耗锤子倍数的定义命名
---
Main/Core/GameEngine/Player/PlayerBaseData.cs | 10 +++-
Main/System/Main/AutoFightModel.cs | 5 ++
Main/System/Chat/ChatManager.cs | 2
Main/Utility/EnumHelper.cs | 2
Main/Core/NetworkPackage/ServerPack/H01_System/H0102_tagCDBPlayer.cs | 8 ++--
Main/System/Message/RichNormalEvent.cs | 2
Main/Core/GameEngine/Player/PlayerDatas.cs | 7 ++-
Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs | 3 +
Main/System/Battle/BattleManager.cs | 2
Main/System/Main/MainWin.cs | 7 ++-
Main/SDK/SDKUtils.cs | 10 ++--
Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs | 4 +-
12 files changed, 38 insertions(+), 24 deletions(-)
diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs
index dac5f53..f0f8fe1 100644
--- a/Main/Core/GameEngine/Player/PlayerBaseData.cs
+++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs
@@ -18,7 +18,7 @@
public uint bindDiamond; //鐏电煶
public uint copper; //閾滈挶
public long allCopper { get { return copper + copperExtend * Constants.ExpPointValue; } }
- public long FightPoint; //鎴樻枟鍊�
+ public long UseHarmerCount; //娑堣�楅敜瀛愪釜鏁�(鍊嶆暟)
public ushort MapID; //瑙掕壊鎵�鍦ㄥ湴鍥� 鍦板浘瑙勫垯锛欳/S涓�涓�瀵瑰簲鐨勫父瑙勫湴鍥撅紝C鍋囧湴鍥撅紙ExAttr14锛夛紝澶欳涓�涓猄鍦板浘锛圗xAttr3锛�
public ushort PosX; //瑙掕壊鍧愭爣
public ushort PosY;
@@ -52,10 +52,13 @@
uint m_coinPointTotal;
public int face;//澶村儚
public int facePic;//澶村儚澶栨
+ public long FightPower; //鎴樻枟鍔�
- public uint coinPointTotal {
+ public uint coinPointTotal
+ {
private get { return m_coinPointTotal; }
- set {
+ set
+ {
CoinChangeEvent?.Invoke((int)m_coinPointTotal, (int)value);
m_coinPointTotal = value;
}
@@ -189,6 +192,7 @@
HP = _serverInfo.HP + _serverInfo.HPEx * Constants.ExpPointValue;
AttackMode = _serverInfo.AttackMode;
+ UseHarmerCount = (int)_serverInfo.FightPoint; //閿ゅ瓙鍊嶆暟锛岄潪鎴樻枟鍔�
}
diff --git a/Main/Core/GameEngine/Player/PlayerDatas.cs b/Main/Core/GameEngine/Player/PlayerDatas.cs
index 99522d5..99b278b 100644
--- a/Main/Core/GameEngine/Player/PlayerDatas.cs
+++ b/Main/Core/GameEngine/Player/PlayerDatas.cs
@@ -200,9 +200,12 @@
break;
case PlayerDataType.TeamLV:
break;
+ case PlayerDataType.UseHarmerCount:
+ baseData.UseHarmerCount = value;
+ break;
case PlayerDataType.FightPower:
- baseData.FightPoint = value + valueEx * Constants.ExpPointValue;
- PlayerMainDate.Instance.PowerAdd(baseData.FightPoint);
+ baseData.FightPower = value + valueEx * Constants.ExpPointValue;
+ PlayerMainDate.Instance.PowerAdd(baseData.FightPower);
break;
case PlayerDataType.Tick:
#if UNITY_EDITOR
diff --git a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
index f1ab529..d0642a0 100644
--- a/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
+++ b/Main/Core/NetworkPackage/DTCFile/ServerPack/H04_Scene/DTC0403_tagPlayerLoginLoadOK.cs
@@ -31,8 +31,9 @@
playerLoginOkEvent?.Invoke();
}
finishedLogin = true;
- if (PlayerDatas.Instance.baseData.FightPoint == 0)
+ if (PlayerDatas.Instance.baseData.UseHarmerCount == 0)
{
+ //闃茶寖璇锋眰
BattleManager.Instance.MainFightRequest(1, 1);
}
//if (mapInitOkEvent != null)
diff --git a/Main/Core/NetworkPackage/ServerPack/H01_System/H0102_tagCDBPlayer.cs b/Main/Core/NetworkPackage/ServerPack/H01_System/H0102_tagCDBPlayer.cs
index 50bbf52..fe5a8eb 100644
--- a/Main/Core/NetworkPackage/ServerPack/H01_System/H0102_tagCDBPlayer.cs
+++ b/Main/Core/NetworkPackage/ServerPack/H01_System/H0102_tagCDBPlayer.cs
@@ -1,6 +1,6 @@
-using UnityEngine;
-using System.Collections;
-
+using UnityEngine;
+using System.Collections;
+
//01 02 鐜╁鍒濆鍖�#tagCDBPlayer
public class H0102_tagCDBPlayer : GameNetPackBasic {
@@ -30,7 +30,7 @@
public uint GoldPaper; //閲戠エ
public uint Silver; //閾跺瓙
public uint SilverPaper; //閾剁エ
- public uint FightPoint; //鎴樻枟鍊�
+ public uint FightPoint; //閿ゅ瓙鍊嶆暟锛岄潪鎴樻枟鍔�
public uint HappyPoint; //
public byte LineID; //瑙掕壊鎵�鍦ㄧ嚎璺�
public ushort MapID; //瑙掕壊鎵�鍦ㄥ湴鍥�
diff --git a/Main/SDK/SDKUtils.cs b/Main/SDK/SDKUtils.cs
index 80c40dd..079b964 100644
--- a/Main/SDK/SDKUtils.cs
+++ b/Main/SDK/SDKUtils.cs
@@ -1054,7 +1054,7 @@
// m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
// m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
// m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
-// m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPoint.ToString();
+// m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// #if UNITY_IOS
// m_Json["identifier"] = VersionConfig.Get().bundleIdentifier;
@@ -1252,7 +1252,7 @@
// m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
// m_Json["createTime"] = time;
// m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPoint.ToString();
+ // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// SendMessageToSDK(m_Json);
}
@@ -1289,7 +1289,7 @@
// m_Json["vipLevel"] = PlayerDatas.Instance.baseData.VIPLv.ToString();
// m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
// m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPoint.ToString();
+ // m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
// SendMessageToSDK(m_Json);
}
@@ -1311,7 +1311,7 @@
m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPoint.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
SendMessageToSDK(m_Json);
}
@@ -1340,7 +1340,7 @@
m_Json["levelUpTime"] = TimeUtility.AllSeconds.ToString();
m_Json["createTime"] = TimeUtility.CreateSeconds.ToString();
m_Json["familyID"] = PlayerDatas.Instance.baseData.FamilyId.ToString();
- m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPoint.ToString();
+ m_Json["fightPower"] = PlayerDatas.Instance.baseData.FightPower.ToString();
SendMessageToSDK(m_Json);
}
diff --git a/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs b/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
index 48e462d..228ea08 100644
--- a/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
+++ b/Main/System/Battle/BattleField/OperationAgent/HandModeOperationAgent.cs
@@ -38,9 +38,9 @@
// 妫�鏌ヤ竴涓嬮敜瀛愮殑娑堣��
- //FightPoint 鐢ㄤ簬璁板綍娑堣�楁垬閿ゅ�嶆暟锛屽皬浜庣瓑浜�1鏃堕粯璁�1鍊嶏紝澶т簬1鏃朵负瀵瑰簲娑堣�楀�嶅�硷紝0418鍒锋柊绫诲瀷22
+ //useHarmerCount 鐢ㄤ簬璁板綍娑堣�楁垬閿ゅ�嶆暟锛屽皬浜庣瓑浜�1鏃堕粯璁�1鍊嶏紝澶т簬1鏃朵负瀵瑰簲娑堣�楀�嶅�硷紝0418鍒锋柊绫诲瀷22
BattleDebug.LogError("HandModeOperationAgent DoNext 2");
- long costRate = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.FightPoint);
+ long costRate = PlayerDatas.Instance.GetPlayerDataByType(PlayerDataType.UseHarmerCount);
long cost = (costRate > 1 ? costRate : 1) * 1; // 1鏄粯璁ゆ秷鑰�
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index f466f64..d0e3199 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -371,7 +371,7 @@
// 鐩墠鏀寔 BYTE ReqType; // 0-鍋滄鎴樻枟鍥炲煄锛�1-璁剧疆娑堣�楀�嶅�硷紱2-鎸戞垬鍏冲崱灏忔�紱3-鎸戞垬鍏冲崱boss锛�4-缁х画鎴樻枟锛�
// 0-鍋滄鎴樻枟鍥炲煄 - 鐜╁涓诲姩鐐瑰嚮鍥炲煄鏃跺彂閫�
- // 1-璁剧疆娑堣�楀�嶅�� - 鐜╁璁剧疆娑堣�楀�嶅�硷紝瀵瑰簲鍒扮帺瀹禙ightPoint鐨勫��
+ // 1-璁剧疆娑堣�楀�嶅�� - 鐜╁璁剧疆娑堣�楀�嶅�硷紝瀵瑰簲鍒扮帺瀹秛seHarmerCount鐨勫��
// 2-鎸戞垬鍏冲崱灏忔�� - 鐜╁鐐瑰嚮寮�濮嬫垬鏂楁椂鍙戦�侊紝浠呬粠浼戞伅鐘舵�佸埌寮�濮嬫垬鏂楁椂鍙戦�佸嵆鍙�
// 3-鎸戞垬鍏冲崱boss - 鐜╁璇锋眰鎸戞垬璇ュ叧鍗oss鏃跺彂閫�
// 4-缁х画鎴樻枟 - 鐜╁涓荤嚎鎴樻枟涓紙鍖呭惈涓荤嚎灏忔��佷富绾縝oss锛夛紝鍓嶇琛ㄧ幇瀹屽悗绔悓姝ョ殑鎴樻枟鐗囨鍚庯紝鍙啀鍥炲璇ュ�硷紝鍚庣浼氭牴鎹垬鏂楅�昏緫鍙婃祦绋嬭嚜鍔ㄥ洖澶嶄笅涓�娈电殑鎴樻枟鐗囨灏佸寘锛屼竴鐩村惊鐜�
diff --git a/Main/System/Chat/ChatManager.cs b/Main/System/Chat/ChatManager.cs
index 105050c..e557ce9 100644
--- a/Main/System/Chat/ChatManager.cs
+++ b/Main/System/Chat/ChatManager.cs
@@ -1235,7 +1235,7 @@
}
else
{
- return Language.Get(dungeonRandomChats[1], PlayerDatas.Instance.baseData.FightPoint);
+ return Language.Get(dungeonRandomChats[1], PlayerDatas.Instance.baseData.FightPower);
}
case ChatInfoType.Fairy:
return Language.Get(realmRandomChats[_index]);
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index d39634f..ec225e4 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -99,6 +99,11 @@
public void SaveAutoFightSetting()
{
+ if (PlayerDatas.Instance.baseData.UseHarmerCount != fightCost)
+ {
+ PlayerDatas.Instance.baseData.UseHarmerCount = fightCost;
+ BattleManager.Instance.MainFightRequest(1, (uint)fightCost);
+ }
QuickSetting.Instance.SendPackage();
ChangeAutoEvent?.Invoke();
}
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 26e2732..ba3322f 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -63,7 +63,7 @@
}
// 鏇存柊褰撳墠閫変腑鐨勬爣绛剧储寮�
- functionOrder = index;
+ functionOrder = index;
// 鍏抽棴褰撳墠鎵撳紑鐨勫瓙鐣岄潰
CloseCurrentSubUI();
@@ -85,7 +85,7 @@
PlayerDatas.Instance.baseData.facePic));
playerNameText.text = PlayerDatas.Instance.baseData.PlayerName;
- powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
+ powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
}
@@ -95,7 +95,7 @@
switch (type)
{
case PlayerDataType.FightPower:
- powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
+ powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
break;
case PlayerDataType.RealmLevel:
officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
@@ -132,6 +132,7 @@
{
if (currentSubUI != null && currentSubUI.name == "HomeWin")
{
+ Debug.Log("鐐瑰嚮涓荤晫闈㈡寜閽�");
//鎵撳紑涓荤晫闈㈢殑鎯呭喌涓嬪啀鐐瑰嚮鎸夐挳锛屾墽琛屾敾鍑婚�昏緫
if (AutoFightModel.Instance.isAutoAttackSet)
{
diff --git a/Main/System/Message/RichNormalEvent.cs b/Main/System/Message/RichNormalEvent.cs
index 077acc6..97e8ad4 100644
--- a/Main/System/Message/RichNormalEvent.cs
+++ b/Main/System/Message/RichNormalEvent.cs
@@ -336,7 +336,7 @@
// {
// colorType = RichTextMgr.Inst.presentRichText.colorType == RichText.ColorType.Dark ? 0 : 1;
// }
- // var fightPoint = PlayerDatas.Instance.baseData.FightPoint;
+ // var fightPoint = PlayerDatas.Instance.baseData.FightPower;
// ulong targetValue = 0;
// var infoArray = dic["myfightpoint"].Split('_');
// if (infoArray.Length > 1)
diff --git a/Main/Utility/EnumHelper.cs b/Main/Utility/EnumHelper.cs
index 393305f..6395744 100644
--- a/Main/Utility/EnumHelper.cs
+++ b/Main/Utility/EnumHelper.cs
@@ -453,7 +453,7 @@
GoldPaper = 19, //閲戠エ 19,
Silver = 20, //閾跺瓙 20,
SilverPaper = 21, //閾剁エ 21,
- FightPoint = 22, //鎴樻枟鍊�(閿ゅ瓙) 22,
+ UseHarmerCount = 22, //閿ゅ瓙娑堣�楀�嶆暟 22,
HappyPoint = 23, //濞变箰鍊� 23,
MapID = 24, //瑙掕壊鎵�鍦ㄥ湴鍥� 24,
PosX = 25, //瑙掕壊鍧愭爣 25,
--
Gitblit v1.8.0