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

lua/app/ui/shop/cell/beginner_sell_cell.lua

@@ -5,6 +5,7 @@ local BASE_CELL_HEIGHT = 320
 function BeginnerSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["gift_cell.bg"]
+    self.bg:setTexture("assets/arts/textures/background/shop/shop_gift_banner_3.png")
 
     self.leftArrow = uiMap["gift_cell.left_arrow"]
     self.rightArrow = uiMap["gift_cell.right_arrow"]
@@ -26,13 +27,7 @@ function BeginnerSellCell:init()
     end
 
     -- 不限时时使用1类型 否则使用2类型
-    self.originPriceImg1 = uiMap["gift_cell.bg.origin_price_1"]
+    self.priceText = uiMap["gift_cell.bg.price"]
-    self.originPriceText1 = uiMap["gift_cell.bg.origin_price_1.text"]
-    self.priceText1 = uiMap["gift_cell.bg.price_1"]
-
-    self.originPriceImg2 = uiMap["gift_cell.bg.origin_price_2"]
-    self.originPriceText2 = uiMap["gift_cell.bg.origin_price_2.text"]
-    self.priceText2 = uiMap["gift_cell.bg.price_2"]
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
@@ -66,16 +61,8 @@ function BeginnerSellCell:refresh()
         end
     end
     self.reweardLayout:RefreshLayout()
-    -- 价格(使用1类型,且不显示原价)
+    -- 价格
-    self.originPriceImg1:setVisible(false)
+    self.priceText:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
-    self.originPriceText1:setVisible(false)
-    self.priceText1:setVisible(true)
-
-    self.originPriceImg2:setVisible(false)
-    self.originPriceText2:setVisible(false)
-    self.priceText2:setVisible(false)
-
-    self.priceText1:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
     -- 限时(隐藏)
     self.timeImg:setVisible(false)
 

lua/app/ui/shop/cell/chapter_cell.lua

@@ -6,6 +6,7 @@ local MAX_REWARD_COUNT = 4
 function ChapterCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["gift_cell.bg"]
+    self.bg:setTexture("assets/arts/textures/background/shop/shop_gift_banner_2.png")
 
     self.leftArrow = uiMap["gift_cell.left_arrow"]
     self.rightArrow = uiMap["gift_cell.right_arrow"]
@@ -27,13 +28,7 @@ function ChapterCell:init()
     end
 
     -- 不限时时使用1类型 否则使用2类型
-    self.originPriceImg1 = uiMap["gift_cell.bg.origin_price_1"]
+    self.priceText = uiMap["gift_cell.bg.price"]
-    self.originPriceText1 = uiMap["gift_cell.bg.origin_price_1.text"]
-    self.priceText1 = uiMap["gift_cell.bg.price_1"]
-
-    self.originPriceImg2 = uiMap["gift_cell.bg.origin_price_2"]
-    self.originPriceText2 = uiMap["gift_cell.bg.origin_price_2.text"]
-    self.priceText2 = uiMap["gift_cell.bg.price_2"]
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
@@ -82,17 +77,8 @@ function ChapterCell:refresh(idx, cfgInfo, totalCount, arrowCallback)
         end
     end
     self.reweardLayout:RefreshLayout()
-    -- 价格(使用1类型)(取消原价)
+    -- 价格
-    self.originPriceImg1:setVisible(false)
+    self.priceText:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
-    self.originPriceText1:setVisible(false)
-    self.priceText1:setVisible(true)
-
-    self.originPriceImg2:setVisible(false)
-    self.originPriceText2:setVisible(false)
-    self.priceText2:setVisible(false)
-
-    self.originPriceText1:setText(GFunc.getFormatPrice(cfgInfo.original))
-    self.priceText1:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
     -- 限时(隐藏)
     self.timeImg:setVisible(false)
 

lua/app/ui/shop/cell/coin_sell_cell.lua

@@ -5,6 +5,7 @@ local BASE_CELL_HEIGHT = 320
 function CoinSellCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["gift_cell.bg"]
+    self.bg:setTexture("assets/arts/textures/background/shop/shop_gift_banner_6.png")
 
     self.leftArrow = uiMap["gift_cell.left_arrow"]
     self.rightArrow = uiMap["gift_cell.right_arrow"]
@@ -24,15 +25,7 @@ function CoinSellCell:init()
             self.rewardCellList[i] = CellManager:addCellComp(uiMap["gift_cell.bg.reward_node.reward_cell_" .. i], GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
         end
     end
-
+    self.priceText = uiMap["gift_cell.bg.price"]
-    -- 不限时时使用1类型 否则使用2类型
-    self.originPriceImg1 = uiMap["gift_cell.bg.origin_price_1"]
-    self.originPriceText1 = uiMap["gift_cell.bg.origin_price_1.text"]
-    self.priceText1 = uiMap["gift_cell.bg.price_1"]
-
-    self.originPriceImg2 = uiMap["gift_cell.bg.origin_price_2"]
-    self.originPriceText2 = uiMap["gift_cell.bg.origin_price_2.text"]
-    self.priceText2 = uiMap["gift_cell.bg.price_2"]
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
@@ -63,16 +56,8 @@ function CoinSellCell:refresh()
             end
         end
         self.reweardLayout:RefreshLayout()
-        -- 价格(使用2类型,且不显示原价)
+        -- 价格
-        self.originPriceImg1:setVisible(false)
+        self.priceText:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
-        self.originPriceText1:setVisible(false)
-        self.priceText1:setVisible(false)
-
-        self.originPriceImg2:setVisible(false)
-        self.originPriceText2:setVisible(false)
-        self.priceText2:setVisible(true)
-
-        self.priceText2:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
         -- 限时
         self.timeImg:setVisible(true)
         self:refreshTime()
@@ -114,7 +99,7 @@ function CoinSellCell:refreshTime()
             remainTime = 0
         end
     end
-    self.timeText:setText(Time:formatNumTimeStr(remainTime))
+    self.timeText:setText(Time:formatNumTime(remainTime))
 end
 
 function CoinSellCell:getCellCount()

lua/app/ui/shop/cell/grow_cell.lua

@@ -4,6 +4,7 @@ local MAX_REWARD_COUNT = 4
 function GrowCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["gift_cell.bg"]
+    self.bg:setTexture("assets/arts/textures/background/shop/shop_gift_banner_5.png")
 
     self.leftArrow = uiMap["gift_cell.left_arrow"]
     self.rightArrow = uiMap["gift_cell.right_arrow"]
@@ -25,13 +26,7 @@ function GrowCell:init()
     end
 
     -- 不限时时使用1类型 否则使用2类型
-    self.originPriceImg1 = uiMap["gift_cell.bg.origin_price_1"]
+    self.priceText = uiMap["gift_cell.bg.price"]
-    self.originPriceText1 = uiMap["gift_cell.bg.origin_price_1.text"]
-    self.priceText1 = uiMap["gift_cell.bg.price_1"]
-
-    self.originPriceImg2 = uiMap["gift_cell.bg.origin_price_2"]
-    self.originPriceText2 = uiMap["gift_cell.bg.origin_price_2.text"]
-    self.priceText2 = uiMap["gift_cell.bg.price_2"]
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
@@ -61,16 +56,8 @@ function GrowCell:refresh(idx, gift)
         end
     end
     self.reweardLayout:RefreshLayout()
-    -- 价格(使用2类型)
+    -- 价格
-    self.originPriceImg1:setVisible(false)
+    self.priceText:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
-    self.originPriceText1:setVisible(false)
-    self.priceText1:setVisible(false)
-
-    self.originPriceImg2:setVisible(false)
-    self.originPriceText2:setVisible(false)
-    self.priceText2:setVisible(true)
-
-    self.priceText2:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
     -- 限时
     self.timeImg:setVisible(true)
     self:refreshTime()
@@ -92,7 +79,7 @@ function GrowCell:refreshTime()
     if remainTime <= 0 then
         remainTime = 0
     end
-    self.timeText:setText(Time:formatNumTimeStr(remainTime))
+    self.timeText:setText(Time:formatNumTime(remainTime))
 end
 
 function GrowCell:onClickGift(id)

lua/app/ui/shop/cell/level_cell.lua

@@ -4,6 +4,7 @@ local MAX_REWARD_COUNT = 4
 function LevelCell:init()
 	local uiMap = self.baseObject:genAllChildren()
 	self.bg = uiMap["gift_cell.bg"]
+    self.bg:setTexture("assets/arts/textures/background/shop/shop_gift_banner_4.png")
 
     self.leftArrow = uiMap["gift_cell.left_arrow"]
     self.rightArrow = uiMap["gift_cell.right_arrow"]
@@ -25,13 +26,7 @@ function LevelCell:init()
     end
 
     -- 不限时时使用1类型 否则使用2类型
-    self.originPriceImg1 = uiMap["gift_cell.bg.origin_price_1"]
+    self.priceText = uiMap["gift_cell.bg.price"]
-    self.originPriceText1 = uiMap["gift_cell.bg.origin_price_1.text"]
-    self.priceText1 = uiMap["gift_cell.bg.price_1"]
-
-    self.originPriceImg2 = uiMap["gift_cell.bg.origin_price_2"]
-    self.originPriceText2 = uiMap["gift_cell.bg.origin_price_2.text"]
-    self.priceText2 = uiMap["gift_cell.bg.price_2"]
 
     self.timeImg = uiMap["gift_cell.bg.time_img"]
     self.timeText = uiMap["gift_cell.bg.time_img.text"]
@@ -58,16 +53,8 @@ function LevelCell:refresh(idx, cfgInfo, clickCallback)
         end
     end
     self.reweardLayout:RefreshLayout()
-    -- 价格(使用1类型)
+    -- 价格
-    self.originPriceImg1:setVisible(false)
+    self.priceText:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
-    self.originPriceText1:setVisible(false)
-    self.priceText1:setVisible(true)
-
-    self.originPriceImg2:setVisible(false)
-    self.originPriceText2:setVisible(false)
-    self.priceText2:setVisible(false)
-
-    self.priceText1:setText(GFunc.getFormatPrice(cfgInfo.recharge_id))
     -- 限时(隐藏)
     self.timeImg:setVisible(false)