From 12b0fa9f73da4c0d75d4fddf69e7f183069c3861 Mon Sep 17 00:00:00 2001 From: 2han9B1a0 Date: Thu, 9 Jul 2020 18:20:53 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=9D=83=E4=BF=AE=E6=94=B9,=E5=AE=9D?= =?UTF-8?q?=E5=9B=8A=E5=95=86=E5=BA=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Atlas/VipAtlas/r_mihe_biaoti002.png | Bin 0 -> 15442 bytes .../Atlas/VipAtlas/r_mihe_biaoti002.png.meta | 110 ++ .../UI/Operating/OperatingPanel.prefab | 1524 +++++++++++++++++ .../Prefabs/UI/Vip/VipPanelV2.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 2 + .../~Lua/Modules/Operating/OperatingPanel.lua | 3 +- .../~Lua/Modules/Operating/QianKunBox.lua | 43 +- .../~Lua/Modules/Shop/MainShopPanel.lua | 4 - 8 files changed, 1677 insertions(+), 11 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/VipAtlas/r_mihe_biaoti002.png create mode 100644 Assets/ManagedResources/Atlas/VipAtlas/r_mihe_biaoti002.png.meta diff --git a/Assets/ManagedResources/Atlas/VipAtlas/r_mihe_biaoti002.png b/Assets/ManagedResources/Atlas/VipAtlas/r_mihe_biaoti002.png new file mode 100644 index 0000000000000000000000000000000000000000..0e193f4a762d4610843e25fd18dd722ac9b99693 GIT binary patch literal 15442 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 self.btnTen1:SetActive(BagManager.GetItemCountById(16)<2000) + --五个魂印头像 for i = 1, 5 do local icon = Util.GetGameObject(self.icons,"icon"..i.."/icon"):GetComponent("Image") local kuang = Util.GetGameObject(self.icons,"icon"..i.."/kuang"):GetComponent("Image") @@ -73,20 +91,35 @@ function QianKunBox:OnShow() if itemConfig[iconsData[i].Reward[1]].Quantity == 5 then--金色 kuang.sprite = Util.LoadSprite("r_hunyin_hunyinkuanghuang001") end - + --点击能查看魂印信息 Util.AddOnceClick(kuang.gameObject,function () UIManager.OpenPanel(UIName.SoulPrintPopUp,nil,nil,iconsData[i].Reward[1],nil,nil) end) end + + --商店 + if not self.shopView then + self.shopView = SubUIManager.Open(SubUIConfig.ShopView, self.content.transform) + end + self.shopView:ShowShop(SHOP_TYPE.SOULBOX_SHOP,orginLayer) + self.live = poolManager:LoadLive("live2d_ui_h_52_xx_pf1", self.live.transform, Vector3.New(0.25,0.25,0.25), Vector3.New(123,214,0)) +end + +function QianKunBox:OnSortingOrderChange(_sortingOrder) + orginLayer = _sortingOrder end function QianKunBox:OnHide() self.gameObject:SetActive(false) self.detail.gameObject:SetActive(false) - -- self.reward.gameObject:SetActive(false) end function QianKunBox:OnDestroy() + if self.shopView then + self.shopView = SubUIManager.Close(self.shopView) + self.shopView = nil + end + poolManager:UnLoadLive("live2d_ui_h_52_xx_pf1", self.live) end return QianKunBox \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua index 3cdc95acb3..82d674c4df 100644 --- a/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Shop/MainShopPanel.lua @@ -33,10 +33,6 @@ local _ShopPage = { default = "r_shop_yunyou_01", lock = "r_shop_yunyou_01", select = "r_shop_yunyou_02", rpType = RedPointType.Shop_Page_Roam, }, - -- [SHOP_PAGE.SOULBOX] = { -- 宝囊 - -- default = "x_xianshishangshi_anniu_01", lock = "x_xianshishangshi_anniu_01", select = "x_xianshishangshi_anniu_02", - -- rpType = RedPointType.Shop_SoulBox_Check, - -- }, } this._MainShopPageList = {}