From 5fcf27a6594c3b534c1af89b1bef5e1881a14bd9 Mon Sep 17 00:00:00 2001
From: Fang <ky_fang@juzugame.com>
Date: Tue, 25 Jul 2023 15:43:33 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E9=87=91ad=E5=A5=96=E5=8A=B1=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BAfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/chapter_dungeon_equip.lua          | 2 +-
 lua/app/userdata/dungeon/dungeon_armor_entity.lua | 8 ++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/lua/app/config/chapter_dungeon_equip.lua b/lua/app/config/chapter_dungeon_equip.lua
index 8d742c4c..8c741473 100644
--- a/lua/app/config/chapter_dungeon_equip.lua
+++ b/lua/app/config/chapter_dungeon_equip.lua
@@ -1,6 +1,6 @@
 local chapter_dungeon_equip = {
 	[1]={
-		["level"]=5,
+		["level"]=1,
 		["scene"]="dungeon_equip",
 		["block_icon"]="battle_hinder_13",
 		["chess_board"]="chessboard_2",
diff --git a/lua/app/userdata/dungeon/dungeon_armor_entity.lua b/lua/app/userdata/dungeon/dungeon_armor_entity.lua
index 4cae838d..dbecbc47 100644
--- a/lua/app/userdata/dungeon/dungeon_armor_entity.lua
+++ b/lua/app/userdata/dungeon/dungeon_armor_entity.lua
@@ -18,13 +18,12 @@ function DungeonArmorEntity:init(data)
     self.starRewards = data.star_rewards or {}
     self.fundRewards = data.fund_rewards
     self.totalChallengeCount = data.total_challenge_count
-    self.fundAd = data.ad or false
 
     self:updateGift(data.gift_info)
     DataManager.FormationData:initDungeonArmor(self.heroes)
 
     DataManager:registerCrossDayFunc("DungeonArmorEntity", function()
-        self.fundAd = false
+        self.fundRewards[FUND_AD_REWARD_ID] = false
         self.farmCount = table.clearOrCreate(self.farmCount)
         self:setDirty()
     end)
@@ -487,7 +486,7 @@ end
 
 -- 是否有可领取的基金奖励
 function DungeonArmorEntity:hasCanGetFundReward()
-    for index, id in ipairs(self:getFundStageRewardIds(self:getCurFundStage())) do
+    for index, id in ipairs(self:getFundRewardIdsSort(self:getCurFundStage())) do
         if self:isCanGetFundReward(id) and not self:isGotFundReward(id) then
             return true
         end
@@ -497,9 +496,6 @@ end
 
 -- 是否已领取基金奖励
 function DungeonArmorEntity:isGotFundReward(id)
-    if id == FUND_AD_REWARD_ID then
-        self.fundAd = true
-    end
     return self.fundRewards and self.fundRewards[id]
 end