冲刺

lua/app/module/activity/act_sprint/act_sprint_const.lua

@@ -28,24 +28,6 @@ ActSprintConst.REFRESH_TYPE = {
     ONCE = 3,
 }
 
-ActSprintConst.MAIN_PAGE_BTN_ICON_1 = {
-	[ActSprintConst.ACT_ID.SUMMON_ALL] = {
-		[1] = "act_common_btn_27_1",
-		[2] = "act_common_btn_34_1",
-		[3] = "act_common_btn_29_1",
-		[4] = "act_common_btn_28_1",
-	},
-}
-
-ActSprintConst.MAIN_PAGE_BTN_ICON_2 = {
-	[ActSprintConst.ACT_ID.SUMMON_ALL] = {
-		[1] = "act_common_btn_27_2",
-		[2] = "act_common_btn_34_2",
-		[3] = "act_common_btn_29_2",
-		[4] = "act_common_btn_28_2",
-	},
-}
-
 ActSprintConst.BOTTOM_PAGE = {
 	SCORE_TASK = 1,
 	BOUNTY = 2,
@@ -53,13 +35,6 @@ ActSprintConst.BOTTOM_PAGE = {
 	TASK = 4,
 }
 
-ActSprintConst.MAIN_PAGE_BTN_DESC = {
-	[ActSprintConst.BOTTOM_PAGE.SCORE_TASK] 			= "ACT_GOGOGO_DESC_1",
-	[ActSprintConst.BOTTOM_PAGE.GIFT] 		        	= "ACT_GOGOGO_DESC_10",
-	[ActSprintConst.BOTTOM_PAGE.TASK] 					= "ACT_GOGOGO_DESC_11",
-	[ActSprintConst.BOTTOM_PAGE.BOUNTY] 				= "ACT_GOGOGO_DESC_20",
-}
-
 ActSprintConst.COMP = {
 	[ActSprintConst.BOTTOM_PAGE.SCORE_TASK] = "app/ui/activity/common/comp/act_score_task_comp_v1",
 	[ActSprintConst.BOTTOM_PAGE.BOUNTY] = "app/ui/activity/common/comp/act_bounty_comp_v1",

lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua

@@ -2,22 +2,22 @@ local ActBaseUI = require "app/ui/activity/common/act_base_ui"
 local ActMainUI = class("ActMainUI", ActBaseUI)
 
 local PAGE_BTN_NORMAL = {
-	"act_common_btn_27_2",
 	"act_common_btn_34_2",
-	"act_common_btn_29_2",
+	"act_common_btn_27_2",
 	"act_common_btn_28_2",
+	"act_common_btn_29_2",
 }
 local PAGE_BTN_LIGHT = {
-	"act_common_btn_27_1",
 	"act_common_btn_34_1",
-	"act_common_btn_29_1",
+	"act_common_btn_27_1",
 	"act_common_btn_28_1",
+	"act_common_btn_29_1",
 }
 local PAGE_BTN_DESC = {
 	"ACT_GOGOGO_DESC_1",
+	"ACT_GOGOGO_DESC_20",
 	"ACT_GOGOGO_DESC_10",
 	"ACT_GOGOGO_DESC_11",
-	"ACT_GOGOGO_DESC_20",
 }
 
 function ActMainUI:showCommonBG()

lua/app/ui/activity/common/cell/act_gift_cell_v1.lua

@@ -4,8 +4,8 @@ local REWARD_CELL_COUNT = 3
 local BG_NAME_1 = "act_common_bg_27" -- 售罄
 local BG_NAME_2 = "act_common_bg_28" -- 正常
 
-local BTN_NAME_1 = "common_btn_grey_5"
+local BTN_NAME_1 = "common_btn_grey_1"
-local BTN_NAME_2 = "common_btn_yellow_5"
+local BTN_NAME_2 = "common_btn_yellow_1"
 
 function ActGiftCellV1:refresh(actId, actGiftId)
 	local uiMap = self:getUIMap()

lua/app/ui/activity/common/cell/act_task_cell_v1.lua

@@ -52,7 +52,7 @@ function ActTaskCellV1:refresh(actId, actTaskId)
         gotFlag:setVisible(false)
         funcBtn:setActive(true)
         if num >= limit then
-            funcBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_5")
+            funcBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_yellow_1")
             funcTx:setText(I18N:getGlobalText(I18N.GlobalConst.BTN_CLAIM))
         else
             funcBtn:setSprite(GConst.ATLAS_PATH.COMMON, "common_btn_blue_1")

lua/app/ui/activity/common/comp/act_score_task_comp_v1.lua

@@ -8,7 +8,6 @@ function ActScoreTaskCompV1:init()
 	self.txTitle = uiMap["act_score_task_comp_v1.top.title_tx"]
 	self.txTitle2 = uiMap["act_score_task_comp_v1.top.desc_tx"]
 	self.txDesc = uiMap["act_score_task_comp_v1.top.turn_bg.desc_tx"]
-	self.txTime = uiMap["act_score_task_comp_v1.top.time_bg.time_tx"]
 	self.goBtn = uiMap["act_score_task_comp_v1.top.go_btn"]
 	self.goTx = uiMap["act_score_task_comp_v1.top.go_btn.text"]
 	self.getBtn = uiMap["act_score_task_comp_v1.top.turn_reward_bg.get_btn"]
@@ -67,7 +66,6 @@ function ActScoreTaskCompV1:refresh()
 	-- self.txTitle:setText(I18N:getGlobalText(GConst.ActSprintConst.ACT_LIST_NAME[actId]))
 	self.txTitle2:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_19))
 	self.txDesc:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_9) .. "(" .. (turn >= maxTurn and maxTurn or (turn + 1)) .. "/" .. maxTurn .. ")")
-	self.txTime:setText(Time:formatNumTimeStr(DataManager.ActSprintSummonDataAll:getRemainTime()))
 	self.goTx:setText(I18N:getGlobalText(I18N.GlobalConst.ACT_GOGOGO_DESC_14))
 	self.goBtn:addClickListener(function()
 		EventManager:dispatchEvent(EventManager.CUSTOM_EVENT.CHANGE_MAIN_CITY_PAGE, {page = GConst.MainCityConst.BOTTOM_PAGE.MAIN})
@@ -101,8 +99,4 @@ function ActScoreTaskCompV1:refresh()
 	end
 end
 
-function ActScoreTaskCompV1:updateTime()
-	self.txTime:setText(Time:formatNumTimeStr(self.data:getRemainTime()))
-end
-
 return ActScoreTaskCompV1