From 14b54c7d5e028643bc056eb94dc921bf472edb15 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 26 Nov 2021 13:18:45 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=98=E8=BA=AB=E5=8D=A1=E5=90=8D=E5=AD=97?= =?UTF-8?q?=E9=A2=9C=E8=89=B2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/TianShuMiJuan/IncarnationPanel.prefab | 2 +- .../~Lua/Common/GlobalDefine.lua | 18 +++++++++++++++--- .../Modules/Incarnation/IncarnationPanel.lua | 9 +++++++-- 3 files changed, 23 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab index 87d362f797..db3db1d1a7 100644 --- a/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TianShuMiJuan/IncarnationPanel.prefab @@ -5994,7 +5994,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -0.000028870196} + m_AnchoredPosition: {x: 0, y: -0.0000010166028} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1537562228229781123 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3eb1c62ba6..c1464d42d1 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3063,7 +3063,19 @@ GetTailsmanSoulDiImage = { GetIncarnationDiImage = { [1] = "s_swhs_pinzhidi_01", [2] = "s_swhs_pinzhidi_01", - [3] = "s_swhs_pinzhidi_03", - [4] = "s_swhs_pinzhidi_04", - [5] = "s_swhs_pinzhidi_02", + [3] = "s_swhs_pinzhidi_01", + [4] = "s_swhs_pinzhidi_01", + [5] = "s_swhs_pinzhidi_03", + [6] = "s_swhs_pinzhidi_04", + [7] = "s_swhs_pinzhidi_02", +} + +GetIncarnationNameColor = { + [1] = "7E20Af", + [2] = "7E20Af", + [3] = "7E20Af", + [4] = "7E20Af", + [5] = "BB6FIE", + [6] = "B63939", + [7] = "96FFEF", } diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua index 485452d647..48fdd5fe00 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationPanel.lua @@ -269,8 +269,13 @@ function IncarnationPanel:SetSingleData(go,data,index) end go.gameObject:SetActive(true) self.itemPreList[go].bg.sprite = self.spLoader:LoadSprite(GetIncarnationDiImage[data.quality]) - self.itemPreList[go].nameText.text = data.name - self.itemPreList[go].nameText1.text = data.name + self.itemPreList[go].nameText.text = string.format("%s",GetIncarnationNameColor[data.quality], data.name) + if data.quality == 7 then + self.itemPreList[go].nameText1.gameObject:SetActive(true) + self.itemPreList[go].nameText1.text = data.name + else + self.itemPreList[go].nameText1.gameObject:SetActive(false) + end self.itemPreList[go].red.gameObject:SetActive(data.state == 0) self:RefreshSingleCardPre(self.itemPreList[go].cardPre,data,true,index) self:SetProList(data.proDesList,self.itemPreList[go].preList,self.itemPreList[go].proGrid,self.itemPreList[go].pro.gameObject)