From ecb9fd84b34ff3e66336d17ab5ad5f37898367b0 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Fri, 19 Jul 2024 15:50:03 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BB=A3=E9=87=91=E5=88=B8?= =?UTF-8?q?=E5=95=86=E5=9F=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArtFont/s_shangcheng_shouchong_djq_zh.png | Bin 0 -> 28957 bytes .../s_shangcheng_shouchong_djq_zh.png.meta | 110 ++++++++++++++++++ .../~Lua/Common/GlobalDefine.lua | 1 + .../Modules/Guild/Skill/FaLingManager.lua | 4 +- .../~Lua/Modules/Recharge/View/GiftPre.lua | 13 ++- .../Modules/Recharge/View/RechargeViewNew.lua | 7 +- .../ManagedResources/~Lua/View/ShopView.lua | 29 ++++- 7 files changed, 153 insertions(+), 11 deletions(-) create mode 100644 Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png create mode 100644 Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png.meta diff --git a/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png b/Assets/ManagedResources/DynamicAtlas/ShopAtlas/ArtFont/s_shangcheng_shouchong_djq_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..8e3eda90aa924ecccb72ece705c4b9cfc2a6e702 GIT binary patch literal 28957 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 e?ZNgR0R{jwW#kt_x5=&m0000 b.lv + return a.staticId > b.staticId else - return a.staticId > b.staticId + return a.lv > b.lv end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua index 1a1bc9517b..652c49a340 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/GiftPre.lua @@ -448,11 +448,16 @@ function GiftPre:SetIsCanBuy() end if isCanBuy == 0 then - --LogError("self.data.data.limitNum=="..self.data.data.limitNum.." self.data.data.boughtNum=="..self.data.data.boughtNum) - isCanBuy = (self.data.data.limitNum - self.data.data.boughtNum > 0) and 0 or 2 - if self.data.data.linkAct then - isCanBuy = self.data.data.state == 0 and 0 or 2 + LogError("self.data.data.limitNum=="..self.data.data.limitNum.." self.data.data.boughtNum=="..self.data.data.boughtNum) + if self.data.data.limitNum==0 then + isCanBuy=0 + else + isCanBuy = (self.data.data.limitNum - self.data.data.boughtNum > 0) and 0 or 2 + if self.data.data.linkAct then + isCanBuy = self.data.data.state == 0 and 0 or 2 + end end + end if isCanBuy == 0 then self.btnBuy:GetComponent("Image").sprite = self.spLoader:LoadSprite("s_slbz_1anniuongse") diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua index 696d1937ce..925b42b6dc 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recharge/View/RechargeViewNew.lua @@ -66,7 +66,12 @@ end function RechargeViewNew:OnShow(_sortingOrder) self.gameObject:SetActive(true) self.sortingOrder = _sortingOrder - self.shopView:ShowShop(SHOP_TYPE.SOUL_STONE_SHOP, self.sortingOrder) + LogError("self.actConfig============="..self.actConfig.ShopData[1][3]) + local showType=3 + if self.actConfig.ShopData and #self.actConfig.ShopData>0 then + showType=self.actConfig.ShopData[1][3] + end + self.shopView:ShowShop(SHOP_TYPE.SOUL_STONE_SHOP, self.sortingOrder,showType) self:SetGrowGift() end diff --git a/Assets/ManagedResources/~Lua/View/ShopView.lua b/Assets/ManagedResources/~Lua/View/ShopView.lua index a23f4d4c5e..122926cd7f 100644 --- a/Assets/ManagedResources/~Lua/View/ShopView.lua +++ b/Assets/ManagedResources/~Lua/View/ShopView.lua @@ -1,5 +1,6 @@ local _ShopTypeConfig = ConfigManager.GetConfig(ConfigName.StoreTypeConfig) +local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) -- 通用得商店逻辑 local ShopView = {} local this = ShopView @@ -215,7 +216,11 @@ end -- 刷新商店内容显示 function this:RefreshShopInfo(isRefresh, isTop,isAni) if self.ShopType == SHOP_TYPE.SOUL_STONE_SHOP then - self.RechargeShopData = OperatingManager.GetGiftGoodsInfoList(GoodsTypeDef.DemonCrystal) + if self.showType and self.showType~=0 then + LogError("slef.shwotype=========================="..self.showType) + self.RechargeShopData = OperatingManager.GetGiftGoodsInfoList(self.showType) + end + else self.ShopData = ShopManager.GetShopDataByType(self.ShopType) end @@ -426,6 +431,7 @@ function this:RefreshItemList(isRefresh,isTop,isAni) self.ScrollView.gameObject:SetActive(false) self.RechargeScrollView.gameObject:SetActive(true) local itemlist = self.RechargeShopData + LogError("#itemlist================================"..#itemlist) self.RechargeScrollView:SetData(itemlist, function(index, shopItem) local itemData = itemlist[index] self:RechargeShopItemAdapter(shopItem, itemData) @@ -646,16 +652,30 @@ end function this:RechargeShopItemAdapter(shopItem, itemData) -- 获取对象 local first = Util.GetGameObject(shopItem, "first") + local firstImg=Util.GetGameObject(shopItem, "first"):GetComponent("Image") local firstNum = Util.GetGameObject(shopItem, "first/Text"):GetComponent("Text") local xuChong = Util.GetGameObject(shopItem, "xuChong") local xuNum = Util.GetGameObject(shopItem, "xuChong/Text"):GetComponent("Text") local icon = Util.GetGameObject(shopItem, "icon"):GetComponent("Image") local num = Util.GetGameObject(shopItem, "itemNum"):GetComponent("Text") + local itemIcon=Util.GetGameObject(shopItem, "itemIcon"):GetComponent("Image") local price = Util.GetGameObject(shopItem, "price/Text"):GetComponent("Text") - + + -- 计算数据 + local itemInfo = ShopManager.GetRechargeItemInfo(itemData.goodsId) - icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemInfo.Resources)) + local baseId=itemInfo.BaseReward[1][1] + local costStr=GetResourcePath(itemConfig[baseId].ResourceID) + itemIcon.sprite=self.spLoader:LoadSprite(costStr) + if self.showType==63 then + firstImg.sprite=self.spLoader:LoadSprite("s_shangcheng_shouchong_djq_zh") + icon.sprite = self.spLoader:LoadSprite(costStr) + else + firstImg.sprite=self.spLoader:LoadSprite("s_shangcheng_shouchong_zh") + icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemInfo.Resources)) + end + num.text = itemInfo.BaseReward[1][2] price.text = MoneyUtil.GetMoneyUnitNameWithMoney(itemInfo.Price) --.. MoneyUtil.GetMoney(itemInfo.Price) @@ -691,7 +711,7 @@ end ---=====================================对外接口=============================---- -- 设置要显示的商店类型 -function this:ShowShop(shopType,_sortingOrder) +function this:ShowShop(shopType,_sortingOrder,_showType) self.ScrollView:ForeachItemGO(function (index, go) go.gameObject:SetActive(false) end) @@ -717,6 +737,7 @@ function this:ShowShop(shopType,_sortingOrder) -- 刷新显示 self.ShopType = shopType + self.showType = _showType isPlayShow = true self.ShopId = ShopManager.GetShopDataByType(self.ShopType).id self.ShopConfig = _ShopTypeConfig[self.ShopId]