From ec83a6301af79879ea88d7de0a26246ed06393ec Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Sat, 29 May 2021 17:19:52 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=B2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua index 42b4bcbafe..359cfa72e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -56,11 +56,11 @@ function this.Show() Util.AddOnceClick(this.btnStart,function() this.btnStart:GetComponent("Button").interactable = false TrialMiniGameManager.GameOperate(0, function(msg) - --转起来 - this.test(msg.drop.itemlist[1].itemId) + --转起来 id = msg.drop.itemlist[1].itemId num = msg.drop.itemlist[1].itemNum LogYellow("掉落的Id:"..id.." 数量:"..num) + this.test(msg.drop.itemlist[1].itemId) --4秒后显示掉落 -- Timer.New(function() -- if TrialMiniGameManager.IsGameDone() then From 05279cc3c1a8bba5e0313f23eeb3cf3702a741fd Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 31 May 2021 10:41:12 +0800 Subject: [PATCH 2/4] =?UTF-8?q?Revert=20"=E5=B0=8F=E6=B8=B8=E6=88=B2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit ec83a6301af79879ea88d7de0a26246ed06393ec. --- .../~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua index 359cfa72e0..42b4bcbafe 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_17.lua @@ -56,11 +56,11 @@ function this.Show() Util.AddOnceClick(this.btnStart,function() this.btnStart:GetComponent("Button").interactable = false TrialMiniGameManager.GameOperate(0, function(msg) - --转起来 + --转起来 + this.test(msg.drop.itemlist[1].itemId) id = msg.drop.itemlist[1].itemId num = msg.drop.itemlist[1].itemNum LogYellow("掉落的Id:"..id.." 数量:"..num) - this.test(msg.drop.itemlist[1].itemId) --4秒后显示掉落 -- Timer.New(function() -- if TrialMiniGameManager.IsGameDone() then From f52b234e1b40e7e0cf16e07a5f807e056f4e7356 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 31 May 2021 10:28:21 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E3=80=90=E5=BE=A1=E5=85=BD=E6=96=8B?= =?UTF-8?q?=E3=80=91=E6=98=BE=E7=A4=BA=E5=A6=96=E6=99=B6=E6=8A=BD=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 4f406045a6168db05c1ce5cf3b7d349f106b6ff2) --- .../~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua index 1b7168fd02..929820b3c4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua @@ -121,6 +121,7 @@ function PokemonSummonOneResultPanel:OnOpen(...) end isFree=freeTime and freeTime >= 1 if isFree then + itemId=0 this.itemNum3.gameObject:SetActive(false) this.itemIcon3.gameObject:SetActive(false) this.itemInfo3.text=Language[10489] From 11d7cc3e89d09f759546be18d0742a61277a3475 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 3 Jun 2021 11:20:53 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=90=E5=85=B3=E5=8D=A1=E3=80=91?= =?UTF-8?q?=E4=BB=8B=E7=BB=8D=E6=96=87=E5=AD=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Fight/FightSmallChoosePanel.prefab | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightSmallChoosePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightSmallChoosePanel.prefab index 854ea4d117..d19ae5a7c4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightSmallChoosePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightSmallChoosePanel.prefab @@ -34,7 +34,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -252.8, y: 735} + m_AnchoredPosition: {x: 0, y: 735} m_SizeDelta: {x: 69.63, y: 111.21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5120411 @@ -67,11 +67,11 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 40 + m_FontSize: 52 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 4 - m_MaxSize: 40 + m_MaxSize: 52 m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 @@ -120,7 +120,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 367, y: -1269} + m_AnchoredPosition: {x: 0, y: -1269} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &143979781216228526 @@ -590,7 +590,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1032078651153755405 RectTransform: m_ObjectHideFlags: 0 @@ -966,7 +966,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6382467389483365844 RectTransform: m_ObjectHideFlags: 0 @@ -1225,7 +1225,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9072459568714868046 RectTransform: m_ObjectHideFlags: 0 @@ -1305,7 +1305,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1870648834952150814 RectTransform: m_ObjectHideFlags: 0 @@ -3267,7 +3267,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7260763964865399722 RectTransform: m_ObjectHideFlags: 0 @@ -4192,7 +4192,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1720287018513450661 RectTransform: m_ObjectHideFlags: 0 @@ -5269,7 +5269,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9178348290668544461 RectTransform: m_ObjectHideFlags: 0