From 8ab9fbf1e44b842646f00bc70dcd99d49f30f2e0 Mon Sep 17 00:00:00 2001 From: hch <305670599@qq.com> Date: 星期三, 09 七月 2025 22:13:46 +0800 Subject: [PATCH] 122 子 【武将】武将系统 / 【武将】武将系统-客户端 - 战力变化 --- Main/Core/GameEngine/Player/PlayerBaseData.cs | 2 +- Main/System/Main/PlayerMainDate.cs | 24 ++++++++++++------------ Main/Core/GameEngine/Player/PlayerDatas.cs | 3 +-- Main/System/Tip/PowerAddWin.cs | 22 ++++++++++++---------- 4 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Main/Core/GameEngine/Player/PlayerBaseData.cs b/Main/Core/GameEngine/Player/PlayerBaseData.cs index 95a26de..665ec99 100644 --- a/Main/Core/GameEngine/Player/PlayerBaseData.cs +++ b/Main/Core/GameEngine/Player/PlayerBaseData.cs @@ -11,7 +11,7 @@ public int TitleID; public uint ExpPoint; //鎵╁厖缁忛獙鐐规暟锛堜嚎锛� public uint TotalExp; //鎬荤粡楠�(灏忎簬浜块儴鍒�) - public ulong curExp { get { return ExpPoint + TotalExp * Constants.ExpPointValue; } } + public ulong curExp { get { return TotalExp + ExpPoint * Constants.ExpPointValue; } } public uint FamilyId; //瀹舵棌 public string FamilyName; //瀹舵棌鍚嶇О public uint diamond; //浠欑帀 diff --git a/Main/Core/GameEngine/Player/PlayerDatas.cs b/Main/Core/GameEngine/Player/PlayerDatas.cs index 7c74965..f778b60 100644 --- a/Main/Core/GameEngine/Player/PlayerDatas.cs +++ b/Main/Core/GameEngine/Player/PlayerDatas.cs @@ -202,8 +202,7 @@ break; case PlayerDataType.FightPower: baseData.FightPoint = value + valueEx * Constants.ExpPointValue; - // TODO YYL - // ModelCenter.Instance.GetModel<PlayerMainDate>().PowerAdd(baseData.FightPoint); + PlayerMainDate.Instance.PowerAdd(baseData.FightPoint); break; case PlayerDataType.Tick: #if UNITY_EDITOR diff --git a/Main/System/Main/PlayerMainDate.cs b/Main/System/Main/PlayerMainDate.cs index 2efdb1c..2711a38 100644 --- a/Main/System/Main/PlayerMainDate.cs +++ b/Main/System/Main/PlayerMainDate.cs @@ -95,18 +95,18 @@ } } - public void CustomPowerUp(ulong nowPower ,ulong addPower) - { - prowNum = (long)nowPower; - prowNumChange = (long)addPower; - isAdd = true; - if (UIManager.Instance.IsOpened<PowerAddWin>()) - { - AddPowerEvent?.Invoke(); - return; - } - UIManager.Instance.OpenWindow<PowerAddWin>(); - } + // public void CustomPowerUp(ulong nowPower ,ulong addPower) + // { + // prowNum = (long)nowPower; + // prowNumChange = (long)addPower; + // isAdd = true; + // if (UIManager.Instance.IsOpened<PowerAddWin>()) + // { + // AddPowerEvent?.Invoke(); + // return; + // } + // UIManager.Instance.OpenWindow<PowerAddWin>(); + // } } diff --git a/Main/System/Tip/PowerAddWin.cs b/Main/System/Tip/PowerAddWin.cs index 3b046a6..614f78f 100644 --- a/Main/System/Tip/PowerAddWin.cs +++ b/Main/System/Tip/PowerAddWin.cs @@ -9,13 +9,14 @@ { [SerializeField] TextEx txtBase; //鎻愬崌鎴栭檷浣庡墠鐨勬垬鏂楀姏 [SerializeField] TextEx txtChange; //鎴樻枟鍔涘彉鍖栦簡澶氬皯 + [SerializeField] List<Font> changeFonts; //鎴樺姏鍙樺寲鐨勫瓧浣� [SerializeField] ImageEx imgArrow; //绠ご [SerializeField] Transform transZhanLi; //鎴樺姏鏁翠綋妗� [SerializeField] Transform transZhanLiNumAll; //鎴樺姏鎵�鏈夊彉鍖栭儴鍒� [SerializeField] RectTransform transChange; //绠ご鍜屽彉鍖栨暟瀛楁暣浣撴 string uiFrameKey = "zhanli_dt"; [SerializeField] UIFrame uiFrame; - [SerializeField] List<PowerUpPosition> powerUpPositions; + //[SerializeField] List<PowerUpPosition> powerUpPositions; [Header("娣″叆鍙樺ぇ")] [SerializeField] Vector3 startVector; //璧峰澶у皬 @@ -294,6 +295,7 @@ { txtBase.text = DisplayBasePowerNum(basePower); txtChange.text = DisplayChangePowerNum(isAdd, changePower); + txtChange.font = changeFonts[isAdd ? 0 : 1]; imgArrow.SetSprite(DisplayState(isAdd)); } @@ -340,16 +342,16 @@ private void CheckPosition() { - var type = WindowType.None; + // var type = WindowType.None; - var _index = powerUpPositions.FindIndex((x) => - { - return x.windowType == type; - }); - if (_index != -1) - { - transZhanLi.transform.localPosition = powerUpPositions[_index].position; - } + // var _index = powerUpPositions.FindIndex((x) => + // { + // return x.windowType == type; + // }); + // if (_index != -1) + // { + // transZhanLi.transform.localPosition = powerUpPositions[_index].position; + // } } [Serializable] -- Gitblit v1.8.0