Core/NetworkPackage/ServerPack/HC1_CrossRealm/HC103_tagMCCrossRealmPKPlayerHisSeasonInfo.cs
@@ -19,6 +19,7 @@ TransBytes (out SeasonList[i].SeasonID, vBytes, NetDataType.WORD); TransBytes (out SeasonList[i].Order, vBytes, NetDataType.WORD); TransBytes (out SeasonList[i].DanLV, vBytes, NetDataType.BYTE); TransBytes (out SeasonList[i].Score, vBytes, NetDataType.DWORD); TransBytes (out SeasonList[i].AwardLV, vBytes, NetDataType.BYTE); } } @@ -27,6 +28,7 @@ public ushort SeasonID; // 赛季ID public ushort Order; // 名次 public byte DanLV; // 段位 public uint Score; // 积分 public byte AwardLV; // 赛季结算奖励等级，比如王者法宝的属性取该等级对应属性 }
@@ -23,6 +23,16 @@ SelectEquipModel selectModel {get { return ModelCenter.Instance.GetModel<SelectEquipModel>(); }} ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } } private void OnEnable() { playerPack.ItemCntReduceAct += UpdateItemCount; } private void OnDisable() { playerPack.ItemCntReduceAct -= UpdateItemCount; } public void SetDisplay(ItemCompoundConfig _itemCompound,NeedMatType _matType,bool isLock,string des = "", int _itemId = 0,int _itemIndex = -1) { this.itemCompound = _itemCompound; @@ -187,6 +197,18 @@ WindowCenter.Instance.Open<SelectItemWin>(); } private void UpdateItemCount(PackType type, int index, int id) { if (itemModel == null) return; if(itemModel.packType == type && itemModel.itemInfo.ItemPlace == index && itemModel.itemId == id) { ClickReduce(); } } private void ClickReduce() { if (itemModel == null) return; System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs
@@ -418,6 +418,7 @@ division = data.DanLV, order = data.Order, rewardLevel = data.AwardLV, score = (int)data.Score, }; } if (oneVsOneHistoryRefresh != null) @@ -437,6 +438,7 @@ public int order; public int division; public int rewardLevel; public int score; } #endregion @@ -527,6 +529,10 @@ crossServerRedpoint.count = playerInfo.GetDayRemainNum(); crossServerRedpoint.state = RedPointState.Quantity; } else { crossServerRedpoint.count = 0; } } #endregion } System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -128,6 +128,10 @@ { if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面 { if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>()) { WindowCenter.Instance.CloseImmediately<CrossServerOneVsOneRoundWin>(); } WindowCenter.Instance.Open<CrossServerSettlementWin>(); } } @@ -345,7 +349,6 @@ { var match = new CC104_tagCMExitCrossRealm(); GameNetSystem.Instance.SendToCrossServer(match); SetPkType(); } private static int pkDanLvNow = 0; @@ -405,9 +408,17 @@ set { m_PkType = value; } } private static void SetPkType() public static void SetPkType() { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType); if (m_PkType != 1) { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)m_PkType); } else { DTCA202_tagMCAttackMode.Send_SwitchAttackMode((E_AttackMode)0); } } }
@@ -93,6 +93,7 @@ protected override void OnPreClose() { CrossServerRewardModel.SetPkType(); } protected override void OnAfterClose() @@ -191,7 +192,14 @@ m_SegmentTxt2.text = config2.Name; } m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")"; if (crossServerModel.pkResultInfo.WinStreak > 1) { m_SorceText.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); } else { m_SorceText.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); } } private void SetBrokenLine() @@ -200,11 +208,11 @@ int playerID = (int)PlayerDatas.Instance.baseData.PlayerID; if (WinnerID == playerID) { m_BrokenLineText.text = "对手离开战斗"; m_BrokenLineText.text = Language.Get("CrossServer_Z6"); } else { m_BrokenLineText.text = "重新连接超时"; m_BrokenLineText.text = Language.Get("CrossServer_Z7"); } if (crossServerModel.pkResultInfo.WinStreak > 1) { @@ -228,7 +236,14 @@ { m_SegmentObj1.SetActive(false); } m_Sorce_Txt.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")"; if (crossServerModel.pkResultInfo.WinStreak > 1) { m_Sorce_Txt.text = Language.Get("CrossServer_Z1", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); } else { m_Sorce_Txt.text = Language.Get("CrossServer_Z2", crossServerModel.pkResultInfo.CurScore, crossServerModel.pkResultInfo.AddScore); } } }
@@ -105,7 +105,7 @@ private void ClickRecieve() { if (awardType == null) return; if (awardType == null || m_CrossServerCyclicScroll.showing) return; isLineMove = true; switch (awardType.type) System/CrossServerOneVsOne/FightingPKWin.cs
@@ -142,8 +142,8 @@ } else { var surplus = dungeonEndTime - DateTime.Now; m_CountdownText.text = ((int)surplus.TotalSeconds).ToString(); var surplus = dungeonEndTime - DateTime.Now; m_CountdownText.text = (Mathf.CeilToInt((float)surplus.TotalSeconds)).ToString(); } } System/CrossServerOneVsOne/RankingWin.cs
@@ -171,7 +171,7 @@ int Index = cell.index; Button Btn = cell.GetComponent<Button>(); Text txt = cell.transform.Find("Text").GetComponent<Text>(); txt.text = "赛区" + Index; txt.text = Language.Get("CrossServer_Z4") + Index; Btn.SetListener(() => { crossServerRewardModel.ZoneID = Index; @@ -185,7 +185,7 @@ int Index = cell.index; Button Btn = cell.GetComponent<Button>(); Text txt = cell.transform.Find("Text").GetComponent<Text>(); txt.text = "赛季" + Index; txt.text = Language.Get("CrossServer_Z3") + Index; Btn.SetListener(() => { crossServerRewardModel.SeasonID = Index; @@ -217,8 +217,8 @@ private void SetZoneAndSeasonNum() { m_DivisionNameText1.text = "赛区"+crossServerRewardModel.ZoneID.ToString(); m_DivisionNameText2.text = "赛季"+crossServerRewardModel.SeasonID.ToString(); m_DivisionNameText1.text = Language.Get("CrossServer_Z4") +crossServerRewardModel.ZoneID.ToString(); m_DivisionNameText2.text = Language.Get("CrossServer_Z3") + crossServerRewardModel.SeasonID.ToString(); } private void SetZoneIDAndSeasonID()//设置赛区和ID System/CrossServerOneVsOne/SeasonRewardCell.cs
@@ -58,13 +58,13 @@ var keyList = crossServerRewardModel.SeasonRewardDic.AwardDic.Keys.ToList(); int Index = keyList.IndexOf(id); if (Index == 0) { m_Text_Ranking.text = "1-" + id + "名"; { m_Text_Ranking.text = Language.Get("CrossServer_Z5", 1, id); } else { int Number = keyList[(Index - 1)]; m_Text_Ranking.text = (Number+1) + "-" + id + "名"; int Number = keyList[(Index - 1)]; m_Text_Ranking.text = Language.Get("CrossServer_Z5", (Number + 1), id); } switch (Index) { System/MainInterfacePanel/ChatFrame.cs
@@ -71,8 +71,8 @@ myTeamRefreshEvent(); OnRefreshFairyInfo(); CheckRealmSfx(); MailCountChange(); GetRealmLevel(); if (PlayerDatas.Instance.hero != null) { if (PlayerDatas.Instance.hero.aiHandler.IsAuto()) @@ -80,8 +80,8 @@ OnHeroHandupAIStopPassive(); } } MailCountChange(); GetRealmLevel(); } public void OnAfterOpen() System/MainInterfacePanel/MainInterfaceWin.cs
@@ -1284,6 +1284,7 @@ m_TaskSwithButton.gameObject.SetActive(false); m_InGamePusher.gameObject.SetActive(false); m_RedBag.gameObject.SetActive(false); IsShowTaskPanel(); if (Vector3.Distance(m_CastSkillTip.localPosition, m_position2_S.localPosition) <= 1)//技能面板收起状态 { ShowCastSkill();//显示技能组,隐藏按钮组(强制切换) System/Strengthening/GemModel.cs
@@ -278,133 +278,6 @@ return SatisfyCondition(config.EffectValueA1, config.EffectValueB1, out _place, out _hole); } /*旧版红点规则 public void OnUpdateRedPoint() { if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Gem)) { return; } UpdateHoleRedpoint(presentGemEquip); for (int i = 1; i <= 10; i++) { ItemModel item = playerPack.GetItemModelByIndex(PackType.rptEquip, i); redpointList[i - 1].state = RedPointState.None; if (item != null) { ItemConfig itemCfg = Config.Instance.Get<ItemConfig>((int)item.itemInfo.ItemID); List<ItemModel> list = IsBagHaveGem(FuncConfigConfig.GetGemTypeByEquipPos(item.itemInfo.ItemPlace)); if (list == null || list.Count == 0) continue; uint[] stones = PlayerStoneData.Instance.GetStoneInfo(i); for (int j = 0; j < 4; j++) { if (j == 3) { if (PlayerDatas.Instance.baseData.VIPLv < gemVipHoleLv || itemCfg.LV < gemOpenArray[0]) { continue; } } else { if (itemCfg.LV < gemOpenArray[j]) { continue; } } if ((stones == null || stones[j] == 0) && list.Count > 0) { redpointList[i - 1].state = RedPointState.Simple; break; } else { bool _replace = false; foreach (var gemItem in list) { if (gemItem.itemInfo.ItemID > stones[j]) { redpointList[i - 1].state = RedPointState.Simple; _replace = true; break; } } if (!_replace && IsSatisfyGemCompose(i, j, (int)stones[j])) { redpointList[i - 1].state = RedPointState.Simple; continue; } } } } } } public void UpdateHoleRedpoint(int _index) { for (int i = 0; i < gemHoleReds.Count; i++) { gemHoleReds[i].state = RedPointState.None; gemComposeReds[i].state = RedPointState.None; } if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Gem)) { return; } ItemModel item = playerPack.GetItemModelByIndex(PackType.rptEquip, _index); if (item != null) { ItemConfig itemCfg = Config.Instance.Get<ItemConfig>((int)item.itemInfo.ItemID); List<ItemModel> list = IsBagHaveGem(FuncConfigConfig.GetGemTypeByEquipPos(item.itemInfo.ItemPlace)); if (list == null || list.Count == 0) { return; } uint[] stones = PlayerStoneData.Instance.GetStoneInfo(_index); for (int j = 0; j < 4; j++) { if (j == 3) { if (PlayerDatas.Instance.baseData.VIPLv < gemVipHoleLv || itemCfg.LV < gemOpenArray[0]) { continue; } } else { if (itemCfg.LV < gemOpenArray[j]) { continue; } } if ((stones == null || stones[j] == 0) && list.Count > 0) { gemHoleReds[j].state = RedPointState.Simple; continue; } else { bool _replace = false; foreach (var gemItem in list) { if (gemItem.itemInfo.ItemID > stones[j]) { gemHoleReds[j].state = RedPointState.Simple; _replace = true; break; } } if (!_replace && IsSatisfyGemCompose(_index, j, (int)stones[j])) { gemComposeReds[j].state = RedPointState.Simple; gemHoleReds[j].state = RedPointState.Simple; continue; } } } } }*/ private Dictionary<int, Dictionary<int, bool>> gemHoleRedpoints = new Dictionary<int, Dictionary<int, bool>>(); public void OnUpdateRedPoint() System/Treasure/KingTreasureWin.cs
@@ -147,6 +147,7 @@ if (kingTreasureModel.TryGetSeason(model.selectedTreasure, out session) && crossServerOneVsOneModel.TryGetOneVsOneHistory(session, out history)) { m_Score.text = history.score.ToString(); var divisionConfig = Config.Instance.Get<CrossServerArenaConfig>(history.division); if (divisionConfig != null) { @@ -158,9 +159,9 @@ bool containsDivision = kingTreasureModel.TryGetDivision(model.selectedTreasure, history.rewardLevel, out division); m_ContainerBaseProperty.gameObject.SetActive(containsDivision && division.basePropertys.Count > 0); m_ContainerSpecialProperty.gameObject.SetActive(containsDivision && division.specialPropertys.Count > 0); var index = 0; if (containsDivision && division.basePropertys.Count > 0) { var index = 0; foreach (var key in division.basePropertys.Keys) { if (index < m_BasePropertys.Length) @@ -170,14 +171,14 @@ } index++; } for (int i = index; i < m_BasePropertys.Length; i++) { m_BasePropertys[i].gameObject.SetActive(false); } } for (int i = index; i < m_BasePropertys.Length; i++) { m_BasePropertys[i].gameObject.SetActive(false); } index = 0; if (containsDivision && division.specialPropertys.Count > 0) { var index = 0; foreach (var key in division.specialPropertys.Keys) { if (index < m_SpecialPropertys.Length) @@ -187,10 +188,10 @@ } index++; } for (int i = index; i < m_SpecialPropertys.Length; i++) { m_SpecialPropertys[i].gameObject.SetActive(false); } } for (int i = index; i < m_SpecialPropertys.Length; i++) { m_SpecialPropertys[i].gameObject.SetActive(false); } } } @@ -242,7 +243,7 @@ private void Goto() { //--todo 跳转至赛季目标 WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)278); } }
