| Fight/Actor/HeroBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerRewardModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/HighSettingFadeInFadeOut.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Fight/Actor/HeroBehaviour.cs
@@ -229,8 +229,19 @@ } } public void StopHandupAI() public void StopHandupAI(bool force = false) { if (!force) { if (StageManager.Instance.StageType == Stage.E_StageType.Dungeon) { if (DungeonStage.CurrentMapType != MapType.OpenCountry) { return; } } } if (PreFightMission.Instance.IsFinished() == false) { return; @@ -809,8 +820,8 @@ HurtHP = _serverHurtList[i].HurtHP }; } if(!GameNetSystem.Instance.crossServerSocketConnected) if (!GameNetSystem.Instance.crossServerSocketConnected) { GameNetSystem.Instance.SendInfo(_b405); } System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -75,10 +75,14 @@ public Redpoint redPointStre1 = new Redpoint(21301, Redpoint_key1); private const int Redpoint_key2 = 2130103;//赛季奖励红点 public Redpoint redPointStre2 = new Redpoint(21301, Redpoint_key2); private int MianOpenLV = 0;//跨服按钮开启条件 public override void Init() { GetSeasonAward(); GetSegmentReward(); var config = Config.Instance.Get<FuncConfigConfig>("CrossServerIcon").Numerical1; MianOpenLV = int.Parse(config); } public void OnBeforePlayerDataInitialize() @@ -95,9 +99,10 @@ crossServerModel.UpdatePkResultEvent += UpdatePkResultEvent; CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent; RedPointSeg(); RedPointSea(); } public override void UnInit() { @@ -106,7 +111,19 @@ private void UpdatePlayerInfoEvent() { RedPointSeg(); RedPointSea(); } public bool IsShowCrossServerOneVsOne()//是否开启跨服按钮 { bool Isbool = false; if (PlayerDatas.Instance.baseData.LV >= MianOpenLV && TimeUtility.OpenDay >= crossServerModel.afterOpenDayOpenCross) { Isbool = true; } return Isbool; } private void UpdatePkResultEvent() { if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面 @@ -199,6 +216,7 @@ CrossRealmPKAwardStateUpdate(); } RedPointSeg(); RedPointSea(); } public bool IsAwardState(CrossRealmPKAwardStateEnum _cross, int Index)//是否已领取奖励 @@ -343,7 +361,7 @@ bool Isbool = false; foreach (var key in SegmentRewardDic.Keys) { if (SegmentRewardDic[key].DanLv >= Danlv && !IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, SegmentRewardDic[key].DanLv)) if (Danlv >= SegmentRewardDic[key].DanLv && !IsAwardState(CrossRealmPKAwardStateEnum.DanLVAwardState, SegmentRewardDic[key].DanLv)) { Isbool = true; } @@ -357,6 +375,28 @@ redPointStre1.state = RedPointState.None; } } private void RedPointSea()//赛季奖励红点 { bool Isbool = false; int Danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV; bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool) { if ((MyRank > -1 && MyRank < 100) || SeasonRewardConfigDic.ContainsKey(Danlv)) { Isbool = true; } } if (Isbool) { redPointStre2.state = RedPointState.Simple; } else { redPointStre2.state = RedPointState.None; } } }
@@ -52,6 +52,8 @@ OSGiftModel osGiftModel { get { return ModelCenter.Instance.GetModel<OSGiftModel>(); } } LimitedTimePackageItemClassModel limitedTimePackageItemModel { get { return ModelCenter.Instance.GetModel<LimitedTimePackageItemClassModel>(); } } ImpactRankModel impactRankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } CrossServerRewardModel m_CrossServerRewardModel; CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } } public void Init() { if (LatencyTimeList.Count <= 0) @@ -588,6 +590,30 @@ } else if (IndexOf == 2) { if (crossServerRewardModel.IsShowCrossServerOneVsOne())//跨服 { 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 == 3) { if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && limitedTimePackageItemModel.IsExpired())//限时礼包 { if (AnimationFadeOutDicLow.Count < 6)//------第二层 @@ -610,7 +636,7 @@ } } else if (IndexOf == 3) else if (IndexOf == 4) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(4); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时特惠 @@ -634,7 +660,7 @@ } } else if (IndexOf == 4) else if (IndexOf == 5) { bool Isopen = OpenServerActivityCenter.Instance.IsActivityOpen(14); if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//限时抢购 @@ -658,7 +684,7 @@ } } else if (IndexOf == 5) else if (IndexOf == 6) { bool Isopen = impactRankModel.IsInImpactRank; if (!AnimationFadeOutDicLow.ContainsKey(highBtnRecord.Index) && Isopen)//全民冲榜
