| Fight/Actor/HeroBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GA_Guard.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GatheringSoul/VirtualPackModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/KnapSack/Logic/SelectBoxItemCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/NewYearFairylandCeremony/NewYearCeremonyOutOfPrintWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/OpenServerActivity/OpenServiceAchievementModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Actor/HeroBehaviour.cs
@@ -477,7 +477,7 @@ else if (m_Hero.SelectTarget != null) { GActorNpcFight _npcFight = m_Hero.SelectTarget as GActorNpcFight; if (_npcFight != null && _fight.CanAtked()) if (_npcFight != null && _npcFight.CanAtked()) { _radius = _npcFight.NpcConfig.ModelRadius; } Fight/GameActor/GA_Guard.cs
@@ -1,5 +1,5 @@ using System; using System; using System.Collections; using Snxxz.UI; using TableConfig; @@ -130,8 +130,8 @@ { deadModel.AllPlayerDieEvent -= AllPlayerDieEvent; deadModel.AllPlayerRebornEvent -= AllPlayerRebornEvent; DTC0429_tagObjResetPos.ResetPlayerPosEvent -= ResetPlayerPosEvent; DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent -= AfterPlayerDataInitializeEvent; DTC0429_tagObjResetPos.ResetPlayerPosEvent -= ResetPlayerPosEvent; DTC0102_tagCDBPlayer.afterPlayerDataInitializeEvent -= AfterPlayerDataInitializeEvent; DTCA112_tagMCDBPlayer.playerInitEvent -= PlayerInitEvent; if (IsHeroControl) { @@ -153,45 +153,45 @@ pickUpBehaviour = null; base.OnUnit(); } private void AfterPlayerDataInitializeEvent() { SnxxzGame.Instance.StartCoroutine(Co_RecheckPlayLifeState()); } public void PlayerInitEvent() { CheckResetGuardState(); } IEnumerator Co_RecheckPlayLifeState() { yield return null; CheckResetGuardState(); } void CheckResetGuardState() { if (guardState == GuardState.Inter) { var hero = PlayerDatas.Instance.hero; if (hero != null) { if (hero.ActorInfo != null && !hero.ActorInfo.serverDie) { IsPlayerDie = false; IsStateActive = true; if (m_Animator) { m_Animator.enabled = true; } SetPosition(hero.Pos.x / 2, hero.Pos.y / 2); } } } } } private void AfterPlayerDataInitializeEvent() { SnxxzGame.Instance.StartCoroutine(Co_RecheckPlayLifeState()); } public void PlayerInitEvent() { CheckResetGuardState(); } IEnumerator Co_RecheckPlayLifeState() { yield return null; CheckResetGuardState(); } void CheckResetGuardState() { if (guardState == GuardState.Inter) { var hero = PlayerDatas.Instance.hero; if (hero != null) { if (hero.ActorInfo != null && !hero.ActorInfo.serverDie) { IsPlayerDie = false; IsStateActive = true; if (m_Animator) { m_Animator.enabled = true; } SetPosition(hero.Pos.x / 2, hero.Pos.y / 2); } } } } private void ReleasePickUpBehaviour() { if (pickUpBehaviour != null) @@ -244,7 +244,7 @@ m_SFXController.transform.SetParent(mountPoint); m_SFXController.transform.localPosition = Vector3.zero; m_SFXController.transform.localPosition = Vector3.zero; m_SFXController.transform.localEulerAngles = Vector3.zero; } @@ -296,6 +296,25 @@ if (!result || prefab == null) { return; } if (m_Model) { if (NpcConfig != null) { GameObject _toDestroy = InstanceResourcesLoader.LoadNpc(NpcConfig.NPCID); if (_toDestroy) { GameObjectPoolManager.Instance.ReleaseGameObject(_toDestroy, m_Model); } } else { UnityEngine.Object.Destroy(m_Model); } m_Model = null; m_Animator = null; } GAMgr.Instance.RemoveNeedDestroyPrefab(prefab as GameObject); @@ -514,18 +533,18 @@ if (DropItemManager.CheckCanGuardPickUp(Root.position)) { var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); if (dataMapId != 0) { var dungeonConfig = Config.Instance.Get<DungeonOpenTimeConfig>(dataMapId); if (dungeonConfig != null) { if (dungeonConfig.GuardPick == 0) { return false; } } } var dataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID); if (dataMapId != 0) { var dungeonConfig = Config.Instance.Get<DungeonOpenTimeConfig>(dataMapId); if (dungeonConfig != null) { if (dungeonConfig.GuardPick == 0) { return false; } } } if (guardState != GuardState.PickUp) { System/GatheringSoul/VirtualPackModel.cs
@@ -63,6 +63,25 @@ return capacity; } public int GetItemCountById(PackType packType, int id) { var count = 0; List<int> list; if (TryGetItems(packType, out list)) { for (int i = 0; i < list.Count; i++) { VirtualPackItem item; if (TryGetItem(packType, list[i], out item) && item.id == id) { count++; } } } return count; } public bool TryGetItems(PackType packType, out List<int> list) { list = new List<int>(); System/KnapSack/Logic/SelectBoxItemCell.cs
@@ -33,16 +33,25 @@ ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(id); this.ItemId = id; nameText.text = itemConfig.ItemName; ItemCellModel cellModel = new ItemCellModel(id, false, (ulong)BoxModel.selectDict[id],0,"",PackType.rptDeleted,true); ItemCellModel cellModel = new ItemCellModel(id, true, (ulong)BoxModel.selectDict[id],0,"",PackType.rptDeleted,true); itemBaisc.Init(cellModel); if (itemConfig.Effect1 == 220) { id = itemConfig.EffectValueA1; } int haveCnt = playerPack.GetItemCountByID(PackType.rptItem,id); if(haveCnt <= 0) var packType = GeneralDefine.GetPackTypeByItemType(itemConfig.Type); int haveCnt = 0; switch(packType) { haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id); case PackType.rptRunePack: haveCnt = ModelCenter.Instance.GetModel<RuneModel>().GetRuneCountById(id); break; case PackType.rptGatherSoul: haveCnt = ModelCenter.Instance.GetModel<VirtualPackModel>().GetItemCountById(packType,id); break; default: haveCnt = playerPack.GetItemCountByID(packType, id); break; } haveCntText.text = haveCnt.ToString(); SetIsChoose(false); System/MainInterfacePanel/HighSettingFadeInFadeOut.cs
@@ -119,7 +119,7 @@ private void operationEndEvent(Operation arg1, int arg2) { if (arg1 == Operation.FairyCeremony) if (arg1 == Operation.FairyCeremony || arg1== Operation.NewYearFairyCeremony) { Classify(); } @@ -127,7 +127,7 @@ private void operationStartEvent(Operation arg1, int arg2) { if (arg1 == Operation.FairyCeremony) if (arg1 == Operation.FairyCeremony || arg1 == Operation.NewYearFairyCeremony) { Classify(); } @@ -582,9 +582,30 @@ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 1) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && OperationTimeHepler.Instance.SatisfyOpenCondition(Operation.NewYearFairyCeremony))//精灵盛典 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicLow.Add(highBtnRecord.Index, selectCaseRequest); } else//------第三层 { SelectCaseRequest selectCaseRequest = new SelectCaseRequest(); selectCaseRequest.Tran = m_GroupIndex_Low.GetChild(i); selectCaseRequest.IsNagaaki = highBtnRecord.IsNagaaki; selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 2) { var _funcOrder = 0; if (OpenServerActivityCenter.Instance.IsAnyActivityOpen(out _funcOrder))//精彩活动 @@ -609,9 +630,8 @@ } } } } else if (IndexOf == 2) else if (IndexOf == 3) { bool Isopen = impactRankModel.IsInImpactRank; if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//全民冲榜 @@ -634,7 +654,7 @@ } } } else if (IndexOf == 3) else if (IndexOf == 4) { bool Isopen = OpenServerModel.IsOpen; if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//7天寻礼 @@ -656,10 +676,8 @@ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 4) else if (IndexOf == 5) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(14); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时抢购 @@ -681,10 +699,8 @@ AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 5) else if (IndexOf == 6) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包 { @@ -704,11 +720,9 @@ selectCaseRequest.Index = highBtnRecord.Index; AnimationFadeOutDicThree.Add(highBtnRecord.Index, selectCaseRequest); } } } else if (IndexOf == 6) else if (IndexOf == 7) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠 @@ -731,10 +745,6 @@ } } } //else if (IndexOf == 7) //{ //} } } } System/MainInterfacePanel/HighSettingTip.cs
@@ -53,6 +53,7 @@ [SerializeField] Button m_FlashRushBtn;//限时抢购 [SerializeField] Button m_CrossServerBtn;//跨服1V1按钮 [SerializeField] Button m_OpenServiceBtn;//周狂欢按钮 [SerializeField] Button m_NewYearBtn;//新年盛典 private bool _bool = true; private int swicthCdTime = 0; private bool IsFadeOut = true; @@ -96,6 +97,7 @@ m_FlashRushBtn.AddListener(OnClickFlashRushBtn); m_CrossServerBtn.AddListener(OnClickCrossServerBtn); m_OpenServiceBtn.AddListener(OnClickOpenServiceBtn); m_NewYearBtn.AddListener(OnClickNewYearBtn); if (_bool) { ColseButton(); @@ -151,6 +153,7 @@ _RuneTaBtn.onClick.RemoveAllListeners(); m_FlashSaleBtn.RemoveAllListeners(); m_AllThePeopleBtn.RemoveAllListeners(); m_NewYearBtn.RemoveAllListeners(); CoroutineMgr.Instance.MainHighTipCdTimeEvent -= OnMainHighTipCdTime; FunctionUnlockFlyObjectTarget.IsPlayerUiEffect -= IsPlayerUiEffect; FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange; @@ -390,6 +393,12 @@ WindowCenter.Instance.Open<AchievementActivityWin>(); } void OnClickNewYearBtn() { WindowCenter.Instance.Close<MainInterfaceWin>(); WindowCenter.Instance.Open<NewYearFairylandCeremonyWin>(); } public void ShowButton()//向上 {
@@ -66,14 +66,14 @@ private void OnRefreshRankList(int type) { if (type != (int)PlayerRankData.RankType.Def_BT_FCCostGold) return; if (type != (int)PlayerRankData.RankType.Def_BT_NewFCCostGold) return; RefreshRankInfo(); } private void RefreshRankInfo() { List<PlayerRankData.RankData> list = PlayerDatas.Instance.rank.GetRankList((int)PlayerRankData.RankType.Def_BT_FCCostGold); List<PlayerRankData.RankData> list = PlayerDatas.Instance.rank.GetRankList((int)PlayerRankData.RankType.Def_BT_NewFCCostGold); firstNameText.text = Language.Get("CeremoneyOutOfPrint"); secondNameText.text = Language.Get("CeremoneyOutOfPrint"); thirdNameText.text = Language.Get("CeremoneyOutOfPrint"); System/OpenServerActivity/OpenServiceAchievementModel.cs
@@ -433,6 +433,7 @@ } private void SetRedPointId()//设置红点ID { if (RedPointDic.Count >= 7) { return; } RedPointDic.Clear(); foreach (var key in WeekPartyDayInfoDic.Keys) {
