Fight/GameActor/GActorNpcNoFight.cs
@@ -98,7 +98,7 @@ if (NpcConfig.NPCEffect != 0) { m_AppearEffect = SFXPlayUtility.Instance.PlayBattleEffect(NpcConfig.NPCEffect, this); //EffectConfig _effectConfig = ConfigManager.Instance.GetTemplate<EffectConfig>(NpcConfig.NPCEffect); //EffectConfig _effectConfig = Config.Instance.Get<EffectConfig>(NpcConfig.NPCEffect); //if (_effectConfig != null) //{ // SoundPlayer.Instance.PlayAudio(m_AudioSource, _effectConfig.audio); Fight/MapTransferUtility.cs
@@ -786,7 +786,7 @@ // return; //} //NPCConfig _npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(NpcID); //NPCConfig _npcConfig = Config.Instance.Get<NPCConfig>(NpcID); //if (_npcConfig == null) //{ // return; Fight/Stage/Dungeon/MapArea.cs
@@ -115,7 +115,7 @@ { PlayerDatas.Instance.hero.ExitArea((int)E_Type.Boss); PlayerDatas.Instance.hero.currentBossArea = null; //MapConfig _mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(PlayerDatas.Instance.baseData.MapID); //MapConfig _mapConfig = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID); //SoundPlayer.Instance.PlayBackGroundMusic(_mapConfig.Music); } else System/BlastFurnace/FurnaceFireChooseWin.cs
@@ -145,7 +145,7 @@ break; //case BlastFurnaceFuncTitle.TreasureRefine: // chinItemModel = ConfigManager.Instance.GetTemplate<ItemConfig>(extraMatIds[cell.index]); // chinItemModel = Config.Instance.Get<ItemConfig>(extraMatIds[cell.index]); // if (chinItemModel != null) // { // RefreshCellUI(extraMatIds[cell.index], cell, FurnaceModel.GetFireSuccessRate(chinItemModel.Effect1, chinItemModel.EffectValueA1), fireChooseCell, chinItemModel); System/BlastFurnace/TreasureRefineSuccessWin.cs
@@ -49,7 +49,7 @@ //if(_treasure != null) //{ // _refineModel = TreasureRefineConfig.GetTreasureRefineModel(_treasure.id, _treasure.level); // _tagTreasureModel = ConfigManager.Instance.GetTemplate<TreasureConfig>(_treasure.id); // _tagTreasureModel = Config.Instance.Get<TreasureConfig>(_treasure.id); // InitUI(); //} @@ -85,7 +85,7 @@ // if(_refineModel.OpenSkill != 0) // { // _openSkillText.gameObject.SetActive(true); // tagChinSkill = ConfigManager.Instance.GetTemplate<SkillConfig>(_refineModel.OpenSkill); // tagChinSkill = Config.Instance.Get<SkillConfig>(_refineModel.OpenSkill); // if(tagChinSkill != null) // { // _openSkillText.text = Language.Get("BlastFurnace110",tagChinSkill.SkillName); System/BlastFurnace/TreasureRefineTips.cs
@@ -155,7 +155,7 @@ private void RefreshDandrugCell(ScrollerDataType type, CellView cell) { //TreasureConfig treasureModel = ConfigManager.Instance.GetTemplate<TreasureConfig>(cell.index); //TreasureConfig treasureModel = Config.Instance.Get<TreasureConfig>(cell.index); //Treasure treasure = null; //FurnaceModel.sTreasureModel.TryGetTreasure(cell.index, out treasure); //TreasureRefineConfig nextRefineModel = null; System/Dogz/DogzDetailBehaviour.cs
@@ -46,7 +46,7 @@ public void Display(ItemModel data) { //m_DogzEquip.Display(data); //var config = ConfigManager.Instance.GetTemplate<ItemConfig>(data.itemId); //var config = Config.Instance.Get<ItemConfig>(data.itemId); //if (config != null) //{ // m_ItemNameTxt.text = config.ItemName; @@ -60,7 +60,7 @@ // { // if (index < m_BasePropertys.Length) // { // var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key); // var propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(_key); // m_BasePropertys[index].gameObject.SetActive(true); // m_BasePropertys[index].Display(_key, data.basePropertyDict[_key]); // } @@ -79,7 +79,7 @@ // { // if (index < m_SpecialPropertys.Length) // { // var propertyConfig = ConfigManager.Instance.GetTemplate<PlayerPropertyConfig>(_key); // var propertyConfig = Config.Instance.Get<PlayerPropertyConfig>(_key); // m_SpecialPropertys[index].gameObject.SetActive(true); // m_SpecialPropertys[index].Display(_key, data.specialPropertyDict[_key]); // } System/DogzDungeon/DogzDungeonBreifInfoBehaviour.cs
@@ -16,19 +16,24 @@ [SerializeField] Image m_Attention; protected override int selectedBossId { get { protected override int selectedBossId { get { return model.selectedBoss; } set { set { model.selectedBoss = value; } } protected override InteractorableState interactorableState { get { protected override InteractorableState interactorableState { get { var selected = selectedBossId == bossId; var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId); var config = Config.Instance.Get<DogzDungeonConfig>(bossId); var dieOrLocked = false; switch (config.MonsterType) { @@ -53,13 +58,16 @@ return selected ? InteractorableState.DieOrLockedSelected : InteractorableState.DieOrLockedUnSelected; } } set { set { base.interactorableState = value; } } protected override bool isUnLocked { get { protected override bool isUnLocked { get { return model.IsBossUnLocked(bossId); } } @@ -71,8 +79,8 @@ base.Display(_data); m_Attention.gameObject.SetActive(findPreciousModel.IsBossSubscribed(bossId)); var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId); var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(bossId); var config = Config.Instance.Get<DogzDungeonConfig>(bossId); var npcConfig = Config.Instance.Get<NPCConfig>(bossId); DrawBossBaseInfo(config.PortraitID, npcConfig.charName, npcConfig.NPCLV, npcConfig.Realm); UpdateBossRebornCoolDown(isUnLocked); @@ -115,7 +123,7 @@ { if (_isUnLocked) { var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId); var config = Config.Instance.Get<DogzDungeonConfig>(bossId); var refreshTime = DateTime.Now; switch (config.MonsterType) { System/DogzDungeon/DogzDungeonModel.cs
@@ -13,11 +13,14 @@ public const int DATA_MAPID = 21110; int m_SelectedBoss = 0; public int selectedBoss { get { public int selectedBoss { get { return this.m_SelectedBoss; } set { set { if (this.m_SelectedBoss != value) { this.m_SelectedBoss = value; @@ -30,9 +33,11 @@ } int m_WearyValue = 0; public int wearyValue { public int wearyValue { get { return m_WearyValue; } set { set { if (m_WearyValue != value) { m_WearyValue = value; @@ -45,9 +50,11 @@ } int m_BigBoxCollectCount = 0; public int bigBoxCollectCount { public int bigBoxCollectCount { get { return m_BigBoxCollectCount; } set { set { if (m_BigBoxCollectCount != value) { m_BigBoxCollectCount = value; @@ -60,7 +67,8 @@ } int m_SmallBoxCollectCount = 0; public int smallBoxCollectCount { public int smallBoxCollectCount { get { return m_SmallBoxCollectCount; } set { m_SmallBoxCollectCount = value; } } @@ -125,10 +133,10 @@ for (int i = sortedBossIds.Count - 1; i >= 0; i--) { var bossId = sortedBossIds[i]; var dogzConfig = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId); var dogzConfig = Config.Instance.Get<DogzDungeonConfig>(bossId); if (dogzConfig.MonsterType == 3 || dogzConfig.MonsterType == 4) { var npcConfig = ConfigManager.Instance.GetTemplate<NPCConfig>(bossId); var npcConfig = Config.Instance.Get<NPCConfig>(bossId); if (IsBossUnLocked(bossId) && findPreciousModel.IsBossAlive(bossId) && playerLevel >= npcConfig.NPCLV) { return bossId; @@ -283,7 +291,7 @@ private void ParseConfig() { var configs = ConfigManager.Instance.GetAllValues<DogzDungeonConfig>(); var configs = Config.Instance.GetAllValues<DogzDungeonConfig>(); foreach (var config in configs) { switch (config.MonsterType) @@ -336,8 +344,10 @@ public class DogzDungeonElite { public Dictionary<int, int> eliteCounts = new Dictionary<int, int>(); public int eliteSurplus { get { public int eliteSurplus { get { var count = 0; foreach (var eliteCount in eliteCounts.Values) { @@ -382,9 +392,11 @@ public class DogzDungeonBossData { public int id { get; private set; } public bool isUnLocked { get { var config = ConfigManager.Instance.GetTemplate<NPCConfig>(id); public bool isUnLocked { get { var config = Config.Instance.Get<NPCConfig>(id); return PlayerDatas.Instance.baseData.LV >= config.NPCLV; } } @@ -396,8 +408,8 @@ public static int LevelCompare(int a, int b) { var configA = ConfigManager.Instance.GetTemplate<NPCConfig>(a); var configB = ConfigManager.Instance.GetTemplate<NPCConfig>(b); var configA = Config.Instance.Get<NPCConfig>(a); var configB = Config.Instance.Get<NPCConfig>(b); return configA.NPCLV < configB.NPCLV ? -1 : 1; } System/DogzDungeon/DogzDungeonWin.cs
@@ -114,7 +114,7 @@ WindowCenter.Instance.Open<MainInterfaceWin>(); } var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(model.selectedBoss); var config = Config.Instance.Get<DogzDungeonConfig>(model.selectedBoss); switch (config.MonsterType) { case 1: @@ -122,7 +122,7 @@ case 3: if (PlayerDatas.Instance.baseData.MapID != DogzDungeonModel.DATA_MAPID) { var map = ConfigManager.Instance.GetTemplate<MapConfig>(DogzDungeonModel.DATA_MAPID); var map = Config.Instance.Get<MapConfig>(DogzDungeonModel.DATA_MAPID); var position = new Vector3(map.BornPoints[0].x, 0, map.BornPoints[0].y); MapTransferUtility.Send_WorldTransfer(DogzDungeonModel.DATA_MAPID, position, MapTransferType.WorldTransport, 0, 0); } @@ -147,7 +147,7 @@ private void DisplayBossBaseInfo(int _bossId) { var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(_bossId); var config = Config.Instance.Get<DogzDungeonConfig>(_bossId); switch (config.MonsterType) { case 1: @@ -186,7 +186,7 @@ private void DisplayItemDropTip(int _bossId) { var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(model.selectedBoss); var config = Config.Instance.Get<DogzDungeonConfig>(model.selectedBoss); switch (config.MonsterType) { case 1: @@ -195,7 +195,7 @@ m_SurpassLevel.gameObject.SetActive(false); break; case 4: var npcDropConfig = ConfigManager.Instance.GetTemplate<NPCDropItemConfig>(_bossId); var npcDropConfig = Config.Instance.Get<NPCDropItemConfig>(_bossId); m_SurpassLevel.gameObject.SetActive(npcDropConfig.MaxLV != 0 && PlayerDatas.Instance.baseData.LV > npcDropConfig.MaxLV); m_SurpassLevel.gameObject.SetActive(true); break; @@ -204,7 +204,7 @@ private void DisplayWearyValue(int _bossId) { var config = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(model.selectedBoss); var config = Config.Instance.Get<DogzDungeonConfig>(model.selectedBoss); switch (config.MonsterType) { case 1: System/FindPrecious/BossIntroduceBehaviour.cs
@@ -132,7 +132,7 @@ unusualRewards = demonJarConfig.RareItemID; break; case FindPreciousType.DogzDungeon: undoubtedlyRewards = ConfigManager.Instance.GetTemplate<DogzDungeonConfig>(bossId).RareItemID; undoubtedlyRewards = Config.Instance.Get<DogzDungeonConfig>(bossId).RareItemID; break; }
@@ -251,7 +251,7 @@ private void GotoKillDogzDungeonBoss(int _bossId) { var mapId = PlayerDatas.Instance.baseData.MapID; var mapConfig = ConfigManager.Instance.GetTemplate<MapConfig>(mapId); var mapConfig = Config.Instance.Get<MapConfig>(mapId); if (mapConfig.MapFBType == (int)MapType.OpenCountry) { System/FindPrecious/FindPreciousModel.cs
@@ -14,7 +14,8 @@ Redpoint findPreciousRedpoint = new Redpoint(FINDPRECIOUS_REDPOINTID); int m_ViewKillRecordsBoss = 0; public int ViewKillRecordsBoss { public int ViewKillRecordsBoss { get { return this.m_ViewKillRecordsBoss; } set { this.m_ViewKillRecordsBoss = value; } } @@ -23,9 +24,11 @@ List<int> bossNotifies = new List<int>(); int m_CurrentBossNotify = 0; public int currentBossNotify { public int currentBossNotify { get { return m_CurrentBossNotify; } private set { private set { if (m_CurrentBossNotify != value) { m_CurrentBossNotify = value; @@ -424,7 +427,7 @@ { return FindPreciousType.PersonalBoss; } else if (ConfigManager.Instance.ContainKey<DogzDungeonConfig>(_bossId)) else if (Config.Instance.ContainKey<DogzDungeonConfig>(_bossId)) { return FindPreciousType.DogzDungeon; } System/FindPrecious/LootPreciousFrameWin.cs
@@ -15,8 +15,8 @@ [SerializeField] FunctionButtonGroup m_FunctionGroup; [SerializeField] FunctionButton m_DemonJar; [SerializeField] FunctionButton m_DogzDungeon; [SerializeField] FunctionButton m_FairyGrabBoss; [SerializeField] FunctionButton m_DogzDungeon; [SerializeField] Button m_Left; [SerializeField] Button m_Right; @@ -89,16 +89,7 @@ private void ShowDogzDungeon() { CloseSubWindows(); if (windowState == WindowState.Opened) { WindowCenter.Instance.OpenWithoutAnimation<DogzDungeonWin>(); } else { WindowCenter.Instance.Open<DogzDungeonWin>(); } functionOrder = m_DogzDungeon.order; }
@@ -66,7 +66,7 @@ m_TitlesText.text= "<color=#feed28> " + TaskTitle(TaskId) + " </color>"; string str = _AllMissionDict[TaskId].InforList; m_ContentsText.gameObject.SetActive(false); //var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(str); //var config = Config.Instance.Get<TASKINFOConfig>(str); //if (config != null) //{ // m_ContentsText.text = config.show_writing; System/Mount/MountSkillWin.cs
@@ -226,12 +226,12 @@ if (_GetMountSkills.ContainsKey(_MountList[Index]))//解锁 { _MountSkill.Lock.SetActive(false); // _MountSkill.MountNameTxt1.text = ConfigManager.Instance.GetTemplate<HorseConfig>(_MountSkillDic[(_MountList[Index])].HorseID).Name; // _MountSkill.MountNameTxt1.text = Config.Instance.Get<HorseConfig>(_MountSkillDic[(_MountList[Index])].HorseID).Name; _MountSkill.SkillTex.material = MaterialUtility.GetUIDefaultGraphicMaterial();//亮 } else//未解锁 { // _MountSkill.MountNameTxt1.text = ConfigManager.Instance.GetTemplate<HorseConfig>(_MountSkillDic[(_MountList[Index])].HorseID).Name; // _MountSkill.MountNameTxt1.text = Config.Instance.Get<HorseConfig>(_MountSkillDic[(_MountList[Index])].HorseID).Name; _MountSkill.Lock.SetActive(false); } @@ -302,7 +302,7 @@ _mountSkill.SkillTex.material = MaterialUtility.GetDefaultSpriteGrayMaterial();//灰 _mountSkill.Lock.SetActive(true); _mountSkill.SkillNameTxt.text = SkillConfig.GetSkillTypeIDAndSkillLV(SkillID, 1).SkillName; // _mountSkill.MountNameTxt1.text = "<color=#ff2828>" + ConfigManager.Instance.GetTemplate<HorseConfig>(_MountSkillDic[SkillID].HorseID).Name + "</color>"; // _mountSkill.MountNameTxt1.text = "<color=#ff2828>" + Config.Instance.Get<HorseConfig>(_MountSkillDic[SkillID].HorseID).Name + "</color>"; } void Consumables(int SkillID) System/Strengthening/GemModel.cs
@@ -288,7 +288,7 @@ redpointList[i - 1].state = RedPointState.None; if (item != null) { ItemConfig itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>((int)item.itemInfo.ItemID); 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); @@ -350,7 +350,7 @@ ItemModel item = playerPack.GetItemModelByIndex(PackType.rptEquip, _index); if (item != null) { ItemConfig itemCfg = ConfigManager.Instance.GetTemplate<ItemConfig>((int)item.itemInfo.ItemID); 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) { System/Strengthening/WingsRefined.cs
@@ -212,7 +212,7 @@ { expValue+= Sort2(key); //ItemModel model = playerPack.GetItemModelByIndex(PackType.rptItem, key); //expValue += ConfigManager.Instance.GetTemplate<WingRefineExpConfig>(model.itemInfo.ItemID).EXPupper; //expValue += Config.Instance.Get<WingRefineExpConfig>(model.itemInfo.ItemID).EXPupper; } } return _currentRefiningAll > expValue;
