From 60c864e5f505b7a19f26788f5264c09daf62f708 Mon Sep 17 00:00:00 2001
From: wangzhenxing <1545929779@qq.com>
Date: Mon, 12 Aug 2024 18:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E4=BB=96=E4=BA=BA=E9=98=B5?=
 =?UTF-8?q?=E5=AE=B9=E7=A5=9E=E7=8E=8B=E5=93=81=E8=B4=A8=E8=83=8C=E6=99=AF?=
 =?UTF-8?q?=E6=A1=86=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/ManagedResources/~Lua/Common/functions.lua   |  2 +-
 .../~Lua/Message/CommonProto_pb.lua                 | 13 ++++++++++++-
 .../~Lua/Modules/Popup/PlayerInfoPopup.lua          |  4 +++-
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua
index a7a8e2912c..0eb0bf6943 100644
--- a/Assets/ManagedResources/~Lua/Common/functions.lua
+++ b/Assets/ManagedResources/~Lua/Common/functions.lua
@@ -1311,7 +1311,7 @@ end
 
 --通过item稀有度读取背景框
 function GetQuantityImageByquality(quality,star,_herodata)
-    if _herodata and _herodata.shenWangLv==6  then
+    if _herodata and (_herodata.shenWangLv==6 or _herodata.shenwangLv==6 ) then
         return "r_characterbg_gules"
     end
     if star  then--and star > 5
diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
index 1fb59d9d66..18ca42637b 100644
--- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
+++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua
@@ -545,6 +545,7 @@ TEAMSIMPLEINFO_POSITION_FIELD = protobuf.FieldDescriptor();
 TEAMSIMPLEINFO_SKINID_FIELD = protobuf.FieldDescriptor();
 TEAMSIMPLEINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor();
 TEAMSIMPLEINFO_PROPERTYID_FIELD = protobuf.FieldDescriptor();
+TEAMSIMPLEINFO_SHENWANGLV_FIELD = protobuf.FieldDescriptor();
 TEAMONETEAMINFO = protobuf.Descriptor();
 TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor();
 TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor();
@@ -6154,11 +6155,21 @@ TEAMSIMPLEINFO_PROPERTYID_FIELD.default_value = 0
 TEAMSIMPLEINFO_PROPERTYID_FIELD.type = 5
 TEAMSIMPLEINFO_PROPERTYID_FIELD.cpp_type = 1
 
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.name = "shenwangLv"
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.shenwangLv"
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.number = 9
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.index = 8
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.label = 1
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.has_default_value = false
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.default_value = 0
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.type = 5
+TEAMSIMPLEINFO_SHENWANGLV_FIELD.cpp_type = 1
+
 TEAMSIMPLEINFO.name = "TeamSimpleInfo"
 TEAMSIMPLEINFO.full_name = ".rpc.protocols.TeamSimpleInfo"
 TEAMSIMPLEINFO.nested_types = {}
 TEAMSIMPLEINFO.enum_types = {}
-TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD, TEAMSIMPLEINFO_PROPERTYID_FIELD}
+TEAMSIMPLEINFO.fields = {TEAMSIMPLEINFO_HEROID_FIELD, TEAMSIMPLEINFO_HEROTID_FIELD, TEAMSIMPLEINFO_STAR_FIELD, TEAMSIMPLEINFO_LEVEL_FIELD, TEAMSIMPLEINFO_POSITION_FIELD, TEAMSIMPLEINFO_SKINID_FIELD, TEAMSIMPLEINFO_GODSOULLV_FIELD, TEAMSIMPLEINFO_PROPERTYID_FIELD, TEAMSIMPLEINFO_SHENWANGLV_FIELD}
 TEAMSIMPLEINFO.is_extendable = false
 TEAMSIMPLEINFO.extensions = {}
 TEAMONETEAMINFO_TEAM_FIELD.name = "team"
diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
index 82842283a8..02d7d690ca 100644
--- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
+++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua
@@ -451,7 +451,9 @@ function this.FormationAdapter(teamInfo)
             local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
             this.Demons[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(hero.propertyId))
             this.Demons[hero.position].levelText.text = hero.level
-            this.Demons[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star,hero))
+            LogError("hero.shenwanglv====================="..hero.shenwangLv)
+            --hero.shenWangLv=6
+            this.Demons[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality, hero.star,hero,hero))
             SetHeroIcon(this.spLoader, hero,this.Demons[hero.position].icon,heroConfig)
             SetHeroFlyEffect(this.Demons[hero.position].hero,this.spLoader,hero.star,this.sortingOrder+1,0.9,2)
             local heroData = {}