From bb93a7e8b4441de03ff64425d33016f4d824ee3e Mon Sep 17 00:00:00 2001
From: puxuan <413323644@qq.com>
Date: Thu, 21 Aug 2025 18:25:36 +0800
Subject: [PATCH] fix bug

---
 lua/app/module/summon/summon_manager.lua    |  1 +
 lua/app/ui/summon/cell/summon_hero_cell.lua |  2 +-
 lua/app/ui/summon/summon_main_ui.lua        |  6 +++---
 lua/app/ui/summon/summon_odds_ui.lua        |  6 +++++-
 lua/app/ui/summon/summon_reward_ui.lua      | 10 +++++-----
 lua/app/userdata/summon/summon_data.lua     |  1 +
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/lua/app/module/summon/summon_manager.lua b/lua/app/module/summon/summon_manager.lua
index 8218629b..bb82bc48 100644
--- a/lua/app/module/summon/summon_manager.lua
+++ b/lua/app/module/summon/summon_manager.lua
@@ -102,6 +102,7 @@ function SummonManager:onSummonWishClaimRsp(result)
 		return
 	end
 	DataManager.SummonData:summonWishClaim()
+	GFunc.showRewardBox(result.rewards)
 	-- local newForce = {}
 	-- for _, reward in pairs(result.rewards) do
 	-- 	local isNew = DataManager.ForceData:getForceIsNew(reward.item.id)
diff --git a/lua/app/ui/summon/cell/summon_hero_cell.lua b/lua/app/ui/summon/cell/summon_hero_cell.lua
index 46b89049..e4d11ef2 100755
--- a/lua/app/ui/summon/cell/summon_hero_cell.lua
+++ b/lua/app/ui/summon/cell/summon_hero_cell.lua
@@ -77,7 +77,7 @@ function SummonBallCell:refreshInfo(heroId)
 	self.nameTx:setText(ModuleManager.HeroManager:getHeroName(heroId))
 
 	self.countTx:setText("")
-	self.infoBtn:setActive(false)
+	self.infoBtn:setActive(true)
 	self.selectImg:setVisible(false)
 	self.icon:setActive(true)
 	self.heroDec:setActive(true)
diff --git a/lua/app/ui/summon/summon_main_ui.lua b/lua/app/ui/summon/summon_main_ui.lua
index dd43e150..fade3c95 100755
--- a/lua/app/ui/summon/summon_main_ui.lua
+++ b/lua/app/ui/summon/summon_main_ui.lua
@@ -131,8 +131,8 @@ function SummonMainUI:onLoadRootComplete()
 	-- 	self.heroTips[i].txDesc = uiMap['summon_main_ui.node.hero_'..i..'.tx_hero_desc']
 	-- end
 	self.btnTxs = {
-		I18N:getGlobalText(I18N.GlobalConst.TASK_DAILY),
-		I18N:getGlobalText(I18N.GlobalConst.TASK_CHALLENGE),
+		I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_6),
+		I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_7),
 	}
 	self.pageBtns = {}
 	self.pageBtnTxs = {}
@@ -179,7 +179,7 @@ function SummonMainUI:onLoadRootComplete()
 			local wishCount = DataManager.SummonData:getSummonWishCount(self.page)
 			if wishCount >= wishGuarantee and wishHeroId ~= 0 then
 				--发送领取奖励的协议
-				ModuleManager.SummonManager:onSummonWishClaimReq()
+				ModuleManager.SummonManager:onSummonWishClaimReq(self.page)
 			else
 				--打开设置心愿界面
 				ModuleManager.SummonManager:showSummonWishUI(self.page)
diff --git a/lua/app/ui/summon/summon_odds_ui.lua b/lua/app/ui/summon/summon_odds_ui.lua
index cf6e21a5..ef9d6196 100755
--- a/lua/app/ui/summon/summon_odds_ui.lua
+++ b/lua/app/ui/summon/summon_odds_ui.lua
@@ -18,7 +18,11 @@ end
 function SummonOddsUI:onLoadRootComplete()
     local uiMap = self.root:genAllChildren()
     uiMap["summon_odds_ui.bg.tx_title"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_4))
-    uiMap["summon_odds_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_3))
+    if self.page == 1 then
+        uiMap["summon_odds_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_5))
+    else
+        uiMap["summon_odds_ui.bg.desc_tx"]:setText(I18N:getGlobalText(I18N.GlobalConst.SUMMON_DESC_3))
+    end
 
     self.content = uiMap["summon_odds_ui.bg.target_node.bg.scrollrect.viewport.content"]
     self.layout_content = self.content:getComponent(GConst.TYPEOF_UNITY_CLASS.BF_HORIZONTAL_OR_VERTICAL_LAYOUT)
diff --git a/lua/app/ui/summon/summon_reward_ui.lua b/lua/app/ui/summon/summon_reward_ui.lua
index 3f02828a..cd036585 100755
--- a/lua/app/ui/summon/summon_reward_ui.lua
+++ b/lua/app/ui/summon/summon_reward_ui.lua
@@ -110,6 +110,7 @@ function SummonRewardUI:refreshSummonBtn()
 	self.btnSummonAd:setActive(adCount > 0)
 	self.btnSummonFree:setActive(freeCount > 0)
 	self.btnSummonOne:setActive(freeCount <= 0)
+	self.btnSummonTen:setActive(true)
 	if freeCount <= 0 then
 		if count >= 1 then
 			self.txNumOne:setText(1)
@@ -158,6 +159,8 @@ function SummonRewardUI:onRefresh()
 	self.btnGet:setActive(false)
 	self.btnSummonOne:setActive(false)
 	self.btnSummonTen:setActive(false)
+	self.btnSummonAd:setActive(false)
+	self.btnSummonFree:setActive(false)
 	self.tranBg:removeClickListener()
 	if #self.rewards == 1 then
 		self.goOne:setActive(true)
@@ -174,8 +177,7 @@ function SummonRewardUI:onRefresh()
 			self:checkUnlockMap()
 			self.btnGet:setActive(true)
 			if not self.isWish then
-				self.btnSummonOne:setActive(true)
-				self.btnSummonTen:setActive(true)
+				self:refreshSummonBtn()
 			end
 			self.tranBg:addClickListener(function()
 				self:closeUI()
@@ -207,8 +209,7 @@ function SummonRewardUI:onRefresh()
 			self:checkUnlockMap()
 			self.btnGet:setActive(true)
 			if not self.isWish then
-				self.btnSummonOne:setActive(true)
-				self.btnSummonTen:setActive(true)
+				self:refreshSummonBtn()
 			end
 			self.tranBg:addClickListener(function()
 				self:closeUI()
@@ -216,7 +217,6 @@ function SummonRewardUI:onRefresh()
 			self.tranBg:setClickAnimation(false)
 		end)
 	end
-	self:refreshSummonBtn()
 end
 
 function SummonRewardUI:doUITweenShake(delayTime)
diff --git a/lua/app/userdata/summon/summon_data.lua b/lua/app/userdata/summon/summon_data.lua
index 9b7f20c3..67f615ac 100644
--- a/lua/app/userdata/summon/summon_data.lua
+++ b/lua/app/userdata/summon/summon_data.lua
@@ -150,6 +150,7 @@ end
 function SummonData:summonWishClaim(summonType)
 	if self.summonDataMap[summonType] then
 		self.summonDataMap[summonType].wishCount = self.summonDataMap[summonType].wishCount - 100
+		self:setDirty()
 	end
 end