From 99dcf2ed40dac5dcb40342dbbe9ae023958097e5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sun, 7 Mar 2021 15:16:40 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E7=AD=89=E7=BA=A7=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Pokemon/PokemonMainPanel.prefab | 12 ++++++------ .../~Lua/Modules/Pokemon/PokemonMainPanel.lua | 5 +++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab index 6ce3b8c330..0c38d0df2b 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonMainPanel.prefab @@ -755,7 +755,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &270013970460605470 GameObject: @@ -4824,7 +4824,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &1454439324054902454 GameObject: @@ -7204,7 +7204,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &2186963201335409707 GameObject: @@ -11298,7 +11298,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &3699215369129901617 GameObject: @@ -14372,7 +14372,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &4865165246421771139 GameObject: @@ -15335,7 +15335,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1.2 - m_Text: "222\u7EA7" + m_Text: LanguageIndex: 0 --- !u!1 &5105751309978687398 GameObject: diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 1670bb8c6d..8afa6dac84 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -118,6 +118,7 @@ end function PokemonMainPanel:OnShow() this.ShowPokemonList() PokemonManager.CheckRedPointStatusPokemonMainCityRed() + end local nextOpenLockIndex = 0 @@ -198,9 +199,9 @@ function this.ShowSinglePokemonList(go,singleData,liveIndex) nameText.text = GetStringByEquipQua(spiritAnimalConfig.Quality, GetLanguageStrById(spiritAnimalConfig.Name)) SetTextVerTial(nameText,Vector3.New(55.3,-1.58,0)) if GetCurLanguage() == 0 then - Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065] + Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065] else - Util.GetGameObject(go, "lockInfo/lockInfo/lvImage/Text"):GetComponent("Text").text = Language[10065] .. curData.lv + Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = Language[10065] .. curData.lv end -- Util.GetGameObject(go, "upZhenInfo/lvImage/Text"):GetComponent("Text").text = curData.lv..Language[10065] local curPokemonLive = Util.GetGameObject(go, "upZhenInfo/pokemonLive")