| Fight/Actor/State/SMB/STM_BaseAttack.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Role/ReikiRootModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/FairyTreasureCollectPanelPattern3.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| UI/Common/FunctionButtonGroup.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -723,7 +723,7 @@ } _hurtTotalValue = (int)(m_CacheSkill.hurtClntFightNpcList[i].HurtHP * _floodPercent); _realHurtValue = (int)((_target.ActorInfo.RealHp - m_CacheSkill.hurtClientList[i].CurHP) * _floodPercent); _realHurtValue = (int)((_target.ActorInfo.RealHp - m_CacheSkill.hurtClntFightNpcList[i].CurHP) * _floodPercent); AttackHandler.HandlerAttackTarget(_fight, _target, _hurtTotalValue, _realHurtValue, m_CacheSkill.hurtClntFightNpcList[i].AttackType, System/Role/ReikiRootModel.cs
@@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Text.RegularExpressions; using UnityEngine; namespace Snxxz.UI { @@ -83,6 +84,8 @@ public bool reikiPointPromoteSymbol { get; set; } public int reikiPointAutoAddLevel { get; private set; } public readonly Redpoint redpoint = new Redpoint(101, 10103); public event Action onCacheFreePointRefresh; @@ -137,6 +140,13 @@ reikiRootGetWays = ConfigParse.GetMultipleStr<int>(funcConfig.Numerical4); funcConfig = FuncConfigConfig.Get("LVUPAddPoint"); var match = Regex.Match(funcConfig.Numerical1, @"\(([0-9]+)\,[0-9]+\)"); if (match != null) { reikiPointAutoAddLevel = int.Parse(match.Groups[1].Value); } freeResetLevel = int.Parse(funcConfig.Numerical4); resetCostItemId = int.Parse(funcConfig.Numerical5);
@@ -946,14 +946,15 @@ } _price = (ulong)(model.MoneyNumber * count); if (MoneyIsEnough(model.MoneyType, _price)) { C0803_tagCBuyItemList buyShop = new C0803_tagCBuyItemList(); buyShop.NPCID = 0; buyShop.BuyItemIndex = (ushort)model.ID; buyShop.BuyCount = (ushort)count; GameNetSystem.Instance.SendInfo(buyShop); GameNetSystem.Instance.SendInfo(buyShop); } else { @@ -984,6 +985,7 @@ { DebugEx.Log("GetBuyResult"); StoreConfig tagStore = StoreConfig.Get((int)result.ItemIndex); if (tagStore != null) { ItemConfig chinModel = ItemConfig.Get(GetReplaceId(tagStore.ID, tagStore.ItemID)); @@ -1697,7 +1699,7 @@ public enum StoreFunc { WeekStore = 1, //1：每周限购 DayStore = 1, //1：每天限购 CommonStore = 2, //2：常用道具 GrowStrongerStore = 3, //3：成长变强 BindStore = 4, //4：绑玉商城 System/Store/StoreWin.cs
@@ -15,10 +15,11 @@ { public class StoreWin : Window { [SerializeField] FunctionButton m_DayStoreTitle; [SerializeField] FunctionButton m_WeekStoreTitle; [SerializeField] FunctionButton m_CommonStoreTitle; [SerializeField] FunctionButton m_GrowStrongerStoreTitle; [SerializeField] FunctionButton m_BindStoreTitle; //[SerializeField] FunctionButton m_BindStoreTitle; [SerializeField] FunctionButton m_IntegralStoreTitle; [SerializeField] FunctionButtonGroup m_FuncBtnGroup; [SerializeField] Button m_LeftBtn; @@ -51,10 +52,11 @@ m_ShopCtrl.OnRefreshCell += RefreshShopCell; m_ShopCtrl.lockType = EnhanceLockType.KeepVertical; m_DayStoreTitle.SetListener(OpenDayStore); m_WeekStoreTitle.SetListener(OpenMysteryStore); m_CommonStoreTitle.SetListener(OpenCommonStore); m_GrowStrongerStoreTitle.SetListener(OpenStrengthStore); m_BindStoreTitle.SetListener(OpenBindGoldStore); //m_BindStoreTitle.SetListener(OpenBindGoldStore); m_IntegralStoreTitle.SetListener(OpenIntegralStore); m_AssistBtn.SetListener(ViewAssistRecorders); m_RefreshCommodities.SetListener(RefreshCommondities); @@ -82,19 +84,19 @@ { if (model.storeFunc1Point.state == RedPointState.Simple) { functionOrder = m_WeekStoreTitle.order; functionOrder = m_DayStoreTitle.order; } else if (model.storeFunc2Point.state == RedPointState.Simple) { functionOrder = m_CommonStoreTitle.order; functionOrder = m_WeekStoreTitle.order; } else if (model.storeFunc3Point.state == RedPointState.Simple) { functionOrder = m_GrowStrongerStoreTitle.order; functionOrder = m_CommonStoreTitle.order; } else if (model.storeFunc4Point.state == RedPointState.Simple) { functionOrder = m_BindStoreTitle.order; functionOrder = m_GrowStrongerStoreTitle.order; } else if (model.storeFunc5Point.state == RedPointState.Simple) { @@ -117,8 +119,8 @@ protected override void OnPreClose() { model.CloseAllRedpoint(StoreFunc.MysteryStore); model.storeFuncType = StoreFunc.MysteryStore; model.CloseAllRedpoint(StoreFunc.DayStore); model.storeFuncType = StoreFunc.DayStore; model.RefreshBuyShopLimitEvent -= OnCreate; model.mysteryShopRefreshEvent -= OnCreate; GlobalTimeEvent.Instance.secondEvent -= UpdateRefreshTime; @@ -441,14 +443,14 @@ functionOrder = m_IntegralStoreTitle.order; } private void OpenBindGoldStore() { model.CloseAllRedpoint(StoreFunc.BindStore); model.storeFuncType = StoreFunc.BindStore; OnCreate(); UpdateRefreshTime(); functionOrder = m_BindStoreTitle.order; } //private void OpenBindGoldStore() //{ // model.CloseAllRedpoint(StoreFunc.BindStore); // model.storeFuncType = StoreFunc.BindStore; // OnCreate(); // UpdateRefreshTime(); // functionOrder = m_BindStoreTitle.order; //} private void OpenStrengthStore() { @@ -477,6 +479,15 @@ functionOrder = m_WeekStoreTitle.order; } private void OpenDayStore() { model.CloseAllRedpoint(StoreFunc.DayStore); model.storeFuncType = StoreFunc.DayStore; OnCreate(); UpdateRefreshTime(); functionOrder = m_DayStoreTitle.order; } private void ViewAssistRecorders() { WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.DungeonAssitCheckIn); System/Treasure/FairyTreasureCollectPanelPattern3.cs
@@ -13,6 +13,10 @@ [SerializeField] Text m_AddedEffect; [SerializeField] Button m_UnlockTreasureBtn; [SerializeField] PositionTween m_SkillTween; [SerializeField] PositionTween m_RightTween; [SerializeField] Text m_ReikiEffect; [SerializeField] Text m_PlayerLevel; [SerializeField] Text m_ReikiPoint; TreasureFindHostModel findHostModel { @@ -20,6 +24,11 @@ { return ModelCenter.Instance.GetModel<TreasureFindHostModel>(); } } ReikiRootModel reikiRootModel { get { return ModelCenter.Instance.GetModel<ReikiRootModel>(); } } private bool show = false; @@ -59,6 +68,9 @@ m_UnlockTreasureBtn.gameObject.SetActive(false); } m_SkillTween.gameObject.SetActive(treasureId != 305); m_RightTween.gameObject.SetActive(treasureId == 305); switch (treasureId) { case 302: @@ -74,7 +86,25 @@ case 305: m_GotoBtnText.text = Language.Get("FairyTreasureGot"); m_ContainerLocked.gameObject.SetActive(false); m_AddedEffect.text = Language.Get("FairyTreasure_12", model.treasureAddReikiPoint.y); m_ReikiEffect.text = Language.Get("FairyTreasure_12", model.treasureAddReikiPoint.y); m_PlayerLevel.text = Language.Get("FairyTreasure_13", PlayerDatas.Instance.baseData.LV); var reikiPoint = 0; if (PlayerDatas.Instance.baseData.LV > reikiRootModel.reikiPointAutoAddLevel) { reikiPoint = (PlayerDatas.Instance.baseData.LV - reikiRootModel.reikiPointAutoAddLevel + 1) * model.treasureAddReikiPoint.y; } if (treasure.state != TreasureState.Collected) { m_ReikiPoint.text = Language.Get("FairyTreasure_14", reikiPoint); } else { m_ReikiPoint.text = Language.Get("FairyTreasure_15", reikiPoint); } break; case 306: case 307: @@ -115,6 +145,15 @@ m_SkillTween.SetEndState(); } if (_tween && m_RightTween.gameObject.activeInHierarchy) { m_RightTween.Play(); } else { m_RightTween.SetEndState(); } var _fightPower = model.GetTreasureFightPower(_treasureId); m_FightPower.text = _fightPower.ToString(); m_ContainerFight.gameObject.SetActive(_fightPower > 0 && treasure.state == TreasureState.Collected); UI/Common/FunctionButtonGroup.cs
@@ -71,11 +71,16 @@ public void NotifyToggleOn(FunctionButton button) { if (button.state == TitleBtnState.Click) { currentOrder = button.order; for (int i = 0; i < orders.Count; i++) { if(!functionButtons.ContainsKey(orders[i])) { Debug.LogFormat("<color=#ff0000ff>{0} {1}</color>", orders[i],button.name); } var functionButton = functionButtons[orders[i]]; if (functionButton != button && functionButton.state != TitleBtnState.Locked) {
