From 47ea758d67915e3407369eaf1d59ad07ff9f4973 Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 16:10:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=20=E7=BE=81=E7=BB=8A=E9=A2=84=E8=AE=BE?= =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab index 0216a3a365..028e5fbd8c 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonListPanel.prefab @@ -3768,7 +3768,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4009861031449356928} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: From 1fee1f84eb0c7c1fd4e3e78e126800507589fcad Mon Sep 17 00:00:00 2001 From: zhangqiang <657634622@qq.com> Date: Tue, 3 Nov 2020 16:08:10 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E3=80=91=20=E5=8F=AC=E5=94=A4=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=96=87=E5=AD=97=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Pokemon/PokemonSummonPanel.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua index dafaf6d4ea..f6e64841ca 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua @@ -129,7 +129,7 @@ function PokemonSummonPanel:refreshBtnShow() end local d = RecruitManager.GetExpendData(type) if isFree then - info.text=Language[11759] + info.text=" "..Language[11759] else itemId = d[1] itemNum = d[2]