符文副本

lua/app/module/dungeon_rune/dungeon_rune_manager.lua

@@ -36,20 +36,19 @@ function DungeonRuneManager:reqFight(id)
         return
     end
 
-    -- local passed = runeData:passedChapter(id)
+    local passed = runeData:passedChapter(id)
-    -- if not passed and not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GLOD_WING, 1, true) then
+    if not passed and not GFunc.checkCost(GConst.ItemConst.ITEM_ID_GLOD_WING, 1, true) then
-    --     return
+        return
-    -- end
+    end
 
-    -- local heroes = {}
+    local heroes = {}
-    -- local formation = DataManager.FormationData:getDungeonRuneFormation()
+    local formation = DataManager.FormationData:getDungeonRuneFormation()
-    -- for matchType, heroId in pairs(formation) do
+    for matchType, heroId in pairs(formation) do
-    --     if heroId > 0 then
+        if heroId > 0 then
-    --         table.insert(heroes, heroId)
+            table.insert(heroes, heroId)
-    --     end
+        end
-    -- end
+    end
-    -- self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeStartReq, {id = id, heroes = heroes}, {}, self.rspFight, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_START)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeStartReq, {id = id, heroes = heroes}, {}, self.rspFight, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_START)
-    self:rspFight({err_code = GConst.ERROR_STR.SUCCESS, reqData = {id = id}})
 end
 
 function DungeonRuneManager:rspFight(result)
@@ -126,7 +125,7 @@ function DungeonRuneManager:reqSweep(id)
         return
     end
 
-    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneChallengeFarmReq, {chapter_weapon_id = id}, {}, self.rspSweep, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_SWEEP)
+    self:sendMessage(ProtoMsgType.FromMsgEnum.ChapterRuneFarmReq, {id = id}, {}, self.rspSweep, BIReport.ITEM_GET_TYPE.DUNGEON_RUNE_SWEEP)
 end
 
 function DungeonRuneManager:rspSweep(result)

lua/app/proto/proto_msg_type.lua

@@ -61,6 +61,8 @@ local ProtoMsgType = {
         [1068771132] = "ReconnectRsp",
         [1070841461] = "LoginReq",
         [1070843294] = "LoginRsp",
+        [1150265172] = "ActivityPVPDailyRewardsReq",
+        [1150267005] = "ActivityPVPDailyRewardsRsp",
         [1163725920] = "ChapterRuneAdReq",
         [1163727753] = "ChapterRuneAdRsp",
         [1283733956] = "ActivityPVPMatchReq",
@@ -150,8 +152,6 @@ local ProtoMsgType = {
         [2524881546] = "PVPRecordHistoryRsp",
         [2553351971] = "ChapterDailyChallengeStartReq",
         [2553353804] = "ChapterDailyChallengeStartRsp",
-        [2566705464] = "ChapterRuneChallengeFarmReq",
-        [2566707297] = "ChapterRuneChallengeFarmRsp",
         [2581180989] = "MailListReq",
         [2581182822] = "MailListRsp",
         [2620369240] = "SevenDayRewardReq",
@@ -206,13 +206,9 @@ local ProtoMsgType = {
         [3224232332] = "SevenDayTaskRewardRsp",
         [3274332802] = "BossRushBountyUnlockReq",
         [3274334635] = "BossRushBountyUnlockRsp",
-        [3289898743] = "ChapterRuneRankReq",
-        [3289900576] = "ChapterRuneRankRsp",
         [3309820798] = "HeroPutOnReq",
         [3309822631] = "HeroPutOnRsp",
         [3341173994] = "BountyBoughtNtf",
-        [3353409448] = "ChapterRuneRankRewardReq",
-        [3353411281] = "ChapterRuneRankRewardRsp",
         [3359969683] = "ChapterGoldChallengeSettlementReq",
         [3359971516] = "ChapterGoldChallengeSettlementRsp",
         [3363939655] = "TaskDailyAdReq",
@@ -250,8 +246,6 @@ local ProtoMsgType = {
         [3739568306] = "SummerDataRsp",
         [3741702491] = "MallDailyOverDayReq",
         [3741704324] = "MallDailyOverDayRsp",
-        [3742313244] = "ChapterRunePlayerInfoReq",
-        [3742315077] = "ChapterRunePlayerInfoRsp",
         [3757169544] = "BountyRewardReq",
         [3757171377] = "BountyRewardRsp",
         [3762291611] = "ActivityPVPStartReq",
@@ -355,6 +349,8 @@ local ProtoMsgType = {
         ReconnectRsp = 1068771132,
         LoginReq = 1070841461,
         LoginRsp = 1070843294,
+        ActivityPVPDailyRewardsReq = 1150265172,
+        ActivityPVPDailyRewardsRsp = 1150267005,
         ChapterRuneAdReq = 1163725920,
         ChapterRuneAdRsp = 1163727753,
         ActivityPVPMatchReq = 1283733956,
@@ -444,8 +440,6 @@ local ProtoMsgType = {
         PVPRecordHistoryRsp = 2524881546,
         ChapterDailyChallengeStartReq = 2553351971,
         ChapterDailyChallengeStartRsp = 2553353804,
-        ChapterRuneChallengeFarmReq = 2566705464,
-        ChapterRuneChallengeFarmRsp = 2566707297,
         MailListReq = 2581180989,
         MailListRsp = 2581182822,
         SevenDayRewardReq = 2620369240,
@@ -500,13 +494,9 @@ local ProtoMsgType = {
         SevenDayTaskRewardRsp = 3224232332,
         BossRushBountyUnlockReq = 3274332802,
         BossRushBountyUnlockRsp = 3274334635,
-        ChapterRuneRankReq = 3289898743,
-        ChapterRuneRankRsp = 3289900576,
         HeroPutOnReq = 3309820798,
         HeroPutOnRsp = 3309822631,
         BountyBoughtNtf = 3341173994,
-        ChapterRuneRankRewardReq = 3353409448,
-        ChapterRuneRankRewardRsp = 3353411281,
         ChapterGoldChallengeSettlementReq = 3359969683,
         ChapterGoldChallengeSettlementRsp = 3359971516,
         TaskDailyAdReq = 3363939655,
@@ -544,8 +534,6 @@ local ProtoMsgType = {
         SummerDataRsp = 3739568306,
         MallDailyOverDayReq = 3741702491,
         MallDailyOverDayRsp = 3741704324,
-        ChapterRunePlayerInfoReq = 3742313244,
-        ChapterRunePlayerInfoRsp = 3742315077,
         BountyRewardReq = 3757169544,
         BountyRewardRsp = 3757171377,
         ActivityPVPStartReq = 3762291611,
@@ -649,6 +637,8 @@ local ProtoMsgType = {
         ReconnectRsp = "ReconnectRsp",
         LoginReq = "LoginReq",
         LoginRsp = "LoginRsp",
+        ActivityPVPDailyRewardsReq = "ActivityPVPDailyRewardsReq",
+        ActivityPVPDailyRewardsRsp = "ActivityPVPDailyRewardsRsp",
         ChapterRuneAdReq = "ChapterRuneAdReq",
         ChapterRuneAdRsp = "ChapterRuneAdRsp",
         ActivityPVPMatchReq = "ActivityPVPMatchReq",
@@ -738,8 +728,6 @@ local ProtoMsgType = {
         PVPRecordHistoryRsp = "PVPRecordHistoryRsp",
         ChapterDailyChallengeStartReq = "ChapterDailyChallengeStartReq",
         ChapterDailyChallengeStartRsp = "ChapterDailyChallengeStartRsp",
-        ChapterRuneChallengeFarmReq = "ChapterRuneChallengeFarmReq",
-        ChapterRuneChallengeFarmRsp = "ChapterRuneChallengeFarmRsp",
         MailListReq = "MailListReq",
         MailListRsp = "MailListRsp",
         SevenDayRewardReq = "SevenDayRewardReq",
@@ -794,13 +782,9 @@ local ProtoMsgType = {
         SevenDayTaskRewardRsp = "SevenDayTaskRewardRsp",
         BossRushBountyUnlockReq = "BossRushBountyUnlockReq",
         BossRushBountyUnlockRsp = "BossRushBountyUnlockRsp",
-        ChapterRuneRankReq = "ChapterRuneRankReq",
-        ChapterRuneRankRsp = "ChapterRuneRankRsp",
         HeroPutOnReq = "HeroPutOnReq",
         HeroPutOnRsp = "HeroPutOnRsp",
         BountyBoughtNtf = "BountyBoughtNtf",
-        ChapterRuneRankRewardReq = "ChapterRuneRankRewardReq",
-        ChapterRuneRankRewardRsp = "ChapterRuneRankRewardRsp",
         ChapterGoldChallengeSettlementReq = "ChapterGoldChallengeSettlementReq",
         ChapterGoldChallengeSettlementRsp = "ChapterGoldChallengeSettlementRsp",
         TaskDailyAdReq = "TaskDailyAdReq",
@@ -838,8 +822,6 @@ local ProtoMsgType = {
         SummerDataRsp = "SummerDataRsp",
         MallDailyOverDayReq = "MallDailyOverDayReq",
         MallDailyOverDayRsp = "MallDailyOverDayRsp",
-        ChapterRunePlayerInfoReq = "ChapterRunePlayerInfoReq",
-        ChapterRunePlayerInfoRsp = "ChapterRunePlayerInfoRsp",
         BountyRewardReq = "BountyRewardReq",
         BountyRewardRsp = "BountyRewardRsp",
         ActivityPVPStartReq = "ActivityPVPStartReq",

lua/app/ui/battle/battle_rune_result_ui.lua

@@ -86,6 +86,8 @@ function BattleRuneResultUI:onLoadRootComplete()
     self.descRoundMin = uiMap["battle_rune_result_ui.reward_node.desc"]
     self.imgRoundmIn = uiMap["battle_rune_result_ui.reward_node.icon"]
     self.imgRoundNew = uiMap["battle_rune_result_ui.reward_node.icon_new"]
+    self.descRoundMin:setVisible(false)
+    self.imgRoundmIn:setVisible(false)
 
     -- 任务节点
     self.taskNode = uiMap["battle_rune_result_ui.task_node"]
@@ -278,10 +280,10 @@ function BattleRuneResultUI:refreshRewards()
 	end
     self.rewardScrollRectComp:refillCells(rewardCount)
 
-    local id = self.chapterId
+    -- local id = self.chapterId
-    self.descRoundMin:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, self.runeData:getChapterPassRound(id)))
+    -- self.descRoundMin:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, self.runeData:getChapterPassRound(id)))
-    GFunc.centerImgAndTx(self.imgRoundmIn, self.descRoundMin, 10)
+    -- GFunc.centerImgAndTx(self.imgRoundmIn, self.descRoundMin, 10)
-    self.imgRoundNew:setVisible(self.runeData:getTagRoundNew() == true)
+    -- self.imgRoundNew:setVisible(self.runeData:getTagRoundNew() == true)
 end
 
 function BattleRuneResultUI:refreshUnitInfo()

lua/app/ui/dungeon_rune/cell/rune_chapter_cell.lua

@@ -59,9 +59,9 @@ function RuneChapterCell:refresh(id, index, isFinal, chapterListCount)
             end
             lock:setVisible(false)
             layer:setAnchoredPositionX(0)
-            lightImg:setVisible(true)
+            -- lightImg:setVisible(true)
-            descMinRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, runeData:getChapterPassRound(id)))
+            -- descMinRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, runeData:getChapterPassRound(id)))
-            descMinRound:setVisible(true)
+            -- descMinRound:setVisible(true)
         else
             lock:setVisible(true)
             GFunc.centerImgAndTx(lock, layer, 5)

lua/app/ui/dungeon_rune/dungeon_rune_boss_fight_ui.lua

@@ -104,9 +104,12 @@ function DungeonRuneBossFightUI:refreshRewardInfo()
     local rewards = self.runeData:getChapterRewards(self.id)
     if passed then
         title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_4))
-        local round = self.runeData:getChapterPassRound(self.id)
+        -- local round = self.runeData:getChapterPassRound(self.id)
-        descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        imgPassIcon:setActive(false)
-        imgPassIcon:setActive(true)
+        descPassRound:setText(GConst.EMPTY_STRING)
+        descPassRound:setAnchoredPositionX(0)
+        -- descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        -- imgPassIcon:setActive(true)
         GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5)
         rewards = self.runeData:getChapterSweepRewards(self.id)
     else

lua/app/ui/dungeon_rune/dungeon_rune_fight_ui.lua

@@ -76,9 +76,11 @@ function DungeonRuneFightUI:refreshRewardInfo()
     descPassRound:setVisible(passed)
     imgPassIcon:setVisible(passed)
     if passed then
-        local round = self.runeData:getChapterPassRound(self.id)
+        descPassRound:setVisible(false)
-        descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        imgPassIcon:setVisible(false)
-        GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5)
+        -- local round = self.runeData:getChapterPassRound(self.id)
+        -- descPassRound:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_MIN, round))
+        -- GFunc.centerImgAndTx(imgPassIcon, descPassRound, 5)
     else
         if not self.rewardCells then
             self.rewardCells = {}
@@ -121,7 +123,8 @@ function DungeonRuneFightUI:refreshFightBtn()
     descAgain:setVisible(passed)
     if passed then
         descAgain:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_2))
-        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_6))
+        -- title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_6))
+        title:setText(I18N:getGlobalText(I18N.GlobalConst.DUNGEON_RUNE_DESC_3))
     else
         desc:setText(I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE))
         num:setText(1)