| Core/GameEngine/Model/Config/CrossServerArenaConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/GameEngine/Model/Config/CrossServerArenaConfig.cs.meta | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/Actor/SelectionManager.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Fight/GameActor/GActorNpcNoFight.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/GatheringSoul/GatherSoulMatItem.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/KingThreeDimensionsBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/KingTreasureWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureBaseWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Treasure/TreasureLevelUpWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/UIHelper.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Config/CrossServerArenaConfig.cs
@@ -1,6 +1,6 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Thursday, December 20, 2018 // [ Date ]: Thursday, December 27, 2018 //-------------------------------------------------------- using UnityEngine; @@ -13,6 +13,7 @@ public int DanLV { get ; private set ; } public string Name { get ; private set; } public int DanType { get ; private set ; } public string IconKey { get ; private set; } public int LVUpScore { get ; private set ; } public string DanLVAwardList { get ; private set; } @@ -30,13 +31,15 @@ Name = rawContents[1].Trim(); IconKey = rawContents[2].Trim(); DanType=IsNumeric(rawContents[2]) ? int.Parse(rawContents[2]):0; LVUpScore=IsNumeric(rawContents[3]) ? int.Parse(rawContents[3]):0; IconKey = rawContents[3].Trim(); DanLVAwardList = rawContents[4].Trim(); LVUpScore=IsNumeric(rawContents[4]) ? int.Parse(rawContents[4]):0; SeasonAwardList = rawContents[5].Trim(); DanLVAwardList = rawContents[5].Trim(); SeasonAwardList = rawContents[6].Trim(); } catch (Exception ex) { Core/GameEngine/Model/Config/CrossServerArenaConfig.cs.meta
@@ -1,6 +1,6 @@ fileFormatVersion: 2 guid: f10a2faba8659904ab5c13d1a770a7e2 timeCreated: 1545293132 timeCreated: 1545893867 licenseType: Pro MonoImporter: serializedVersion: 2 Core/NetworkPackage/DTCFile/ServerPack/H01_System/DTC0109_tagServerPrepareOK.cs
@@ -32,7 +32,7 @@ switch (vNetData.socketType) { case GameNetSystem.SocketType.Main: if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr1 == 1) if (loginModel.reconnectBackGround || PlayerDatas.Instance.baseData.ExAttr5 == 1) { var mapOk = new C0107_tagCInitMapOK(); mapOk.MapID = PlayerDatas.Instance.baseData.MapID; Fight/Actor/SelectionManager.cs
@@ -206,14 +206,20 @@ switch (type) { case E_Type.Red: s_Red.transform.SetParent(null); s_Red.transform.localScale = Vector3.one; s_Red.transform.position = Constants.Special_Hide_Position; if (s_Red) { s_Red.transform.SetParent(null); s_Red.transform.localScale = Vector3.one; s_Red.transform.position = Constants.Special_Hide_Position; } break; case E_Type.Green: s_Green.transform.SetParent(null); s_Green.transform.localScale = Vector3.one; s_Green.transform.position = Constants.Special_Hide_Position; if (s_Green) { s_Green.transform.SetParent(null); s_Green.transform.localScale = Vector3.one; s_Green.transform.position = Constants.Special_Hide_Position; } break; }
@@ -100,14 +100,17 @@ GameObject _prefab = InstanceResourcesLoader.LoadNpc(NpcConfig.NPCID); GameObjectPoolManager.Instance.ReleaseGameObject(_prefab, m_Model); if (NpcConfig.MODE.Contains("A_Zs") || NpcConfig.MODE.Contains("A_Fs")) if (m_Model) { var _renderer = m_Model.GetComponentInChildren<SkinnedMeshRenderer>(); if (_renderer) if (NpcConfig.MODE.Contains("A_Zs") || NpcConfig.MODE.Contains("A_Fs")) { MaterialLoader.Release(_renderer.material); _renderer.material = _renderer.sharedMaterial = null; _renderer.materials = _renderer.sharedMaterials = new Material[0]; var _renderer = m_Model.GetComponentInChildren<SkinnedMeshRenderer>(); if (_renderer) { MaterialLoader.Release(_renderer.material); _renderer.material = _renderer.sharedMaterial = null; _renderer.materials = _renderer.sharedMaterials = new Material[0]; } } } } System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -97,6 +97,7 @@ { var arenaConfig = Config.Instance.Get<CrossServerArenaConfig>(playerInfo.DanLV); rankText.text = arenaConfig.Name; rankText.color = UIHelper.GetDanLVColor(playerInfo.DanLV); rankImg.SetSprite(arenaConfig.IconKey); }
@@ -25,6 +25,29 @@ int moneyType = 0; int require = 0; private void OnEnable() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent += PlayerDataRefreshInfoEvent; } private void OnDisable() { PlayerDatas.Instance.PlayerDataRefreshInfoEvent -= PlayerDataRefreshInfoEvent; } private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType) { if (refreshType == PlayerDataRefresh.CDBPlayerRefresh_SoulCore || refreshType == PlayerDataRefresh.CDBPlayerRefresh_SoulDust || refreshType == PlayerDataRefresh.CDBPlayerRefresh_SoulSplinters) { if (this.moneyType != 0) { Display(moneyType, this.require); } } } public void Display(int moneyType, int require = 0) { this.moneyType = moneyType; System/Treasure/KingThreeDimensionsBehaviour.cs
@@ -66,6 +66,7 @@ if (divisionConfig != null) { m_Division.text = divisionConfig.Name; m_Division.color = UIHelper.GetDanLVColor(history.division); } m_Score.gameObject.SetActive(true); m_Score.text = Language.Get("KingTreasureScore", model.GetSeasonScore(treasureId)); System/Treasure/KingTreasureWin.cs
@@ -154,6 +154,7 @@ { m_DivisionIcon.SetSprite(divisionConfig.IconKey); m_Division.text = divisionConfig.Name; m_Division.color = UIHelper.GetDanLVColor(history.division); } KingTreasureModel.Division division; if (kingTreasureModel.TryGetDivision(model.selectedTreasure, history.rewardLevel, out division)) System/Treasure/TreasureBaseWin.cs
@@ -247,6 +247,20 @@ private void Back() { var childrens = WindowConfig.Get().FindChildWindows("TreasureBaseWin"); bool existAnyChildWindow = false; foreach (var window in childrens) { if (WindowCenter.Instance.IsOpen(window)) { existAnyChildWindow = true; break; } } if (!existAnyChildWindow) { return; } var returnCode = 0; if (allowBack != null) { System/Treasure/TreasureLevelUpWin.cs
@@ -419,6 +419,11 @@ { return 1; } if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 13) { return 1; } return 0; }
@@ -432,6 +432,48 @@ public static readonly Color s_LightYellow = new Color32(255, 244, 205, 255); //fff4cd public static readonly Color s_Gray = new Color32(204, 204, 204, 255); public static readonly Color s_BrightDanLV0 = new Color32(102,102,102,255); //666666 public static readonly Color s_BrightDanLV1 = new Color32(148, 96, 255, 255); //9460ff public static readonly Color s_BrightDanLV2 = new Color32(0, 102, 255, 255); //0066ff public static readonly Color s_BrightDanLV3 = new Color32(0, 179, 55, 255); //00b337 public static readonly Color s_BrightDanLV4 = new Color32(255, 102, 0, 255); //ff6600 public static readonly Color s_BrightDanLV5 = new Color32(255, 0, 0, 255); //ff0000 public static readonly Color s_BrightDanLV6 = new Color32(255, 0, 246, 255); //ff00f6 public static readonly Color s_GrayDanLV0 = new Color32(221,221, 221, 255); //dddddd public static readonly Color s_GrayDanLV1 = new Color32(121,153, 255, 255); //7999ff public static readonly Color s_GrayDanLV2 = new Color32(0, 198, 255, 255); //00c6ff public static readonly Color s_GrayDanLV3 = new Color32(102, 255, 0, 255); //66ff00 public static readonly Color s_GrayDanLV4 = new Color32(255, 144, 0, 255); //ff9000 public static readonly Color s_GrayDanLV5 = new Color32(255, 0, 0, 255); //ff0000 public static readonly Color s_GrayDanLV6 = new Color32(240, 0, 255, 255); //f000ff public static Color GetDanLVColor(int danLv,bool bright = false) { var crossDanLVConfig = Config.Instance.Get<CrossServerArenaConfig>(danLv); if(crossDanLVConfig != null) { switch (crossDanLVConfig.DanType) { case 0: return bright ? s_BrightDanLV0 : s_GrayDanLV0; case 1: return bright ? s_BrightDanLV1 : s_GrayDanLV1; case 2: return bright ? s_BrightDanLV2 : s_GrayDanLV2; case 3: return bright ? s_BrightDanLV3 : s_GrayDanLV3; case 4: return bright ? s_BrightDanLV4 : s_GrayDanLV4; case 5: return bright ? s_BrightDanLV5 : s_GrayDanLV5; case 6: return bright ? s_BrightDanLV6 : s_GrayDanLV6; } } return Color.white; } public static Color GetUIColor(int itemColor, bool bright = false) { switch (itemColor) @@ -490,6 +532,7 @@ } return bright ? s_BrightWhiteColor : s_DarkWhiteColor; } private static Regex m_TextColorRegex = new Regex("<color=#[0-9a-zA-Z]+>(.*)</color>", RegexOptions.Singleline); public static string AppendStringColor(TextColType type, string msg, bool bright = false)
