diff --git a/Assets/ManagedResources/Effects/Model/Materials.meta b/Assets/ManagedResources/Effects/Model/Materials.meta new file mode 100644 index 0000000000..85c619cb77 --- /dev/null +++ b/Assets/ManagedResources/Effects/Model/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70e7feb15403e214f801e51b8b4e0461 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 89e400832d..1670bb8c6d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -169,7 +169,11 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) go.transform.parent.gameObject:SetActive(false) elseif state == 2 then lockInfo:SetActive(true) - Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = pokemonPosLocks[liveIndex]..Language[10056] + if GetCurLanguage() == 0 then + Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = pokemonPosLocks[liveIndex]..Language[10056] + else + Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = Language[10056]..pokemonPosLocks[liveIndex] + end Util.AddOnceClick( Util.GetGameObject(go, "lockInfo/lockInfo/lockClick"), function() PopupTipPanel.ShowTip(pokemonPosLocks[liveIndex]..Language[10056]) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua index cf1b54fcb8..4732c66e34 100644 --- a/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Power/GiveMePowerPanel.lua @@ -474,9 +474,9 @@ function this.ShowRmdPanel(index) local childBox = Util.GetGameObject(node, "childbox") local childName = Util.GetGameObject(childBox, "name"):GetComponent("Text") local childContent = Util.GetGameObject(childBox, "content"):GetComponent("Text") - title.text = GetLanguageStrById(data.DescFirst) + title.text = ""--GetLanguageStrById(data.DescFirst) local strList = string.split(GetLanguageStrById(data.DescSecond), "#") - childName.text = "      "..strList[1] -- 空格用于调整文字的起始位置 + childName.text = GetLanguageStrById(data.DescFirst).." "..strList[1]--"      "..strList[1] -- 空格用于调整文字的起始位置 childContent.text = "       "..strList[2] -- 全角空格可以避免自动换行 for index, heroId in ipairs(data.ItemId) do local heroData = ConfigManager.GetConfigData(ConfigName.HeroConfig, heroId)