puxuan/c1_lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev_20230725' of http://git.juzugame.com/b6-client/b6-lua into dev_20230725

Browse Source
This commit is contained in:
xiekaidong 2023-07-24 17:04:44 +08:00
commit 65c580fb87
5 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lua/app/ui/common/mop_up_ui.lua
View File

@ -88,14 +88,16 @@ function MopUpUI:refreshTarget()
self.rewardCell:refreshItemById(self.target.id)
self.rewardCell:hideCountTx()
uiMap["mop_up_ui.bg.item_node.desc_1"]:setText(GFunc.getRewardName(GConst.REWARD_TYPE.ITEM, self.target.id))
local curProgress = DataManager.BagData.ItemData:getItemNumById(self.target.id) or 0
local itemNameTx = GFunc.getRewardName(GConst.REWARD_TYPE.ITEM, self.target.id)
local progressTx
if curProgress >= self.target.value then
progressTx = string.format("<color=#49FF49>%s</color>/%s", curProgress, self.target.value)
else
itemNameTx = itemName .. "<color=#FF4949>(" .. I18N:getGlobalText(I18N.GlobalConst.MOP_UP_DESC_3) .. ")</color>"
progressTx = string.format("<color=#FF4949>%s</color>/%s", curProgress, self.target.value)
end
uiMap["mop_up_ui.bg.item_node.desc_1"]:setText(itemNameTx)
uiMap["mop_up_ui.bg.item_node.desc_2"]:setText(progressTx)
uiMap["mop_up_ui.bg.item_node.progress_slider"]:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_SLIDER).value = curProgress / self.target.value
end

5
lua/app/ui/hero/armor_info_comp.lua
View File

@ -138,6 +138,7 @@ function ArmorInfoComp:refreshSelectArmor()
costNode:setActive(true)
local icon = uiMap["armor_info.upgrade.cost.cost_" .. i .. ".img_icon"]
local num = uiMap["armor_info.upgrade.cost.cost_" .. i .. ".tx_num"]
local add = uiMap["armor_info.upgrade.cost.cost_" .. i .. ".img_icon.img_add"]
local costId = GFunc.getRewardId(cost[i])
local costNum = GFunc.getRewardNum(cost[i])
@ -151,6 +152,10 @@ function ArmorInfoComp:refreshSelectArmor()
icon:setSprite(atlas, name, function ()
icon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
add:setActive(costNum - haveNum > 0)
icon:addClickListener(function()
UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum})
end)
else
costNode:setActive(false)
end

5
lua/app/ui/hero/weapon_info_comp.lua
View File

@ -97,6 +97,7 @@ function WeaponInfoComp:refresh()
costNode:setActive(true)
local icon = uiMap["weapon_info.upgrade.cost.cost_" .. i .. ".img_icon"]
local num = uiMap["weapon_info.upgrade.cost.cost_" .. i .. ".tx_num"]
local add = uiMap["weapon_info.upgrade.cost.cost_" .. i .. ".img_icon.img_add"]
local costId = GFunc.getRewardId(cost[i])
local costNum = GFunc.getRewardNum(cost[i])
@ -110,6 +111,10 @@ function WeaponInfoComp:refresh()
icon:setSprite(atlas, name, function ()
icon:getComponent(GConst.TYPEOF_UNITY_CLASS.UI_IMAGE):SetNativeSize()
end)
add:setActive(costNum - haveNum > 0)
icon:addClickListener(function()
UIManager:showUI("app/ui/dungeon/item_get_ui", {id = costId, value = costNum - haveNum < 0 and 0 or costNum - haveNum})
end)
else
costNode:setActive(false)
end

25
lua/app/ui/shop/gift_pop_ui.lua
View File

@ -1,17 +1,31 @@
local GiftPopUI = class("GiftPopUI", BaseUI)
local GIFT_BG_NAME = {
[PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
[PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
[PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
[PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
[PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_2.png",
},
[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
[PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_bg_1.png",
}
local GIFT_BG_BANNER_NAME = {
[PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
[PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = "assets/arts/textures/background/shop/shop_gift_banner_1_1.png",
[PayManager.PURCHARSE_ACT_TYPE.BEGINNER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_3_1.png",
[PayManager.PURCHARSE_ACT_TYPE.LEVEL_UP_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_4_1.png",
[PayManager.PURCHARSE_ACT_TYPE.COIN_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_6_1.png",
[PayManager.PURCHARSE_ACT_TYPE.WEAPON_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_7_2.png",
[PayManager.PURCHARSE_ACT_TYPE.ARMOR_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_8_2.png",
},
[PayManager.PURCHARSE_TYPE.CHAPTER_GIFT] = "assets/arts/textures/background/shop/shop_gift_banner_2_1.png",
[PayManager.PURCHARSE_TYPE.GROW_UP_GIFT_NEW] = "assets/arts/textures/background/shop/shop_gift_banner_5_1.png",
}
local GIFT_TITLE_TEXT = {
[PayManager.PURCHARSE_TYPE.ACT_GIFT] = {
[PayManager.PURCHARSE_ACT_TYPE.FIRST_RECHARGE] = I18N.GlobalConst.SHOP_DESC_9,
@ -60,6 +74,7 @@ function GiftPopUI:onLoadRootComplete()
self.titleTx = self.uiMap["gift_pop_ui.bg.title"]
self.banner = self.uiMap["gift_pop_ui.bg.banner"]
self.bg = self.uiMap["gift_pop_ui.bg"]
self.offNode = self.uiMap["gift_pop_ui.bg.off_img"]
self.offText = self.uiMap["gift_pop_ui.bg.off_img.text"]
@ -106,10 +121,12 @@ function GiftPopUI:refresh(needCheck)
if self.actType == PayManager.PURCHARSE_TYPE.ACT_GIFT then
local type = PayManager:getGiftConfigInfo(self.actType, self.actId).type
self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType][type]))
self.banner:setTexture(GIFT_BG_NAME[self.actType][type])
self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType][type])
self.bg:setTexture(GIFT_BG_NAME[self.actType][type])
else
self.titleTx:setText(I18N:getGlobalText(GIFT_TITLE_TEXT[self.actType]))
self.banner:setTexture(GIFT_BG_NAME[self.actType])
self.banner:setTexture(GIFT_BG_BANNER_NAME[self.actType])
self.bg:setTexture(GIFT_BG_NAME[self.actType])
end
local cfgInfo = PayManager:getGiftConfigInfo(self.actType, self.actId)

2
lua/app/ui/shop/shop_comp.lua
View File

@ -17,6 +17,8 @@ local PAGE_DISCOUNT_LEVEL_SELL_CELL = "app/ui/shop/cell/level_sell_cell" -- 助
local PAGE_DISCOUNT_GROW_SELL_CELL = "app/ui/shop/cell/grow_sell_cell" -- 成长
local PAGE_DISCOUNT_COIN_SELL_CELL = "app/ui/shop/cell/coin_sell_cell" -- 金币
local PAGE_DISCOUNT_ARENA_SELL_CELL = "app/ui/shop/cell/arena_gift_sell_cell" -- 竞技场
local PAGE_DISCOUNT_WEAPON_SELL_CELL = "app/ui/shop/cell/weapon_gift_sell_cell" -- 武器
local PAGE_DISCOUNT_ARMOR_SELL_CELL = "app/ui/shop/cell/armor_gift_sell_cell" -- 防具
function ShopComp:init()
self.uiMap = self.baseObject:genAllChildren()