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

# Conflicts: # lua/app/config/chapter_dungeon_gold.lua # lua/app/module/dungeon/dungeon_manager.lua
2023-06-12 18:50:40 +08:00 · 2023-06-12 18:50:40 +08:00 · f20f435227
commit f20f435227
parent 30bfbb5476 decabd89ee
8 changed files with 84 additions and 56 deletions
--- a/lua/app/config/chapter_dungeon_gold.lua
+++ b/lua/app/config/chapter_dungeon_gold.lua
@ -25,7 +25,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[2]={
 		["scene"]="bg_11",
@ -53,7 +53,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[3]={
 		["scene"]="bg_11",
@ -81,7 +81,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[4]={
 		["scene"]="bg_11",
@ -109,7 +109,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[5]={
 		["scene"]="bg_11",
@ -137,7 +137,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[6]={
 		["scene"]="bg_11",
@ -165,7 +165,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[7]={
 		["scene"]="bg_11",
@ -193,7 +193,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[8]={
 		["scene"]="bg_11",
@ -221,7 +221,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[9]={
 		["scene"]="bg_11",
@ -249,7 +249,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[10]={
 		["scene"]="bg_11",
@ -277,7 +277,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[11]={
 		["scene"]="bg_11",
@ -305,7 +305,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[12]={
 		["scene"]="bg_11",
@ -333,7 +333,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[13]={
 		["scene"]="bg_11",
@ -361,7 +361,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[14]={
 		["scene"]="bg_11",
@ -389,7 +389,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[15]={
 		["scene"]="bg_11",
@ -417,7 +417,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[16]={
 		["scene"]="bg_11",
@ -445,7 +445,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[17]={
 		["scene"]="bg_11",
@ -473,7 +473,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[18]={
 		["scene"]="bg_11",
@ -501,7 +501,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[19]={
 		["scene"]="bg_11",
@ -529,7 +529,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[20]={
 		["scene"]="bg_11",
@ -557,7 +557,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[21]={
 		["scene"]="bg_11",
@ -585,7 +585,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[22]={
 		["scene"]="bg_11",
@ -613,7 +613,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[23]={
 		["scene"]="bg_11",
@ -641,7 +641,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[24]={
 		["scene"]="bg_11",
@ -669,7 +669,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[25]={
 		["scene"]="bg_11",
@ -697,7 +697,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[26]={
 		["scene"]="bg_11",
@ -725,7 +725,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[27]={
 		["scene"]="bg_11",
@ -753,7 +753,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[28]={
 		["scene"]="bg_11",
@ -781,7 +781,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[29]={
 		["scene"]="bg_11",
@ -809,7 +809,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	},
 	[30]={
 		["scene"]="bg_11",
@ -837,7 +837,7 @@ local chapter_dungeon_gold = {
 			["num"]=1000,
 			["num_for_nothing"]="VwhcAw=="
 		},
-		["wave_limit"]=5
+		["wave_limit"]=15
 	}
 }
 local config = {
--- a/lua/app/module/dungeon/dungeon_manager.lua
+++ b/lua/app/module/dungeon/dungeon_manager.lua
@ -38,7 +38,7 @@ end
 function DungeonManager:reqChallengeGold(id)
    local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
    -- 判断次数
-    if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then
+    if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
        return
    end
@ -92,7 +92,7 @@ end
 function DungeonManager:reqSweepGold(id)
    local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
    -- 判断次数
-    if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then
+    if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
        return
    end
@ -125,7 +125,7 @@ end
 function DungeonManager:reqChallengeShards(id)
    local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_GOLD
    -- 判断次数
-    if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then
+    if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
        return
    end
@ -178,7 +178,7 @@ end
 function DungeonManager:reqSweepShards(id)
    local moduleKey = ModuleManager.MODULE_KEY.DUNGEON_SHARDS
    -- 判断次数
-    if DataManager.DungeonData:getRemainTimes(moduleKey) <= 0 then
+    if not (DataManager.DungeonData:getRemainTimes(moduleKey) > 0) then
        GFunc.showToast(I18N:getGlobalText(I18N.GlobalConst.DAILY_CHALLENGE_DESC_1))
        return
    end
--- a/lua/app/ui/dungeon/dungeon_board_cell.lua
+++ b/lua/app/ui/dungeon/dungeon_board_cell.lua
@ -39,7 +39,6 @@ function DungeonBoardCell:refreshInfo()
    self.txOpen:setText(DataManager.DungeonData:getOpenTimeDesc(self.moduleKey))
    self.icon:setSprite(DataManager.DungeonData:getIcon(self.moduleKey))
    -- self.baseObject:setTexture("assets/arts/textures/background/fund/fund_bg_1.png")
-    -- self.iconBuff:setSprite(GConst.ATLAS_PATH.ICON_BUFF, "")

    if DataManager.DungeonData:isActive(self.moduleKey) then
        self.btnStart:setVisible(true)
@ -81,7 +80,6 @@ function DungeonBoardCell:refreshRewards()
        self.scrollRect:addRefreshCallback(function(index, cell)
            cell:refreshItemById(rewards[index], 0)
        end)
-        self.scrollRect:setTotalCount(#rewards)
    else
        rewards = DataManager.DungeonData:getBoardShowRewardIcon(self.moduleKey)
        -- 展示icon图片
@ -91,8 +89,8 @@ function DungeonBoardCell:refreshRewards()
            cell:setVisibleFragment(false)
            cell:setTouchEnable(false)
        end)
-        self.scrollRect:setTotalCount(#rewards)
    end
+    self.scrollRect:setTotalCount(#rewards)
 end

 function DungeonBoardCell:refreshCountdown(txCountdown)
--- a/lua/app/ui/dungeon/dungeon_difficulty_ui.lua
+++ b/lua/app/ui/dungeon/dungeon_difficulty_ui.lua
@ -39,9 +39,14 @@ function DungeonDifficultyUI:onLoadRootComplete()
    self.arrowRight = self.uiMap["dungeon_difficulty_ui.bg.select.chapter.arrow_right"]
    self.txDesc = self.uiMap["dungeon_difficulty_ui.bg.tx_desc"]
    self.txTitle = self.uiMap["dungeon_difficulty_ui.bg.title.title_text"]
+    self.buffObj = self.uiMap["dungeon_difficulty_ui.bg.boss_buff"]
+    self.txbuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.tx_buff"]
+    self.iconBuff = self.uiMap["dungeon_difficulty_ui.bg.boss_buff.icon_buff"]
+    self.rewardFirst = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+    self.rewardPass = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_pass"]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.REWARD_CELL)
+    self.txFrist = self.uiMap["dungeon_difficulty_ui.bg.rewards.reward_first.tx_first"]

    self.txTitle:setText(DataManager.DungeonData:getTitle(self.module))
-    self.txDesc:setText(DataManager.DungeonData:getRule(self.module))
    self.txDifficulty:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_STAGE))
    self.txStart:setText(I18N:getGlobalText(I18N.GlobalConst.START_DESC))
    self.txSweep:setText(I18N:getGlobalText(I18N.GlobalConst.SMASH))
@ -49,16 +54,7 @@ function DungeonDifficultyUI:onLoadRootComplete()
    self.txStartCost:setText("-"..GFunc.getRewardNum(cost))
    self.txSweepCost:setText("-"..GFunc.getRewardNum(cost))
    self.txTime:setText(I18N:getGlobalText(I18N.GlobalConst.TODAY_REMAIN_TIMES, DataManager.DungeonData:getRemainTimes(self.module)))
-    -- todo 奖励
-    self.scrollRect = self.uiMap[""]:addLuaComponent(GConst.TYPEOF_LUA_CLASS.SCROLL_RECT_BASE)
-    self.scrollRect:addInitCallback(function()
-		return GConst.TYPEOF_LUA_CLASS.REWARD_CELL
-	end)
-	self.scrollRect:addRefreshCallback(function(index, cell)
-		cell:refreshByConfig()
-	end)
-    self.scrollRect:clearCells()
-    self.scrollRect:setTotalCount(0)
+    self.txFrist:setText(I18N:getGlobalText(I18N.GlobalConst.FIRST_PASS))

    self:refreshDifficulty()

@ -96,6 +92,34 @@ function DungeonDifficultyUI:refreshDifficulty()
    self.arrowRight:setActive(not self:isCanChallengeMaxId())
    self.btnSweep:setActive(self:isCanSweepId())
    self.txLevel:setText(tostring(self.curId))
+
+    -- buff or desc
+    local buff = DataManager.DungeonData:getBossBuff(self.module, self.curId)
+    local desc = DataManager.DungeonData:getRule(self.module)
+    if buff then
+        self.txDesc:setActive(false)
+        self.buffObj:setActive(true)
+        self.txbuff:setText("")
+        self.iconBuff:setSprite("","")
+    elseif desc then
+        self.txDesc:setActive(true)
+        self.buffObj:setActive(false)
+        self.txDesc:setText(desc)
+    else
+        self.txDesc:setActive(false)
+        self.buffObj:setActive(false)
+    end
+
+    -- 奖励
+    local rewardFirst = DataManager.DungeonData:getFirstReward(self.module, self.curId)
+    local rewardPass = DataManager.DungeonData:getPassReward(self.module, self.curId)
+    if not self:isCanSweepId() and rewardFirst then
+        self.rewardFirst:setVisible(true)
+        self.rewardFirst:refreshByConfig(rewardFirst)
+    else
+        self.rewardFirst:setVisible(false)
+    end
+    self.rewardPass:refreshByConfig(rewardPass)
 end

 -- 是否是可扫荡关卡
--- a/lua/app/userdata/dungeon/dungeon_data.lua
+++ b/lua/app/userdata/dungeon/dungeon_data.lua
@ -303,6 +303,11 @@ function DungeonData:getRule(moduleKey)
    return self.dataDungeons[moduleKey]:getRuleString()
 end

+-- 获取副本当前关卡buff
+function DungeonData:getBossBuff(moduleKey, id)
+    return self.dataDungeons[moduleKey]:getBossBuff(id)
+end
+
 -- 获取副本开启时间描述
 function DungeonData:getOpenTimeDesc(moduleKey)
    return self.dataDungeons[moduleKey]:getOpenWeekString()
--- a/lua/app/userdata/dungeon/dungeon_data_base_comp.lua
+++ b/lua/app/userdata/dungeon/dungeon_data_base_comp.lua
@ -31,8 +31,8 @@ function DungeonDataBaseComp:getRuleString()
    return nil
 end

-- 获取副本boss抗性描述(碎片副本)
-function DungeonDataBaseComp:getBossBuffString()
+-- 获取副本boss抗性(碎片副本)
+function DungeonDataBaseComp:getBossBuff(id)
    return nil
 end

--- a/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
+++ b/lua/app/userdata/dungeon/dungeon_gold_data_comp.lua
@ -26,7 +26,7 @@ function DungeonGoldDataComp:getModuleKey()
 end

 function DungeonGoldDataComp:getOpenWeekCycle()
-    return {2,4,6,7}
+    return {1,2,3,4,5,6,7}
 end

 function DungeonGoldDataComp:getConfigName()
--- a/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
+++ b/lua/app/userdata/dungeon/dungeon_shards_data_comp.lua
@ -26,7 +26,7 @@ function DungeonShardsDataComp:getModuleKey()
 end

 function DungeonShardsDataComp:getOpenWeekCycle()
-    return {1,3,5,7}
+    return {1,2,3,4,5,6,7}
 end

 function DungeonShardsDataComp:getConfigName()
@ -37,14 +37,15 @@ function DungeonShardsDataComp:getTitleString()
    return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_TITLE)
 end

-function DungeonShardsDataComp:getBossBuffString()
-    return I18N:getText("buff", buffId, "desc")
-end
-
 function DungeonShardsDataComp:getOpenWeekString()
    return I18N:getGlobalText(I18N.GlobalConst.DUNGEON_SHARDS_OPEN)
 end

+function DungeonShardsDataComp:getBossBuff(id)
+    Logger.printTable(self:getConfig()[id])
+    return self:getConfig()[id].effect
+end
+
 function DungeonShardsDataComp:getIcon()
    return GConst.ATLAS_PATH.COMMON,"common_dec_3"
 end