diff --git a/lua/app/ui/main_city/main_city_ui.lua b/lua/app/ui/main_city/main_city_ui.lua index c363c79e..901ae61c 100644 --- a/lua/app/ui/main_city/main_city_ui.lua +++ b/lua/app/ui/main_city/main_city_ui.lua @@ -655,7 +655,7 @@ function MainCityUI:refreshTask() self.taskBtn:setVisible(true) local showRedPoint = DataManager.DailyTaskData:getIsShowRedPoint() if showRedPoint then - self.taskBtn:addRedPoint(42, 42, 0.8) + self.taskBtn:addRedPoint(40, 40, 0.7) else self.taskBtn:removeRedPoint() end @@ -812,13 +812,13 @@ function MainCityUI:refreshBottomRp() local uiMap = self.root:genAllChildren() local heroRpObj = uiMap["main_ui.bottom_node.icons.ui_spine_obj_2.rp_node"] if DataManager.HeroData:getRp() then - heroRpObj:addRedPoint(0, 0, 1) + heroRpObj:addRedPoint(0, 0, 0.7) else heroRpObj:removeRedPoint() end local shopRpObj = uiMap["main_ui.bottom_node.icons.ui_spine_obj_3.rp_node"] if DataManager.ShopData:getRp() then - shopRpObj:addRedPoint(0, 0, 1) + shopRpObj:addRedPoint(0, 0, 0.7) else shopRpObj:removeRedPoint() end diff --git a/lua/app/ui/shop/box_level_ui.lua b/lua/app/ui/shop/box_level_ui.lua index a68b31ac..afb4e430 100644 --- a/lua/app/ui/shop/box_level_ui.lua +++ b/lua/app/ui/shop/box_level_ui.lua @@ -1,7 +1,7 @@ local BoxLevelUI = class("BoxLevelUI", BaseUI) -local BASE_CELL_HEIGHT = 200 -local BG_WITHOUT_3_BOX_HEIGHT = 638 +local BOX_3_CELL_HEIGHT = 260 +local BG_WITHOUT_3_BOX_HEIGHT = 660 function BoxLevelUI:ctor(params) params = params or {} @@ -24,11 +24,13 @@ function BoxLevelUI:onLoadRootComplete() self.bg = self.uiMap["box_level_ui.bg"] self.titleTx = self.uiMap["box_level_ui.bg.title_img.title"] + self.titleTx:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_27)) self.lvTx = self.uiMap["box_level_ui.bg.lv_node.lv_bg.text"] self.leftArrow = self.uiMap["box_level_ui.bg.lv_node.left_arrow"] self.rightArrow = self.uiMap["box_level_ui.bg.lv_node.right_arrow"] self.box1Node = self.uiMap["box_level_ui.bg.box_1"] + self.box1AddBg = self.uiMap["box_level_ui.bg.box_1.bg_img"] self.box1Add1Node = self.uiMap["box_level_ui.bg.box_1.add_node_1"] self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add1Text = self.uiMap["box_level_ui.bg.box_1.add_node_1.text"] @@ -39,6 +41,7 @@ function BoxLevelUI:onLoadRootComplete() self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box2Node = self.uiMap["box_level_ui.bg.box_2"] + self.box2AddBg = self.uiMap["box_level_ui.bg.box_2.bg_img"] self.box2Add1Node = self.uiMap["box_level_ui.bg.box_2.add_node_1"] self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_ui.bg.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add1Text = self.uiMap["box_level_ui.bg.box_2.add_node_1.text"] @@ -99,14 +102,16 @@ function BoxLevelUI:refresh() self.bg:setSizeDeltaY(BG_WITHOUT_3_BOX_HEIGHT) else self.box3Node:setVisible(true) - self.bg:setSizeDeltaY(BG_WITHOUT_3_BOX_HEIGHT + BASE_CELL_HEIGHT) + self.bg:setSizeDeltaY(BG_WITHOUT_3_BOX_HEIGHT + BOX_3_CELL_HEIGHT) end if self.level == 1 then + self.box1AddBg:setVisible(false) self.box1Add1Node:setVisible(false) self.box1Add2Node:setVisible(false) self.box1Desc:setVisible(true) + self.box2AddBg:setVisible(false) self.box2Add1Node:setVisible(false) self.box2Add2Node:setVisible(false) self.box2Desc:setVisible(true) @@ -115,10 +120,12 @@ function BoxLevelUI:refresh() self.box3Add2Node:setVisible(false) self.box3Desc:setVisible(true) else + self.box1AddBg:setVisible(false) self.box1Add1Node:setVisible(false) self.box1Add2Node:setVisible(false) self.box1Desc:setVisible(false) + self.box2AddBg:setVisible(false) self.box2Add1Node:setVisible(false) self.box2Add2Node:setVisible(false) self.box2Desc:setVisible(false) @@ -133,6 +140,7 @@ function BoxLevelUI:refresh() local count = #reward1 if count == 1 then + self.box1AddBg:setVisible(true) self.box1Add1Node:setVisible(true) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:setNum("") @@ -141,6 +149,7 @@ function BoxLevelUI:refresh() end) self.box1Add1Text:setText("+" .. tostring(reward1[1].num)) else + self.box1AddBg:setVisible(true) self.box1Add1Node:setVisible(true) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:setNum("") @@ -160,6 +169,7 @@ function BoxLevelUI:refresh() local count = #reward2 if count == 1 then + self.box2AddBg:setVisible(true) self.box2Add1Node:setVisible(true) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:setNum("") @@ -168,6 +178,7 @@ function BoxLevelUI:refresh() end) self.box2Add1Text:setText("+" .. tostring(reward2[1].num)) else + self.box2AddBg:setVisible(true) self.box2Add1Node:setVisible(true) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:setNum("") diff --git a/lua/app/ui/shop/box_level_up_ui.lua b/lua/app/ui/shop/box_level_up_ui.lua index 5e1fd8c8..f8e55916 100644 --- a/lua/app/ui/shop/box_level_up_ui.lua +++ b/lua/app/ui/shop/box_level_up_ui.lua @@ -23,6 +23,7 @@ function BoxLevelUpUI:onLoadRootComplete() self.lvTx = self.uiMap["box_level_up_ui.lv_up.text"] self.box1Node = self.uiMap["box_level_up_ui.box_1"] + self.box1AddBg = self.uiMap["box_level_up_ui.box_1.bg_img"] self.box1Add1Node = self.uiMap["box_level_up_ui.box_1.add_node_1"] self.box1Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_1.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box1Add1Text = self.uiMap["box_level_up_ui.box_1.add_node_1.text"] @@ -33,6 +34,7 @@ function BoxLevelUpUI:onLoadRootComplete() self.box1Desc:setText(I18N:getGlobalText(I18N.GlobalConst.SHOP_DESC_4)) -- 无额外奖励加成 self.box2Node = self.uiMap["box_level_up_ui.box_2"] + self.box2AddBg = self.uiMap["box_level_up_ui.box_2.bg_img"] self.box2Add1Node = self.uiMap["box_level_up_ui.box_2.add_node_1"] self.box2Add1ItemCell = CellManager:addCellComp(self.uiMap["box_level_up_ui.box_2.add_node_1.item_cell"], GConst.TYPEOF_LUA_CLASS.ITEM_CELL) self.box2Add1Text = self.uiMap["box_level_up_ui.box_2.add_node_1.text"] @@ -62,10 +64,12 @@ function BoxLevelUpUI:refresh() self.lvTx:setText("Lv." .. tostring(self.level)) self.closeTx:setText(I18N:getGlobalText(I18N.GlobalConst.CLICK_TO_CONTINUE)) -- 点击继续 + self.box1AddBg:setVisible(false) self.box1Add1Node:setVisible(false) self.box1Add2Node:setVisible(false) self.box1Desc:setVisible(false) + self.box2AddBg:setVisible(false) self.box2Add1Node:setVisible(false) self.box2Add2Node:setVisible(false) self.box2Desc:setVisible(false) @@ -80,6 +84,7 @@ function BoxLevelUpUI:refresh() local count = #reward1 if count == 1 then + self.box1AddBg:setVisible(true) self.box1Add1Node:setVisible(true) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:setNum("") @@ -88,6 +93,7 @@ function BoxLevelUpUI:refresh() end) self.box1Add1Text:setText("+" .. tostring(reward1[1].num)) else + self.box1AddBg:setVisible(true) self.box1Add1Node:setVisible(true) self.box1Add1ItemCell:refreshByCfg(reward1[1].id, 0) self.box1Add1ItemCell:setNum("") @@ -107,6 +113,7 @@ function BoxLevelUpUI:refresh() local count = #reward2 if count == 1 then + self.box2AddBg:setVisible(true) self.box2Add1Node:setVisible(true) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:setNum("") @@ -115,6 +122,7 @@ function BoxLevelUpUI:refresh() end) self.box2Add1Text:setText("+" .. tostring(reward2[1].num)) else + self.box2AddBg:setVisible(true) self.box2Add1Node:setVisible(true) self.box2Add1ItemCell:refreshByCfg(reward2[1].id, 0) self.box2Add1ItemCell:setNum("") diff --git a/lua/app/ui/shop/box_reward_ui.lua b/lua/app/ui/shop/box_reward_ui.lua index 88b3010b..eedde5a1 100644 --- a/lua/app/ui/shop/box_reward_ui.lua +++ b/lua/app/ui/shop/box_reward_ui.lua @@ -50,10 +50,6 @@ function BoxRewardUI:ctor(params) for id, count in pairs(fragmentMap) do table.insert(self.fragmentRewards, {id = id, count = count}) end - - for i = 1, 10 do - table.insert(self.fragmentRewards, {id = 12001, count = 100}) - end end function BoxRewardUI:isFullScreen()