From b3b95119c04cf66644ed3fda75fb05fe43177aac Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 12 Jan 2023 16:47:04 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=87=E6=88=98=E7=95=8C=E9=9D=A2=E6=98=9F?= =?UTF-8?q?=E7=BA=A7=E6=98=BE=E7=A4=BA=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/GlobalDefine.lua | 12 ++++++------ Assets/ManagedResources/~Lua/Common/Language.lua | 4 ++-- .../~Lua/Modules/Formation/FormationPanelV2.lua | 3 ++- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 7ec70c2929..a342fab00e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -209,12 +209,12 @@ GetHeroCardStarFg = { [9] = "t_zhandoukuang_hong002", [10] = "t_zhandoukuang_hong002", [11] = "t_zhandoukuang_zhuangshi002", - [12] = "t_zhandoukuang_lanjin", - [13] = "t_zhandoukuang_lanjin", - [14] = "t_zhandoukuang_lanjin", - [15] = "t_zhandoukuang_lanjin", - [16] = "t_zhandoukuang_lanjin", - [17] = "t_zhandoukuang_lanjin", + [12] = "t_zhandoukuang_lanjin02", + [13] = "t_zhandoukuang_lanjin02", + [14] = "t_zhandoukuang_lanjin02", + [15] = "t_zhandoukuang_lanjin02", + [16] = "t_zhandoukuang_lanjin02", + [17] = "t_zhandoukuang_lanjin02", } --Hero大卡装饰 diff --git a/Assets/ManagedResources/~Lua/Common/Language.lua b/Assets/ManagedResources/~Lua/Common/Language.lua index a5c5dc0bd2..8355cdf82e 100644 --- a/Assets/ManagedResources/~Lua/Common/Language.lua +++ b/Assets/ManagedResources/~Lua/Common/Language.lua @@ -1004,8 +1004,8 @@ Language = { [11003] = GetLanguageStrById("%的积分"), [11004] = GetLanguageStrById("%m月%d日"), [11005] = GetLanguageStrById("今日"), - [11006] = GetLanguageStrById("公会排行"), - [11007] = GetLanguageStrById("个人排行"), + [11006] = GetLanguageStrById("公会段位"), + [11007] = GetLanguageStrById("个人段位"), [11008] = GetLanguageStrById("当前时间不可进行挑战!"), [11009] = GetLanguageStrById("今日挑战次数已达上限!"), [11010] = GetLanguageStrById("后才可进行挑战!"), diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index a1024038ef..49c9f0378d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -873,6 +873,7 @@ function this.SingleHeroDataShow(_go, _heroData) end LogError("heroData.heroConfig.Id=="..heroData.heroConfig.Id) star=endLess[heroData.heroConfig.Id].Star + LogError("star=="..star) if star>11 then starSize = Vector3.New(1,-15.6) else @@ -895,7 +896,7 @@ function this.SingleHeroDataShow(_go, _heroData) else lv.text=level end - SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) + SetHeroStars(this.spLoader, starGrid, star) local effect=SetHeroFlyEffect(go,this.spLoader,star,this.sortingOrder,1,4) if effect then local meshs2=effect:GetComponentsInChildren(typeof(UnityEngine.SkinnedMeshRenderer))