diff --git a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes index 894f1589..66546020 100644 Binary files a/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes and b/UnityProject/Assets/AssetRaw/DLL/GameLogic.dll.bytes differ diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs index b95fa23f..82582abf 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Actor/ActorHItem.cs @@ -49,7 +49,7 @@ namespace GameLogic private List m_ListUnitPlayDatas = new List(); private float m_AddPush = 0.1f; // 初始推力值 - private double m_AllPush = 0; // 当前总值 + public double m_AllPush = 0; // 当前总值 private int m_AllAddPush = 0;//永久增加推力值 private int m_AssetID = 0; // 资源ID,用于加载资源 @@ -280,7 +280,7 @@ namespace GameLogic // 给进度条一个缩减回弹效果 float originalFill = m_CurrentFillAmount; - float shrinkTo = Mathf.Max(0.1f, originalFill - 0.2f); // 缩到原值-0.2,最小0.1 + float shrinkTo = Mathf.Max(0.1f, originalFill - 0.4f); // 缩到原值-0.2,最小0.1 DOTween.To( () => m_imgValue.fillAmount, x => m_imgValue.fillAmount = x, diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs index 3e004aae..d2f614b0 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Common/EventConts.cs @@ -14,6 +14,7 @@ namespace GameLogic public static int InitPower = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).InitPower; // 初始推力 public static float PlayerScale = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).PlayerScale; // 初始推力 public static string GmPass = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).GmPassworld; // Gm解锁密码 + public static float JszPower = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).JszPower; // Gm解锁密码 public static float WaiXingScale = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).WaiXingScale; public static float WaiXingBeiLv = ConfigSystem.Instance.Tables.TbSystemConfig.Get(1).WaiXingBeiLv; public static bool isGmPass = false; // 是否解锁 diff --git a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs index adcc6f8e..fff72708 100644 --- a/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs +++ b/UnityProject/Assets/GameScripts/HotFix/GameLogic/Manager/DataGameSceneManager.cs @@ -880,6 +880,7 @@ namespace GameLogic eGo.GetComponent().GetReaction(JszSignal).AddListener(() => { //hItemActors[1].actor.SetCurrenFill(); + targetActor.m_AllPush -= EventConts.JszPower * 10; targetActor.SetCurrenFill(); //eGo.transform.parent.parent.parent.parent.GetComponent().SetCurrenFill(); }); @@ -904,6 +905,7 @@ namespace GameLogic eGo.GetComponent().GetReaction(JszSignal).RemoveAllListeners(); eGo.GetComponent().GetReaction(JszSignal).AddListener(() => { + targetActor.m_AllPush -= EventConts.JszPower; targetActor.SetCurrenFill(); //eGo.transform.parent.parent.parent.parent.GetComponent().SetCurrenFill(); });