Core/GameEngine/Login/Launch.cs
@@ -295,7 +295,6 @@ AssetBundleUtility.Instance.InitBuiltInAsset(); } Config.Instance.RegisterGlobalEvent(); Config.Instance.PreLoadConfigs(); WindowCenter.Instance.DestoryWinsByStage(WindowCenter.WindowStage.Launch); AssetBundleUtility.Instance.UnloadAssetBundle("builtin/prefabs", true, false); Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs
File was deleted Core/GameEngine/Model/Config/CrossRealmPKDanAwardConfig.cs.meta
File was deleted Core/GameEngine/Model/ConfigManager.cs
@@ -20,57 +20,6 @@ private set { m_Inited = value; } } public IEnumerator Co_LoadConfigs() { while (!AllCompleted()) { var completedCount = 0; for (int i = 0; i < configTasks.Count; i++) { var task = configTasks[i]; if (task.state == TaskState.ParseSuccess) { completedCount++; } } var allowTaskCount = completedCount <= 8 ? GetMinWorkingTaskCount() : GetMaxWorkingTaskCount(); var workingCount = 0; for (int i = 0; i < configTasks.Count; i++) { var task = configTasks[i]; if (task.state > TaskState.None && task.state < TaskState.ParseSuccess) { workingCount++; } } if (workingCount < allowTaskCount) { var leisureCount = allowTaskCount - workingCount; var startedTasksCount = 0; for (int i = 0; i < configTasks.Count; i++) { var task = configTasks[i]; if (task.state == TaskState.None) { StartAsyncTask(task); startedTasksCount++; } if (startedTasksCount >= leisureCount) { break; } } } yield return null; } } public void SyncLoadConfigs() { } Lua/Gen.meta
File was deleted Lua/Gen/DelegatesGensBridge.cs
File was deleted Lua/Gen/LoginRewardModelWrap.cs
File was deleted Lua/Gen/LuaWindowUtilityWrap.cs
File was deleted Lua/Gen/LuaWindowUtilityWrap.cs.meta
File was deleted Lua/Gen/SnxxzUIFestivalRedpackModelWrap.cs
File was deleted Lua/Gen/SnxxzUIImpactRankModelWrap.cs
File was deleted Lua/Gen/SnxxzUILuckyTreasureModelWrap.cs
File was deleted Lua/Gen/SnxxzUILuckyTreasureModelWrap.cs.meta
File was deleted Lua/Gen/SnxxzUIOperationTimeHeplerWrap.cs
File was deleted Lua/Gen/SnxxzUIWindowCenterWrap.cs
File was deleted Lua/Gen/SnxxzUIWindowCenterWrap.cs.meta
File was deleted Lua/Gen/XLuaGenAutoRegister.cs
File was deleted Lua/Gen/XLuaGenAutoRegister.cs.meta
File was deleted Lua/Gen/link.xml
File was deleted System/CrossServerOneVsOne/CrossServerOneVsOnePlayerInfo.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using TableConfig; namespace Snxxz.UI { @@ -75,8 +74,8 @@ public bool TryGetMaxRank(out int upScore) { upScore = 0; var preArenaConfig = Config.Instance.Get<CrossServerArenaConfig>(DanLV - 1); var arenaConfig = Config.Instance.Get<CrossServerArenaConfig>(DanLV); var preArenaConfig = CrossServerArenaConfig.Get(DanLV - 1); var arenaConfig = CrossServerArenaConfig.Get(DanLV); if (arenaConfig != null && arenaConfig.LVUpScore > 0) { if(preArenaConfig != null) System/CrossServerOneVsOne/CrossServerOneVsOneRewardModel.cs
@@ -4,7 +4,6 @@ //-------------------------------------------------------- using System; using System.Collections.Generic; using TableConfig; using Snxxz.UI; //跨服PK奖励信息 [XLua.LuaCallCSharp] @@ -86,7 +85,7 @@ { GetSeasonAward(); GetSegmentReward(); var config = Config.Instance.Get<FuncConfigConfig>("CrossServerIcon").Numerical1; var config = FuncConfigConfig.Get("CrossServerIcon").Numerical1; MianOpenLV = int.Parse(config); } @@ -176,7 +175,7 @@ { SeasonAwardClass seasonAwardClass = new SeasonAwardClass(); seasonAwardClass.DanLv = _config.DanLV; var crossServerArena = Config.Instance.Get<CrossServerArenaConfig>(_config.DanLV); var crossServerArena = CrossServerArenaConfig.Get(_config.DanLV); if (crossServerArena != null) { seasonAwardClass.Name = crossServerArena.Name; @@ -203,7 +202,7 @@ } private void GetSegmentReward() { var CrossRealmPKAward = Config.Instance.Get<FuncConfigConfig>("CrossRealmPKAward"); var CrossRealmPKAward = FuncConfigConfig.Get("CrossRealmPKAward"); ImpactRankModel.RankAwardItem _award = new ImpactRankModel.RankAwardItem(); var _jsonData = LitJson.JsonMapper.ToObject(CrossRealmPKAward.Numerical3); foreach (string key in _jsonData.Keys) System/CrossServerOneVsOne/CrossServerOneVsOneWin.cs
@@ -140,7 +140,7 @@ danLvUpObj.SetActive(!isMaxRank); if (!isMaxRank) { var preUpScore = Config.Instance.Get<CrossServerArenaConfig>(playerInfo.DanLV - 1); var preUpScore = CrossServerArenaConfig.Get(playerInfo.DanLV - 1); int curScore = playerInfo.Score; if(preUpScore != null) { System/LoginAd/LoginAdModel.cs
@@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; using TableConfig; using UnityEngine; namespace Snxxz.UI { @@ -149,7 +148,7 @@ public void Goto(int _id) { var config = Config.Instance.Get<LoginAdConfig>(_id); var config = LoginAdConfig.Get(_id); if (config != null) { WindowJumpMgr.Instance.WindowJumpTo((JumpUIType)config.jump); System/OpenServerActivity/EntryInformationCell.cs
@@ -1,30 +1,29 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, December 10, 2018 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; using TableConfig; namespace Snxxz.UI { [XLua.Hotfix] public class EntryInformationCell:MonoBehaviour { [SerializeField] ItemCell m_ItemCell; [SerializeField] Text m_Text1; [SerializeField] Text m_Text2; [SerializeField] Button m_Btn; //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Monday, December 10, 2018 //-------------------------------------------------------- using UnityEngine; using System.Collections; using UnityEngine.UI; namespace Snxxz.UI { [XLua.Hotfix] public class EntryInformationCell:MonoBehaviour { [SerializeField] ItemCell m_ItemCell; [SerializeField] Text m_Text1; [SerializeField] Text m_Text2; [SerializeField] Button m_Btn; [SerializeField] Text m_BtnText; [SerializeField] GameObject m_Miss;//错过 [SerializeField] GameObject m_Reach;//未达成 [SerializeField] GameObject m_Draw;//已领取 LoginRewardModel m_LoginRewardModel; LoginRewardModel m_LoginRewardModel; LoginRewardModel loginRewardModel { get { return m_LoginRewardModel ?? (m_LoginRewardModel = ModelCenter.Instance.GetModel<LoginRewardModel>()); } } ItemTipsModel m_itemTipsModel; ItemTipsModel itemTipsModel { get { return m_itemTipsModel ?? (m_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } ItemTipsModel itemTipsModel { get { return m_itemTipsModel ?? (m_itemTipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>()); } } public void GetDisplayInformation(int id) { var config = Config.Instance.Get<LoginRewardConfig>(id); var config = LoginRewardConfig.Get(id); if (config == null) { DebugEx.LogError("登录奖励表没有此ID"+id); @@ -183,7 +182,7 @@ var loginAward = loginRewardModel.LoginAwardDic[ID]; int rewardNum = loginRewardModel.GetRewardNumber(loginRewardModel.SelectedNow, ID);//已领奖次数 int carryOutNum = loginRewardModel.GetCarryOutNum(loginRewardModel.SelectedNow, ID);//已完成次数 var config = Config.Instance.Get<HolidayHomingConfig>(ID); var config = HolidayHomingConfig.Get(ID); if (config != null && config.SpecialDisplayType == 1) { @@ -213,10 +212,10 @@ str = type + "/" + loginAward.SingleTimes; } return str; } } } } } }
@@ -8,7 +8,7 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; using TableConfig; namespace Snxxz.UI { public class ImpactRankWin : Window @@ -250,7 +250,7 @@ m_TotalTargetValue.gameObject.SetActive(!_hasData); if (_hasData && _playerData.value >= 0) { var _realmConfig = Config.Instance.Get<RealmConfig>(_playerData.value); var _realmConfig = RealmConfig.Get(_playerData.value); m_TargetImg.SetSprite(_realmConfig == null ? string.Empty : _realmConfig.Img); m_TargetImg.SetNativeSize(); } @@ -384,13 +384,13 @@ { if (_billRankCfg.RankA == _billRankCfg.RankB) { var _realmCfg = Config.Instance.Get<RealmConfig>(_condition.limit); var _realmCfg = RealmConfig.Get(_condition.limit); _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Single_", model.presentSelectType), _billRankCfg.RankA, _realmCfg != null ? _realmCfg.Name : string.Empty); } else { var _realmCfg = Config.Instance.Get<RealmConfig>(_condition.limit); var _realmCfg = RealmConfig.Get(_condition.limit); _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Double_", model.presentSelectType), _billRankCfg.RankA, _billRankCfg.RankB, _realmCfg != null ? _realmCfg.Name : string.Empty); } @@ -398,7 +398,7 @@ break; case ImpactRankModel.ImpactRankAwardType.Target: { var _realmCfg = Config.Instance.Get<RealmConfig>(_billTagCfg.Condition); var _realmCfg = RealmConfig.Get(_billTagCfg.Condition); _tip = Language.Get(StringUtility.Contact("ImpactRankCellType_Target_", model.presentSelectType), _realmCfg != null ? _realmCfg.Name : string.Empty); } System/OpenServerActivity/LoginRewardWin.cs
@@ -1,66 +1,65 @@ //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, December 07, 2018 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using TableConfig; using UnityEngine; using UnityEngine.UI; //-------------------------------------------------------- // [Author]: 第二世界 // [ Date ]: Friday, December 07, 2018 //-------------------------------------------------------- using System; using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.UI; namespace Snxxz.UI { [XLua.Hotfix] public class LoginRewardWin : Window { //登录奖励 #region Built-in { [XLua.Hotfix] public class LoginRewardWin : Window { //登录奖励 #region Built-in [SerializeField] ScrollerController m_ScrollerController_1; [SerializeField] ScrollerController m_ScrollerController_2; LoginRewardModel m_LoginRewardModel; LoginRewardModel m_LoginRewardModel; LoginRewardModel loginRewardModel { get { return m_LoginRewardModel ?? (m_LoginRewardModel = ModelCenter.Instance.GetModel<LoginRewardModel>()); } } List<int> SortList = new List<int>(); protected override void BindController() protected override void BindController() { m_ScrollerController_1.OnRefreshCell += OnRefreshGridCell_1; m_ScrollerController_2.OnRefreshCell += OnRefreshGridCell_2; } protected override void AddListeners() { } protected override void OnPreOpen() { m_ScrollerController_2.OnRefreshCell += OnRefreshGridCell_2; } protected override void AddListeners() { } protected override void OnPreOpen() { ChooseDay(); OnCreateGridLineCell_1(m_ScrollerController_1); OnCreateGridLineCell_2(m_ScrollerController_2); OnCreateGridLineCell_2(m_ScrollerController_2); if (loginRewardModel.SelectedNow >= 3) { m_ScrollerController_1.JumpIndex(loginRewardModel.SelectedNow); } } protected override void OnAfterOpen() } } protected override void OnAfterOpen() { OperationTimeHepler.Instance.operationStartEvent += OperationStartEvent; OperationTimeHepler.Instance.dayResetEvent += DayResetEvent; loginRewardModel.LoginAwardInfoUpdate += LoginAwardInfoUpdate; } protected override void OnPreClose() { } protected override void OnAfterClose() OperationTimeHepler.Instance.dayResetEvent += DayResetEvent; loginRewardModel.LoginAwardInfoUpdate += LoginAwardInfoUpdate; } protected override void OnPreClose() { } protected override void OnAfterClose() { OperationTimeHepler.Instance.operationStartEvent -= OperationStartEvent; OperationTimeHepler.Instance.dayResetEvent -= DayResetEvent; loginRewardModel.LoginAwardInfoUpdate -= LoginAwardInfoUpdate; loginRewardModel.LoginAwardInfoUpdate -= LoginAwardInfoUpdate; } private void OperationStartEvent(Operation arg1, int arg2) @@ -89,7 +88,7 @@ m_ScrollerController_1.m_Scorller.RefreshActiveCellViews(); m_ScrollerController_2.m_Scorller.RefreshActiveCellViews(); } #endregion #endregion void OnCreateGridLineCell_1(ScrollerController gridCtrl) { gridCtrl.Refresh(); @@ -98,7 +97,7 @@ gridCtrl.AddCell(ScrollerDataType.Header, key); } gridCtrl.Restart(); } } private void OnRefreshGridCell_1(ScrollerDataType type, CellView cell) { int Index = cell.index; @@ -129,7 +128,7 @@ int Index = cell.index; EntryInformationCell entryInformationCell = cell.GetComponent<EntryInformationCell>(); entryInformationCell.GetDisplayInformation(Index); } } public void ChooseDay()//选择天 { foreach (var key in loginRewardModel.RedPointDic.Keys)//红点选择可领取的天 @@ -141,8 +140,8 @@ } } loginRewardModel.SelectedNow = loginRewardModel.DayNow; } } private void ToAddSorting() { SortList.Clear(); @@ -244,17 +243,17 @@ private int SizeId(int ID) { int index = 1; var config = Config.Instance.Get<LoginRewardConfig>(ID); var config = LoginRewardConfig.Get(ID); if (config != null) { index = config.order; } return index; } } } } } }
@@ -3,7 +3,6 @@ using EnhancedUI.EnhancedScroller; using System; using System.Collections.Generic; using TableConfig; namespace Snxxz.UI @@ -22,7 +21,7 @@ string treasureDes = string.Empty; if(luckyItem != null) { var itemConfig = Config.Instance.Get<ItemConfig>(luckyItem.itemId); var itemConfig = ItemConfig.Get(luckyItem.itemId); treasureDes = StringUtility.Contact(itemConfig,"x",luckyItem.itemCount); treasureDes = UIHelper.AppendStringColor(itemConfig.ItemColor,treasureDes); } System/OpenServerActivity/LuckyTreasureModel.cs
@@ -2,7 +2,6 @@ using System.Collections.Generic; using System.Linq; using System.Text; using TableConfig; namespace Snxxz.UI { @@ -119,7 +118,7 @@ public int luckyTreasurePoint { get; private set; } public void ParseFuncConfig() { var luckyAppraisal = Config.Instance.Get<FuncConfigConfig>("LuckyAppraisal"); var luckyAppraisal = FuncConfigConfig.Get("LuckyAppraisal"); luckyTreasurePrice = int.Parse(luckyAppraisal.Numerical1); luckyTreasurePoint = int.Parse(luckyAppraisal.Numerical2); } System/Treasure/TreasurePotentialPanel.cs
@@ -6,7 +6,6 @@ using System.Collections; using UnityEngine.UI; using System; using TableConfig; using Snxxz.UI; namespace Snxxz.UI @@ -94,7 +93,7 @@ DisplayPotentialEffect(); var potential = m_Treasure.GetPotential(selectedPotential); var config = Config.Instance.Get<SkillConfig>(potential.id); var config = SkillConfig.Get(potential.id); var level = potential.level; var isMax = level >= config.SkillMaxLV; @@ -206,7 +205,7 @@ model.selectedPotentialBook = 0; var level = m_Treasure.potentials[_index].level; var config = Config.Instance.Get<SkillConfig>(m_Treasure.potentials[_index].id); var config = SkillConfig.Get(m_Treasure.potentials[_index].id); var isMax = level >= config.SkillMaxLV; if (!isMax) { @@ -220,7 +219,7 @@ model.potentialLevelUpdate -= PotentialLevelUpdate; model.potentialLevelUpdate += PotentialLevelUpdate; var _stageSkillCfg = Config.Instance.Get<SkillConfig>(m_Treasure.unlockSkill); var _stageSkillCfg = SkillConfig.Get(m_Treasure.unlockSkill); if (_stageSkillCfg != null) { m_StageSkillIcon.SetSprite(_stageSkillCfg.IconName); @@ -228,7 +227,7 @@ } m_ContainerLock.gameObject.SetActive(!FuncOpen.Instance.IsFuncOpen(82)); var funcOpenConfig = Config.Instance.Get<FuncOpenLVConfig>(82); var funcOpenConfig = FuncOpenLVConfig.Get(82); m_PotentialLimit.text = Language.Get("TreasureSkillLimit", funcOpenConfig.LimitLV); m_PotentialEffectScroll.verticalNormalizedPosition = 1f; @@ -323,7 +322,7 @@ var _nextPotential = GetNextPotential(potential.id); if (_nextPotential != 0) { var config = Config.Instance.Get<SkillConfig>(_nextPotential); var config = SkillConfig.Get(_nextPotential); if (level == config.LearnSkillLV && potentialBriefInfos != null) { for (int i = 0; i < potentialBriefInfos.Length; i++) @@ -409,7 +408,7 @@ { if (AchievementGoto.guideAchievementId != 0 && m_Treasure != null) { var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId); var config = SuccessConfig.Get(AchievementGoto.guideAchievementId); if (config != null && config.Type == 91) { var index = PlayerDatas.Instance.baseData.Job - 1; @@ -423,10 +422,10 @@ } else { var skillConfig = Config.Instance.Get<SkillConfig>(potential.id); var skillConfig = SkillConfig.Get(potential.id); if (skillConfig.LearnSkillReq > 0 && skillConfig.LearnSkillLV > 0) { var preskillConfig = Config.Instance.Get<SkillConfig>(skillConfig.LearnSkillReq); var preskillConfig = SkillConfig.Get(skillConfig.LearnSkillReq); SysNotifyMgr.Instance.ShowTip("TreasurePotentialSelectError", preskillConfig.SkillName, skillConfig.LearnSkillLV, skillConfig.SkillName); } } @@ -486,7 +485,7 @@ var potential = m_Treasure.GetPotential(selectedPotential); var level = potential.level; var config = Config.Instance.Get<SkillConfig>(potential.id); var config = SkillConfig.Get(potential.id); if (level <= 0) { m_CurrentPotential.text = Language.Get("Hallows_NotLearn"); @@ -494,7 +493,7 @@ } else { var currentConfig = Config.Instance.Get<SkillConfig>(potential.id + level - 1); var currentConfig = SkillConfig.Get(potential.id + level - 1); m_CurrentPotential.text = currentConfig.Description; m_CurrentProperty.gameObject.SetActive(true); m_CurrentProperty.DisplayUpper(6, currentConfig.MP); @@ -505,9 +504,9 @@ m_ContainerNextProperty.gameObject.SetActive(!isMax); if (!isMax) { var nextConfig = Config.Instance.Get<SkillConfig>(potential.id + level); var nextConfig = SkillConfig.Get(potential.id + level); m_NextPotential.text = nextConfig.Description; var currentConfig = Config.Instance.Get<SkillConfig>(potential.id + level - 1); var currentConfig = SkillConfig.Get(potential.id + level - 1); var currentPropertyValue = 0; if (currentConfig != null) { @@ -521,7 +520,7 @@ if (targetLevel != 0) { m_TargetPotentialTitle.text = Language.Get("TargetPotentialLevelEffect", targetLevel); var targetConfig = Config.Instance.Get<SkillConfig>(potential.id + targetLevel - 1); var targetConfig = SkillConfig.Get(potential.id + targetLevel - 1); m_TargetPotential.text = targetConfig.Description; m_TargetProperty.DisplayUpper(6, targetConfig.MP); } @@ -549,7 +548,7 @@ m_ContainerTotalEffect.gameObject.SetActive(true); m_SkillTitle.text = Language.Get("PotentialSkill"); var config = Config.Instance.Get<SkillConfig>(m_Treasure.unlockSkill); var config = SkillConfig.Get(m_Treasure.unlockSkill); if (config != null) { m_SkillIcon.SetSprite(config.IconName); @@ -583,7 +582,7 @@ } var levelUpType = model.GetSkillLevelUpType(potential.id); var levelupId = TreasureModel.GetSkillLevelUpId(levelUpType, potential.level + 1); var config = Config.Instance.Get<TreasureSkillConfig>(levelupId); var config = TreasureSkillConfig.Get(levelupId); if (config == null) { return; @@ -611,7 +610,7 @@ var potential = m_Treasure.GetPotential(selectedPotential); var levelUpType = model.GetSkillLevelUpType(potential.id); var levelupId = TreasureModel.GetSkillLevelUpId(levelUpType, potential.level + 1); var config = Config.Instance.Get<TreasureSkillConfig>(levelupId); var config = TreasureSkillConfig.Get(levelupId); var spOwn = PlayerDatas.Instance.baseData.treasurePotentialSp; spNeed = config.MeterialNum1; m_SPOwn.text = UIHelper.ReplaceLargeNum(spOwn); @@ -622,12 +621,12 @@ private void DisplayGetSkill(bool _levelUp = false) { var potential = m_Treasure.GetPotential(selectedPotential); var config = Config.Instance.Get<SkillConfig>(potential.id); var config = SkillConfig.Get(potential.id); int[] _getSkillArray; if (model.TryGetPotentialGetSkill(config.SkillTypeID, out _getSkillArray)) { m_ContainerGetSkill.gameObject.SetActive(true); var _getSkillCfg = Config.Instance.Get<SkillConfig>(_getSkillArray[1]); var _getSkillCfg = SkillConfig.Get(_getSkillArray[1]); m_GetSkillIcon.SetSprite(_getSkillCfg.IconName); m_GetSkillIcon.material = potential.level >= _getSkillArray[0] ? MaterialUtility.GetUIDefaultGraphicMaterial() : MaterialUtility.GetInstantiatedSpriteGrayMaterial(); @@ -736,7 +735,7 @@ private void RefreshItemCountAct(PackType packType, int arg2, int _id) { var config = Config.Instance.Get<ItemConfig>(_id); var config = ItemConfig.Get(_id); if (packType == PackType.rptItem && config != null && config.Type == 6) { var levelUpConfig = GetPotentialLevelUpConfig(); @@ -760,7 +759,7 @@ var error = 0; if (!TestPotentialLevelUp(out error)) { var skillConfig = Config.Instance.Get<SkillConfig>(selectedPotential); var skillConfig = SkillConfig.Get(selectedPotential); switch (error) { case 1: @@ -769,7 +768,7 @@ case 2: if (skillConfig.LearnSkillReq > 0) { var preSkillConfig = Config.Instance.Get<SkillConfig>(skillConfig.LearnSkillReq); var preSkillConfig = SkillConfig.Get(skillConfig.LearnSkillReq); ServerTipDetails.DisplayNormalTip(Language.Get("Hallows_NeedSkillLV", preSkillConfig.SkillName, skillConfig.LearnSkillLV)); } break; @@ -834,7 +833,7 @@ var potential = m_Treasure.GetPotential(selectedPotential); var levelUpType = model.GetSkillLevelUpType(potential.id); var levelupId = TreasureModel.GetSkillLevelUpId(levelUpType, potential.level + 1); var config = Config.Instance.Get<TreasureSkillConfig>(levelupId); var config = TreasureSkillConfig.Get(levelupId); if (config == null) { return new PotentialLevelUpConfig(0, 0, 0, 0, 0); @@ -872,7 +871,7 @@ var potential = m_Treasure.GetPotential(selectedPotential); var levelUpType = model.GetSkillLevelUpType(potential.id); var levelupId = TreasureModel.GetSkillLevelUpId(levelUpType, potential.level + 1); var config = Config.Instance.Get<TreasureSkillConfig>(levelupId); var config = TreasureSkillConfig.Get(levelupId); if (config == null) { return false; @@ -896,7 +895,7 @@ { continue; } var skillConfig = Config.Instance.Get<SkillConfig>(potential.id); var skillConfig = SkillConfig.Get(potential.id); if (skillConfig.LearnSkillReq == _potentialId) { return potential.id; @@ -918,15 +917,15 @@ var nextPotential = GetNextPotential(potential.id); if (nextPotential != 0) { var config = Config.Instance.Get<SkillConfig>(nextPotential); var config = SkillConfig.Get(nextPotential); if (potential.level == config.LearnSkillLV && potentialBriefInfos != null) { for (int i = 0; i < potentialBriefInfos.Length; i++) { if (potentialBriefInfos[i].potential.id == nextPotential) { var current = Config.Instance.Get<SkillConfig>(potential.id + potential.level - 1); var before = Config.Instance.Get<SkillConfig>(potential.id + potential.level - 2); var current = SkillConfig.Get(potential.id + potential.level - 1); var before = SkillConfig.Get(potential.id + potential.level - 2); ModifyPowerUp(m_Treasure.id, i, current.FightPower - before.FightPower); } } @@ -942,7 +941,7 @@ AutoSelectPotentialBook(); } var curconfig = Config.Instance.Get<SkillConfig>(potential.id); var curconfig = SkillConfig.Get(potential.id); var level = potential.level; var isMax = level >= curconfig.SkillMaxLV; @@ -971,7 +970,7 @@ { DisplayPotentialEffect(); var potential = m_Treasure.GetPotential(selectedPotential); var config = Config.Instance.Get<SkillConfig>(potential.id); var config = SkillConfig.Get(potential.id); var level = potential.level; var isMax = level >= config.SkillMaxLV; @@ -1043,7 +1042,7 @@ return false; } var skillConfig = Config.Instance.Get<SkillConfig>(selectedPotential); var skillConfig = SkillConfig.Get(selectedPotential); if (PlayerDatas.Instance.baseData.LV < skillConfig.LearnLVReq) { _error = 1; @@ -1052,7 +1051,7 @@ if (skillConfig.LearnSkillReq > 0) { var preSkillConfig = Config.Instance.Get<SkillConfig>(selectedPotential); var preSkillConfig = SkillConfig.Get(selectedPotential); var preSkillLevelRequirement = skillConfig.LearnSkillLV; var preSkill = PlayerDatas.Instance.skill.GetSkillBySkillTypeID(skillConfig.LearnSkillReq); var preSkillLevel = preSkill == null ? 0 : preSkill.level; @@ -1104,7 +1103,7 @@ { if (AchievementGoto.guideAchievementId != 0) { var config = Config.Instance.Get<SuccessConfig>(AchievementGoto.guideAchievementId); var config = SuccessConfig.Get(AchievementGoto.guideAchievementId); var condition = config.Type == 91 && config.Condition[0] == model.selectedPotential; if (condition) @@ -1155,7 +1154,7 @@ var model = ModelCenter.Instance.GetModel<TreasureModel>(); var level = potential.level; var potentialConifg = Config.Instance.Get<SkillConfig>(potential.id); var potentialConifg = SkillConfig.Get(potential.id); int[] _getskillArray; m_GetSkillName.gameObject.SetActive(false); @@ -1163,7 +1162,7 @@ m_GetSkillCondition.gameObject.SetActive(false); if (model.TryGetPotentialGetSkill(potentialConifg.SkillTypeID, out _getskillArray)) { var _getSkillCfg = Config.Instance.Get<SkillConfig>(_getskillArray[1]); var _getSkillCfg = SkillConfig.Get(_getskillArray[1]); m_GetSkillName.text = _getSkillCfg.SkillName; m_GetSkillEffect.text = _getSkillCfg.Description; m_GetSkillName.gameObject.SetActive(true); @@ -1182,11 +1181,11 @@ m_Name.text = potentialConifg.SkillName; if (!model.IsPotentialUnlock(treasureId, potential.id)) { var skillConfig = Config.Instance.Get<SkillConfig>(potential.id); var skillConfig = SkillConfig.Get(potential.id); var requirement = string.Empty; if (skillConfig.LearnSkillReq > 0 && skillConfig.LearnSkillLV > 0) { var preskillConfig = Config.Instance.Get<SkillConfig>(skillConfig.LearnSkillReq); var preskillConfig = SkillConfig.Get(skillConfig.LearnSkillReq); requirement = Language.Get("Hallows_NeedSkillLV", preskillConfig.SkillName, skillConfig.LearnSkillLV); } else @@ -1202,7 +1201,7 @@ { m_Level.text = StringUtility.Contact(level, Language.Get("Z1041")); m_Level.color = UIHelper.s_LightYellow; var currentConfig = Config.Instance.Get<SkillConfig>(potential.id + level - 1); var currentConfig = SkillConfig.Get(potential.id + level - 1); if (currentConfig == null) { m_Effect.gameObject.SetActive(false);
