From 10a218130519429d2de13ad85342fe467d966be7 Mon Sep 17 00:00:00 2001 From: 2han9B1a0 Date: Thu, 9 Jul 2020 16:14:44 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E6=B8=B8=E6=88=8F18bugxiugai?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...png => x_xianshishangshi_anniu_01_png.png} | Bin ...> x_xianshishangshi_anniu_01_png.png.meta} | 0 ...png => x_xianshishangshi_anniu_02_png.png} | Bin ...> x_xianshishangshi_anniu_02_png.png.meta} | 0 .../~Lua/Common/GlobalDefine.lua | 1 + .../Map/TrialMiniGame/Logic/Game_18.lua | 20 ++++++------------ 6 files changed, 8 insertions(+), 13 deletions(-) rename Assets/ManagedResources/Atlas/TimeLimitedCall/{x_xianshishangshi_anniu_01.png => x_xianshishangshi_anniu_01_png.png} (100%) rename Assets/ManagedResources/Atlas/TimeLimitedCall/{x_xianshishangshi_anniu_01.png.meta => x_xianshishangshi_anniu_01_png.png.meta} (100%) rename Assets/ManagedResources/Atlas/TimeLimitedCall/{x_xianshishangshi_anniu_02.png => x_xianshishangshi_anniu_02_png.png} (100%) rename Assets/ManagedResources/Atlas/TimeLimitedCall/{x_xianshishangshi_anniu_02.png.meta => x_xianshishangshi_anniu_02_png.png.meta} (100%) diff --git a/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01.png b/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01_png.png similarity index 100% rename from Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01.png rename to Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01_png.png diff --git a/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01.png.meta b/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01_png.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01.png.meta rename to Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_01_png.png.meta diff --git a/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02.png b/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02_png.png similarity index 100% rename from Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02.png rename to Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02_png.png diff --git a/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02.png.meta b/Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02_png.png.meta similarity index 100% rename from Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02.png.meta rename to Assets/ManagedResources/Atlas/TimeLimitedCall/x_xianshishangshi_anniu_02_png.png.meta diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 084e59d897..803e3b3cd1 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -505,6 +505,7 @@ SHOP_TYPE = { TOP_MATCH_SHOP = 21, -- 巅峰赛商店 FINDFAIRY_GIFT=22, --寻仙限时礼包 BUYCOIN_SHOP=57, --点金商店 + SOULBOX_SHOP=58, --宝囊限时商店 } PropertyTypeIconDef = { diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua index 011e703386..d5b2b8a8ea 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMiniGame/Logic/Game_18.lua @@ -76,25 +76,19 @@ function this.Show() cFront.transform:DORotate(Vector3.New(0, 0, 0), 0.3) coroutine.wait(0.2) --请求奖励 - if this.gameParams[index] == -1 then - PopupTipPanel.ShowTip(Language[12186]) - TrialMiniGameManager.EndGame() - else - TrialMiniGameManager.GameOperate(index, function(msg) - -- UIManager.OpenPanel(UIName.RewardItemPopup, msg.drop, 1, function() - -- canGetTime = msg.gameStatus - -- if canGetTime == 0 then - -- TrialMiniGameManager.EndGame() - -- end - -- end) + TrialMiniGameManager.GameOperate(index, function(msg) + if msg.resultId == -1 then + PopupTipPanel.ShowTip(Language[12186]) + TrialMiniGameManager.EndGame() + else local data = TrialMiniGameManager.IdToNameIconNum(msg.drop.itemlist[1].itemId,msg.drop.itemlist[1].itemNum) PopupTipPanel.ShowColorTip(data[1],data[2],data[3]) canGetTime = msg.gameStatus if canGetTime == 0 then TrialMiniGameManager.EndGame() end - end) - end + end + end) end) end)