From 28ca69e078c7ff07336a8e9a775b7a17965e2146 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Fri, 2 Apr 2021 14:48:12 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A1=A8=E5=88=A0=E9=99=A4=E3=80=91Ad?= =?UTF-8?q?ventureConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Data/ConfigData.lua | 2 +- .../~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua | 2 +- .../~Lua/Modules/Adventure/AdventureMainPanel.lua | 4 ++-- .../~Lua/Modules/Adventure/AdventureManager.lua | 2 +- .../~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index d2a7c7bd9d..88e5ee547e 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -1,7 +1,7 @@ ConfigName = { -- AccomplishmentConfig = "AccomplishmentConfig", ActivityRewardConfig = "ActivityRewardConfig", - AdventureConfig = "AdventureConfig", + -- AdventureConfig = "AdventureConfig", AreaConfig = "AreaConfig", ArtResourcesConfig = "ArtResourcesConfig", AudioConfig = "AudioConfig", diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua index 61dbc66865..ed47529462 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureAlianInvasionPanel.lua @@ -11,7 +11,7 @@ local _TabData = { [3] = { default = "r_hero_xuanze_002", select = "r_hero_xuanze_001", name = "奖 励" }, } -- 物品数据 -local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) +-- local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) local heroConfig = ConfigManager.GetConfig(ConfigName.HeroConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua index 9d588d051b..eb5a25a876 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureMainPanel.lua @@ -8,7 +8,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) local RewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup) local StoreConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local cost = 0 -local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) +-- local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) local orginLayer = 0 @@ -626,7 +626,7 @@ function this.ChatNodeAdapter(node, data) local content = Util.GetGameObject(node, "content") name:GetComponent("Text").text = data.findUserName --TODO:这里会区分聊天消息的类型做不同的显示,目前只有boss - local areaName = GetLanguageStrById(adventureConfig[data.arenaId].AreaName) + local areaName = ""--GetLanguageStrById(adventureConfig[data.arenaId].AreaName) local monsterId = monsterGroup[data.bossGroupId].Contents[1][1] local monsterInfo = monsterConfig[monsterId] local bossName = GetLanguageStrById(monsterInfo.ReadingName) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua index 79eb2e8a7e..7837bfac0d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureManager.lua @@ -2,7 +2,7 @@ local this = AdventureManager local GameSetting = ConfigManager.GetConfig(ConfigName.GameSetting) local AdventureReward = ConfigManager.GetConfig(ConfigName.AdventureReward) -local AdventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) +-- local AdventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) local VipLevelConfig = ConfigManager.GetConfig(ConfigName.VipLevelConfig) local StoreConfig = ConfigManager.GetConfig(ConfigName.StoreConfig) local privilegeTypeConfig=ConfigManager.GetConfig(ConfigName.PrivilegeTypeConfig) diff --git a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua index 43e76a84df..9f165d1517 100644 --- a/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Adventure/AdventureRewardDetailPopup.lua @@ -2,7 +2,7 @@ local AdventureRewardDetailPopup = Inherit(BasePanel) local this = AdventureRewardDetailPopup -local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) +-- local adventureConfig = ConfigManager.GetConfig(ConfigName.AdventureConfig) local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local rewardGroup = ConfigManager.GetConfig(ConfigName.RewardGroup) local mainLevelConfig = ConfigManager.GetConfig(ConfigName.MainLevelConfig)