Core/NetworkPackage/DTCFile/ServerPack/HA1_Sys/DTCA127_tagMCStartChangeMap.cs
@@ -121,8 +121,9 @@ SelectionManager.ClearJHSfx(); DEBUG_STEP = 3; PlayerDatas.Instance.baseData.MapID = (ushort)package.MapID; PlayerDatas.Instance.baseData.dungeonLineId = package.FuncLineID; var isMainSocket = vNetPack.socketType == GameNetSystem.SocketType.Main; PlayerDatas.Instance.RefreshProperty(isMainSocket, PlayerDataRefresh.MapID, package.MapID); PlayerDatas.Instance.RefreshProperty(isMainSocket, PlayerDataRefresh.ExAttr3, package.FuncLineID); if (PlayerDatas.Instance.hero != null) { Fight/MapTransferUtility.cs
@@ -818,6 +818,11 @@ public static bool Send_WorldTransfer(int mapId, Vector3 position, MapTransferType type, byte lineID = 255, int _npcId = 0) { if (CrossServerLogin.Instance.IsEnterCrossServerPreparing()) { return false; } if (!AssetSource.sceneFromEditor) { var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(mapId, 0); System/CrossServerOneVsOne/CrossServerOneVsOneArenaWin.cs
@@ -106,6 +106,7 @@ } lookPlayerObj.SetActive(crossServerModel.IsMatching); matchRedPointBeh.gameObject.SetActive(!crossServerModel.IsMatching); } private void UpdateMatchInfo() @@ -142,8 +143,16 @@ private void UpdateLookPlayerTime() { if (!crossServerModel.IsMatching) return; if (!crossServerModel.IsMatching) { if(lookPlayerObj.activeInHierarchy) { matchRedPointBeh.gameObject.SetActive(true); lookPlayerObj.SetActive(false); } return; } if(CrossServerOneVsOnePKSeason.Instance.isSatisfyMatch) { int totalSeconds = Mathf.RoundToInt((float)(DateTime.Now - crossServerModel.matchStartTime).TotalSeconds); System/CrossServerOneVsOne/CrossServerOneVsOnePKSeason.cs
@@ -247,7 +247,7 @@ return true; } } return true; return false; } public bool InPkSeason(DateTime time) System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -48,17 +48,12 @@ protected override void OnPreOpen() { SetDisplay(); SetZoneIDAndSeasonID(); PlayerDatas.Instance.PlayerDataRefreshInfoEvent += UpdatePlayerData; CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo; } protected override void OnActived() { bool isbool = crossServerRewardModel.IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool) { crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询 } } protected override void OnAfterOpen() @@ -227,17 +222,6 @@ rankAward_SelectImg.SetActive(false); seasonAward_SelectImg.SetActive(false); honorStore_SelectImg.SetActive(false); } private void SetZoneIDAndSeasonID()//设置赛区和ID { if (crossServerRewardModel.ZoneID == 0) { crossServerRewardModel.ZoneID = CrossServerOneVsOnePKSeason.Instance.ZoneID; } if (crossServerRewardModel.SeasonID == 0) { crossServerRewardModel.SeasonID = CrossServerOneVsOnePKSeason.Instance.SeasonID; } } } } System/CrossServerOneVsOne/CrossServerRewardModel.cs
@@ -77,6 +77,8 @@ public Redpoint redPointStre2 = new Redpoint(21301, Redpoint_key2); private int MianOpenLV = 0;//跨服按钮开启条件 public string ZoneName = string.Empty;//赛区名 public override void Init() { GetSeasonAward(); @@ -98,11 +100,29 @@ { crossServerModel.UpdatePkResultEvent += UpdatePkResultEvent; CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfoEvent; GetZoneName(); RedPointSeg(); RedPointSea(); bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2) { ViewCrossPKBillboard(CrossServerOneVsOnePKSeason.Instance.ZoneID, CrossServerOneVsOnePKSeason.Instance.SeasonID);//关于赛季查询 } } private void GetZoneName() { for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++) { if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == CrossServerOneVsOnePKSeason.Instance.ZoneID) { ZoneName = UIHelper.ServerStringTrim(CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneName); } } } public override void UnInit() { @@ -126,7 +146,7 @@ private void UpdatePkResultEvent() { if (GameNetSystem.Instance.crossServerConnected_Loigc)//副本结算界面 if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//副本结算界面 { if (WindowCenter.Instance.IsOpen<CrossServerOneVsOneRoundWin>()) { @@ -384,9 +404,14 @@ bool Isbool = false; int Danlv = CrossServerOneVsOnePlayerInfo.Instance.DanLV; bool isbool = IsAwardState(CrossRealmPKAwardStateEnum.SeasonAwardState, -1); int Number = 0; foreach (var key in SeasonRewardDic.AwardDic.Keys) { Number = key; } if (CrossServerOneVsOnePKSeason.Instance.SeasonState == 2 && !isbool) { if ((MyRank > -1 && MyRank < 100) || SeasonRewardConfigDic.ContainsKey(Danlv)) if ((MyRank > -1 && MyRank < Number) || SeasonRewardConfigDic.ContainsKey(Danlv)) { Isbool = true; } System/CrossServerOneVsOne/CrossServerSettlementWin.cs
@@ -47,6 +47,8 @@ #region Built-in CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } } DungeonModel model { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } } PlayerBuffDatas m_BuffModel; PlayerBuffDatas Buffmodel { get { return m_BuffModel ?? (m_BuffModel = ModelCenter.Instance.GetModel<PlayerBuffDatas>()); } } float timer = 0f; protected override void BindController() { @@ -93,7 +95,8 @@ protected override void OnPreClose() { CrossServerRewardModel.SetPkType(); CrossServerRewardModel.SetPkType(); Buffmodel.PkType = CrossServerRewardModel.PkType; } protected override void OnAfterClose() @@ -230,7 +233,6 @@ m_Segment_Txt1.text = config1.Name; var config2 = Config.Instance.Get<CrossServerArenaConfig>(crossServerModel.pkResultInfo.DanLV); m_Segment_Txt2.text = config2.Name; m_SorceText.text = crossServerModel.pkResultInfo.CurScore + "(+" + crossServerModel.pkResultInfo.AddScore + ")"; } else { System/CrossServerOneVsOne/FightingPKWin.cs
@@ -126,11 +126,11 @@ { if (PlayerDatas.Instance.hero.aiHandler.IsAuto()) { m_AutoImg.SetActive(true); m_AutoImg.SetActive(false); } else { m_AutoImg.SetActive(false); m_AutoImg.SetActive(true); } if (WindowCenter.Instance.IsOpen("CrossServerSettlementWin")) { System/CrossServerOneVsOne/RankCellCtrl.cs
@@ -98,6 +98,7 @@ // m_RankWhatTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown); m_SegmentTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown); m_SegmentTxt.color = UIHelper.GetUIColor(TextColType.NavyBrown); m_RankButton.RemoveAllListeners(); } }
@@ -35,6 +35,7 @@ [SerializeField] GameObject m_ClickScreenOtherSpace2; [SerializeField] ScrollerController m_ScrollerController2; [SerializeField] Text m_Text_A; CrossServerOneVsOneModel crossServerModel { get { return ModelCenter.Instance.GetModel<CrossServerOneVsOneModel>(); } } CrossServerRewardModel m_CrossServerRewardModel; CrossServerRewardModel crossServerRewardModel { get { return m_CrossServerRewardModel ?? (m_CrossServerRewardModel = ModelCenter.Instance.GetModel<CrossServerRewardModel>()); } } private int NeedDanLv = 0; @@ -54,8 +55,8 @@ if (config != null) { m_Text_A.text = Language.Get("CrossServer121", config.Name); } } } protected override void AddListeners() @@ -67,7 +68,7 @@ protected override void OnPreOpen() { SetZoneIDAndSeasonID(); ZoneAndSeasonpanel(); m_NumberText.text = CrossServerOneVsOnePKSeason.Instance.SeasonID.ToString(); @@ -119,7 +120,7 @@ } private void UpdatePlayerInfoEvent() { m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString(); SetTextMyRank(); } void OnCreateGridLineCell(ScrollerController gridCtrl) @@ -147,7 +148,7 @@ void OnCreateGridLineCell_Z(ScrollerController gridCtrl)//赛区 { gridCtrl.Refresh(); for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++) for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++) { gridCtrl.AddCell(ScrollerDataType.Header, i); } @@ -156,10 +157,23 @@ void OnCreateGridLineCell_S(ScrollerController gridCtrl)//赛季 { gridCtrl.Refresh(); for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.SeasonID; i++) for (int i = 0; i < CrossServerOneVsOnePKSeason.Instance.ZoneCount; i++) { gridCtrl.AddCell(ScrollerDataType.Header, i); if (CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].ZoneID == crossServerRewardModel.ZoneID) { var list = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[i].SeasonList; for (int j = 0; j < list.Count; j++) { gridCtrl.AddCell(ScrollerDataType.Header, list[j].SeasonID); } } } //for (int i = 1; i <= CrossServerOneVsOnePKSeason.Instance.SeasonID; i++) //{ // gridCtrl.AddCell(ScrollerDataType.Header, i); //} gridCtrl.Restart(); } private void OnRefreshGridCell(ScrollerDataType type, CellView cell) @@ -171,10 +185,24 @@ int Index = cell.index; Button Btn = cell.GetComponent<Button>(); Text txt = cell.transform.Find("Text").GetComponent<Text>(); txt.text = Language.Get("CrossServer_Z4") + Index; if (Index > CrossServerOneVsOnePKSeason.Instance.ZoneCount) { return; } string Name = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[Index].ZoneName; txt.text = UIHelper.ServerStringTrim(Name); int Id = CrossServerOneVsOnePKSeason.Instance.ZoneIDList[Index].ZoneID; Btn.SetListener(() => { crossServerRewardModel.ZoneID = Index; if (crossServerRewardModel.ZoneID == Id) { m_ClickScreenOtherSpace1.SetActive(false); return; } crossServerRewardModel.ZoneID = Id; crossServerRewardModel.ZoneName = UIHelper.ServerStringTrim(Name); crossServerRewardModel.SeasonID = 1; m_ClickScreenOtherSpace1.SetActive(false); crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询 }); @@ -188,6 +216,11 @@ txt.text = Language.Get("CrossServer_Z3") + Index; Btn.SetListener(() => { if (crossServerRewardModel.SeasonID == Index) { m_ClickScreenOtherSpace2.SetActive(false); return; } crossServerRewardModel.SeasonID = Index; m_ClickScreenOtherSpace2.SetActive(false); crossServerRewardModel.ViewCrossPKBillboard(crossServerRewardModel.ZoneID, crossServerRewardModel.SeasonID);//关于赛季查询 @@ -200,24 +233,48 @@ if (CrossServerOneVsOnePKSeason.Instance.ZoneID != crossServerRewardModel.ZoneID) { m_TextMyRank.text = Language.Get("CrossServer122"); m_TextScores.text= Language.Get("CrossServer122"); } else { if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100) if (crossServerRewardModel.SeasonID == CrossServerOneVsOnePKSeason.Instance.SeasonID) { m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString(); m_TextScores.text = CrossServerOneVsOnePlayerInfo.Instance.Score.ToString(); if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100) { m_TextMyRank.text = (crossServerRewardModel.MyRank + 1).ToString(); } else { m_TextMyRank.text = Language.Get("CrossServer123"); } } else { m_TextMyRank.text = Language.Get("CrossServer123"); CrossServerOneVsOneModel.CrossServerOneVsOneHistory history; if (crossServerModel.TryGetOneVsOneHistory(crossServerRewardModel.SeasonID,out history)) { if (history.order > 0 && history.order < 101) { m_TextMyRank.text = history.order.ToString(); } else { m_TextMyRank.text = Language.Get("CrossServer123"); } m_TextScores.text = history.score.ToString(); } } } } private void SetZoneAndSeasonNum() { m_DivisionNameText1.text = Language.Get("CrossServer_Z4") +crossServerRewardModel.ZoneID.ToString(); m_DivisionNameText1.text = crossServerRewardModel.ZoneName; m_DivisionNameText2.text = Language.Get("CrossServer_Z3") + crossServerRewardModel.SeasonID.ToString(); }
@@ -279,7 +279,13 @@ private bool IsOnTheList() { bool Isbool = false; if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100) int Number = 0; var keyList = crossServerRewardModel.SeasonRewardDic.AwardDic.Keys.ToList(); for (int i = 0; i < keyList.Count; i++) { Number = keyList[i]; } if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < Number) { Isbool = true; } System/CrossServerOneVsOne/SeasonRewardWin.cs
@@ -105,7 +105,12 @@ { return Index; } if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < 100)//存在世界排名 int Number = 0; foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys) { Number = key; } if (crossServerRewardModel.MyRank > -1 && crossServerRewardModel.MyRank < Number)//存在世界排名 { int Type = 0; foreach (var key in crossServerRewardModel.SeasonRewardDic.AwardDic.Keys) System/DogzDungeon/DogzDungeonWin.cs
@@ -128,6 +128,7 @@ { var map = Config.Instance.Get<MapConfig>(DogzDungeonModel.DATA_MAPID); var position = new Vector3(map.BornPoints[0].x, 0, map.BornPoints[0].y); MapTransferUtility.Instance.Clear(); MapTransferUtility.Send_WorldTransfer(DogzDungeonModel.DATA_MAPID, position, MapTransferType.WorldTransport, 0, 0); } break; System/FriendSystem/MailPanel.cs
@@ -95,6 +95,7 @@ } DogzModel dogzModel { get { return ModelCenter.Instance.GetModel<DogzModel>(); } } VirtualPackModel virtualPackModel { get { return ModelCenter.Instance.GetModel<VirtualPackModel>(); } } private void Awake() { @@ -629,6 +630,7 @@ int getBagItemCount = 0; int getRuneCount = 0; int getDogzCount = 0; int getSoulCount = 0; ItemConfig tagChinItem = null; for (i = 0; i < mailInfo.Count; i++) { @@ -648,6 +650,11 @@ case (int)ItemType.DogzEquipType4: case (int)ItemType.DogzEquipType5: getDogzCount += 1; break; case GatheringSoulModel.GATHERSOUL_CORE_TYPE: case GatheringSoulModel.GATHERSOUL_ESSENCE_TYPE: case GatheringSoulModel.GATHERSOUL_SOUL_TYPE: getSoulCount += 1; break; default: getBagItemCount += 1; @@ -672,6 +679,11 @@ SysNotifyMgr.Instance.ShowTip("DogzBagFull"); return; } else if(getSoulCount > virtualPackModel.GetPackRemainCount(PackType.rptGatherSoul)) { SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165",PackType.rptGatherSoul); return; } CA53B_tagCMRequestCompensation askRecive = new CA53B_tagCMRequestCompensation(); askRecive.GUID = id; System/GatheringSoul/GatheringSoulModel.cs
@@ -890,7 +890,7 @@ { if (virtualPack.GetPackRemainCount(PackType.rptGatherSoul) < 1) { SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165"); SysNotifyMgr.Instance.ShowTip("GeRen_chenxin_676165", (int)PackType.rptGatherSoul); return; } SendEquipPack((int)PackType.rptInterimPack, item.index, (int)PackType.rptGatherSoul, 0); @@ -1463,16 +1463,16 @@ return; } GatherSoulItem coreItem; if (TryGetItem(coreHole, out coreItem)) if (TryGetItem(coreHole, out coreItem) && SatisfyLevelUp(coreItem, out error)) { if (SatisfyLevelUp(coreItem, out error)) { levelUpRedpointHole = coreHole; levelUpRedpoint.state = RedPointState.Simple; } levelUpRedpointHole = coreHole; levelUpRedpoint.state = RedPointState.Simple; } else { levelUpRedpointHole = -1; var cost = 0; for (int i = 0; i < count; i++) { GatherSoulItem holeItem; @@ -1480,12 +1480,19 @@ { if (SatisfyLevelUp(holeItem, out error)) { levelUpRedpointHole = i; levelUpRedpoint.state = RedPointState.Simple; return; if (RequireLevelUpCost(holeItem) < cost || cost == 0) { cost = RequireLevelUpCost(holeItem); levelUpRedpointHole = i; } } } } if (levelUpRedpointHole != -1) { levelUpRedpoint.state = RedPointState.Simple; } } } #endregion System/MainInterfacePanel/ChatFrame.cs
@@ -131,7 +131,7 @@ private void MailCountChange() { if (GameNetSystem.Instance.crossServerConnected_Loigc) if (PlayerDatas.Instance.baseData.ExAttr5 == 1) { _MailBtn.gameObject.SetActive(false); return; System/MainInterfacePanel/MainInterfaceWin.cs
@@ -798,7 +798,6 @@ void DownButton(GameObject go) { _ExpRate.gameObject.SetActive(true); WindowCenter.Instance.Open<RankingWin>(); } void UpButton(GameObject go) { @@ -1142,7 +1141,7 @@ private void IsShowTaskPanel()//是否显示任务面板 { var inDungeon = IsDungeon(); var IsCrossServerOneVsOne = GameNetSystem.Instance.crossServerConnected_Loigc; var IsCrossServerOneVsOne = PlayerDatas.Instance.baseData.ExAttr5 == 1; if (inDungeon || fairyGrabBossModel.grabBossHintOpen || IsCrossServerOneVsOne) { m_TaskAndTeamTip.SetActive(false); @@ -1270,7 +1269,7 @@ private void IsCrossServerOneVsOne() { if (GameNetSystem.Instance.crossServerConnected_Loigc)//是否再跨服副本中 if (PlayerDatas.Instance.baseData.ExAttr5 == 1)//是否再跨服副本中 { if (!WindowCenter.Instance.IsOpen("FightingPKWin")) { Utility/UIHelper.cs
@@ -693,6 +693,11 @@ Equation.Instance.AddKeyValue("MinAtk", _propertyDict[_key]); Equation.Instance.AddKeyValue("MaxAtk", _propertyDict[_key]); } else if(_key == 24) { Equation.Instance.AddKeyValue("PetMinAtk", _propertyDict[_key]); Equation.Instance.AddKeyValue("PetMaxAtk", _propertyDict[_key]); } else { float attrValue = _propertyDict[_key];
