From 71b9dd23a1b9ae8abd801cc47fc78b46288cdf0e Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Mon, 29 May 2023 15:19:24 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E9=94=81=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/config/hero.lua              |  1 -
 lua/app/config/skill.lua             | 15 ++++++++++++---
 lua/app/ui/common/cell/hero_cell.lua | 17 +++++++++++------
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/lua/app/config/hero.lua b/lua/app/config/hero.lua
index 83b4e700..0d41d19f 100644
--- a/lua/app/config/hero.lua
+++ b/lua/app/config/hero.lua
@@ -231,7 +231,6 @@ local hero = {
 		["model_id"]="p0011",
 		["icon"]="16",
 		["item_id"]=14001,
-		["unlock_chapter"]=25,
 		["is_show"]=1
 	},
 	[22001]={
diff --git a/lua/app/config/skill.lua b/lua/app/config/skill.lua
index 6122b768..b7124e65 100644
--- a/lua/app/config/skill.lua
+++ b/lua/app/config/skill.lua
@@ -3730,7 +3730,10 @@ local skill = {
 		["link"]=1,
 		["position"]=5,
 		["method"]=1,
-		["skill_type"]=0,
+		["skill_type"]=1,
+		["boardrange"]={
+
+		},
 		["battle_icon"]="5",
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -3753,7 +3756,10 @@ local skill = {
 		["link"]=1,
 		["position"]=5,
 		["method"]=1,
-		["skill_type"]=0,
+		["skill_type"]=1,
+		["boardrange"]={
+
+		},
 		["battle_icon"]="5",
 		["effect_type"]=1,
 		["trigger"]=1,
@@ -3776,7 +3782,10 @@ local skill = {
 		["link"]=1,
 		["position"]=5,
 		["method"]=1,
-		["skill_type"]=0,
+		["skill_type"]=1,
+		["boardrange"]={
+
+		},
 		["battle_icon"]="5",
 		["effect_type"]=1,
 		["trigger"]=1,
diff --git a/lua/app/ui/common/cell/hero_cell.lua b/lua/app/ui/common/cell/hero_cell.lua
index 51d7b38c..5bd027da 100644
--- a/lua/app/ui/common/cell/hero_cell.lua
+++ b/lua/app/ui/common/cell/hero_cell.lua
@@ -53,13 +53,18 @@ function HeroCell:refresh(heroEntity, isGray)
 		self.unlockTx:setVisible(false)
 	else
 		self.lvTx:setVisible(false)
-		self.progressBg:setVisible(false)
-		self.unlockTx:setVisible(true)
-		local unlcokChapter = heroEntity:getUnlcokChapter()
-		if unlcokChapter then
-			self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter))
+		if canLvUp then
+			self.unlockTx:setVisible(false)
+			self.progressBg:setVisible(true)
 		else
-			self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
+			self.unlockTx:setVisible(true)
+			self.progressBg:setVisible(false)
+			local unlcokChapter = heroEntity:getUnlcokChapter()
+			if unlcokChapter then
+				self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_10, unlcokChapter))
+			else
+				self.unlockTx:setText(I18N:getGlobalText(I18N.GlobalConst.HERO_DESC_11))
+			end
 		end
 	end
 end