| Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/State/SMB/STM_BaseAttack.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/Status/Status_Base.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/EquipTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/NetworkPackage/DTCFile/ServerPack/H06_PlayerVsNPC/DTC0614_tagUseSkillPos.cs
@@ -60,30 +60,44 @@ // 这里播放配置的技能特效 if (_skill.skillInfo.config.EffectName > 0) { if (_skill.warnPosList.Count > 1) bool _playEffect = true; if (vNetData.ObjID != PlayerDatas.Instance.PlayerId) { for (int i = 0; i < _skill.warnPosList.Count; ++i) if (!_attacker.ShowOrHide || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _skill.warnPosList[i], Vector3.forward); _playEffect = false; } } else if (_playEffect) { if ((_skill.skillInfo.config.Tag % 10) == 0 || (_skill.skillInfo.config.Tag % 10) == 1 || _attacker is GActorNpcFight) if (_skill.warnPosList.Count > 1) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); for (int i = 0; i < _skill.warnPosList.Count; ++i) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _skill.warnPosList[i], Vector3.forward); } } else { Vector3 _pos = new Vector3((vNetData.PosX - GA_Hero.MapOffset.x) * .5f, _attacker.Pos.y, (vNetData.PosY - GA_Hero.MapOffset.z) * .5f); if ((_skill.skillInfo.config.Tag % 10) == 0 || (_skill.skillInfo.config.Tag % 10) == 1 || _attacker is GActorNpcFight) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); } else { Vector3 _pos = new Vector3((vNetData.PosX - GA_Hero.MapOffset.x) * .5f, _attacker.Pos.y, (vNetData.PosY - GA_Hero.MapOffset.z) * .5f); Vector3 _dir = MathUtility.ForwardXZ(_pos, _attacker.Pos); Vector3 _dir = MathUtility.ForwardXZ(_pos, _attacker.Pos); SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _pos, _dir); SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _pos, _dir); } } } } Core/NetworkPackage/DTCFile/ServerPack/HB4_Fight/DTCB401_tagMCSkillHurtList.cs
@@ -43,7 +43,22 @@ if (_skill.skillInfo.config.EffectName != 0) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); bool _playEffect = true; if (vNetData.ObjID != PlayerDatas.Instance.PlayerId) { if (!_attacker.ShowOrHide || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { _playEffect = false; } } if (_playEffect) { SFXPlayUtility.Instance.PlayBattleEffect(_skill.skillInfo.config.EffectName, _attacker); } } GActorFight _cTarget = null; Fight/Actor/State/SMB/STM_BaseAttack.cs
@@ -927,6 +927,11 @@ { return; } if (SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { return; } } SFXController _controller = SFXPlayUtility.Instance.PlayBattleEffect(id, owner); Fight/Actor/Status/Status_Base.cs
@@ -41,10 +41,24 @@ SFXPlayUtility.Instance.Release(m_Effect); } m_Effect = SFXPlayUtility.Instance.PlayBattleEffect(m_SkillConfig.BuffEffectID, _target); if (m_Effect) bool _playEffect = true; if (h0605.ObjID != PlayerDatas.Instance.PlayerId) { m_Effect.m_OnFinished += OnEffectOver; if (!_target.ShowOrHide || SystemSetting.Instance.GetCurrentQualityLevel() == GameQuality.Low) { _playEffect = false; } } if (_playEffect) { m_Effect = SFXPlayUtility.Instance.PlayBattleEffect(m_SkillConfig.BuffEffectID, _target); if (m_Effect) { m_Effect.m_OnFinished += OnEffectOver; } } } } System/KnapSack/Logic/EquipTip.cs
@@ -153,19 +153,6 @@ { bottomPart.gameObject.SetActive(false); StartCoroutine(SetScrollSize()); StartCoroutine(CheckPlayerIsReborn()); } IEnumerator CheckPlayerIsReborn() { int questTimes = 0; while (questTimes < 5) { DesignDebug.Log("CheckPlayerIsReborn:开始"); yield return new WaitForSeconds(1); questTimes += 1; DesignDebug.Log("CheckPlayerIsReborn：结束"); } } IEnumerator SetScrollSize() System/Store/StoreModel.cs
@@ -37,6 +37,7 @@ public Dictionary<int,Dictionary<int,int>> JobReplaceIdDict = new Dictionary<int, Dictionary<int, int>>(); public Dictionary<int, string> resetTimeDict { get; private set; } public Dictionary<int, int> showCoinsUIDict { get; private set; } public int[] StoreRedIdlist { get; private set;} public override void Init() { FuncConfigConfig buyItemHinit = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("BuyItemHinit"); @@ -45,6 +46,8 @@ resetTimeDict = ConfigParse.GetDic<int, string>(restTimeConfig.Numerical1); FuncConfigConfig mallCurrency = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MallCurrency"); showCoinsUIDict = ConfigParse.GetDic<int, int>(mallCurrency.Numerical1); FuncConfigConfig mallPush = ConfigManager.Instance.GetTemplate<FuncConfigConfig>("MallPush"); StoreRedIdlist = ConfigParse.GetMultipleStr<int>(mallPush.Numerical2); } public void OnBeforePlayerDataInitialize() @@ -68,8 +71,8 @@ PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += RefreshFamilyLv; FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange; FuncOpen.Instance.OnFuncStateChangeEvent += FuncStateChange; PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= RefreshPlayerLv; PlayerDatas.Instance.PlayerDataRefreshInfoEvent += RefreshPlayerLv; RefreshTCBPlayerDataEvent -= RefreshPlayerLv; RefreshTCBPlayerDataEvent += RefreshPlayerLv; TimeMgr.Instance.OnHourEvent -= RefreshServerHour; TimeMgr.Instance.OnHourEvent += RefreshServerHour; shoplist = null; @@ -120,9 +123,16 @@ private void RefreshPlayerLv(PlayerDataRefresh type) { if (type != PlayerDataRefresh.LV && type != PlayerDataRefresh.VIPLv) return; CheckShopRedpoint(); switch(type) { case PlayerDataRefresh.LV: case PlayerDataRefresh.VIPLv: case PlayerDataRefresh.Gold: case PlayerDataRefresh.GoldPaper: case PlayerDataRefresh.FBHelpPoint: CheckShopRedpoint(); break; } } public override void UnInit() @@ -765,17 +775,7 @@ StoreConfig storeConfig = ConfigManager.Instance.GetTemplate<StoreConfig>(key); if (storeConfig.MoneyNumber == 0) { int canBuyCnt = 0; int addBuyCnt = 0; bool isLimitBuy = BuyItemPopModel.Instance.CheckIsLimitBuyCnt(storeConfig, out canBuyCnt, out addBuyCnt); BuyShopItemLimit shopItemLimit = GetBuyShopLimit((uint)storeConfig.ID); int remainNum = canBuyCnt; if (shopItemLimit != null) { remainNum -= shopItemLimit.BuyCnt; } List<StoreConfig> list = StoreConfig.GetSellShoplist(); if (remainNum > 0 && list.Contains(storeConfig)) if(CheckShopIsCanBuy(storeConfig)) { shopRedDict[storeConfig.ID].state = RedPointState.Simple; } @@ -783,15 +783,56 @@ { shopRedDict[storeConfig.ID].state = RedPointState.None; } } else { shopRedDict[storeConfig.ID].state = RedPointState.None; if(CheckScoreStoreIsCanBuy(storeConfig)) { shopRedDict[storeConfig.ID].state = RedPointState.Simple; } else { shopRedDict[storeConfig.ID].state = RedPointState.None; } } } } public bool CheckScoreStoreIsCanBuy(StoreConfig storeConfig) { List<StoreConfig> list = StoreConfig.GetSellShoplist(); if(StoreRedIdlist.Contains(storeConfig.ID)) { if (CheckShopIsCanBuy(storeConfig)) { if(UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= (ulong)storeConfig.MoneyNumber) { return true; } } } return false; } public bool CheckShopIsCanBuy(StoreConfig storeConfig) { int canBuyCnt = 0; int addBuyCnt = 0; bool isLimitBuy = BuyItemPopModel.Instance.CheckIsLimitBuyCnt(storeConfig, out canBuyCnt, out addBuyCnt); BuyShopItemLimit shopItemLimit = GetBuyShopLimit((uint)storeConfig.ID); int remainNum = canBuyCnt; if (shopItemLimit != null) { remainNum -= shopItemLimit.BuyCnt; } List<StoreConfig> list = StoreConfig.GetSellShoplist(); if (remainNum > 0 && list.Contains(storeConfig)) { return true; } return false; } #endregion }
@@ -100,7 +100,7 @@ m_storeModel.RefreshTCBPlayerDataEvent += OnRefreshPlayerInfo; m_storeModel.RefreshBuyShopLimitEvent = OnCreate; RefreshCoins(); RefreshResetTime(); } protected override void OnActived() @@ -108,7 +108,6 @@ base.OnActived(); _funcBtnGroup.TriggerByOrder(functionOrder); GlobalTimeEvent.Instance.secondEvent += RefreshResetTime; RefreshResetTime(); } protected override void OnAfterOpen() @@ -163,15 +162,22 @@ private void RefreshResetTime() { if (_tagStoreModellist.Count < 1) return; if (_tagStoreModellist[0].RefreshType == 0) _resetRefreshTimeText.gameObject.SetActive(false); else if(_tagStoreModellist == null || _tagStoreModellist.Count < 1) { _resetRefreshTimeText.gameObject.SetActive(true); _resetRefreshTimeText.text = m_storeModel.GetStoreRefreshTimeByType(_tagStoreModellist[0].RefreshType); _tagStoreModellist = StoreConfig.GetTypeStoreModel((int)m_storeModel.storeFuncType); } if(_tagStoreModellist.Count > 0) { if (_tagStoreModellist[0].RefreshType == 0) { _resetRefreshTimeText.gameObject.SetActive(false); } else { _resetRefreshTimeText.gameObject.SetActive(true); _resetRefreshTimeText.text = m_storeModel.GetStoreRefreshTimeByType(_tagStoreModellist[0].RefreshType); } } }
@@ -926,6 +926,10 @@ openWindows.Clear(); IsJumpState = false; jumpWinNameDict.Clear(); if(DeadModel.playerIsDie) { DeadModel.PlayerDie(PlayerDatas.Instance.baseData.PlayerID); } } }
