From 3ccf3c29a35d068124f4262d43155759a706c5f0 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Mon, 21 Feb 2022 18:36:21 +0800 Subject: [PATCH] =?UTF-8?q?ID1011149=E3=80=91=20=E3=80=90=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E3=80=91=E5=8D=87=E6=98=9F=E6=93=8D=E4=BD=9C=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E9=B8=BF=E8=92=99=E9=98=B5=E7=AD=89=E7=BA=A7=E9=99=90?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/RoleInfo/RoleAwakelayout.prefab | 83 ++++++++++++++++++- .../~Lua/Modules/RoleInfo/RoleAwakeLayout.lua | 29 ++++--- 2 files changed, 100 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakelayout.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakelayout.prefab index 91bc8609e5..4cd4df6b52 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakelayout.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleAwakelayout.prefab @@ -100,6 +100,7 @@ RectTransform: - {fileID: 5138403808461308395} - {fileID: 3919453818724718333} - {fileID: 5039497646578578523} + - {fileID: 9135295950344405141} m_Father: {fileID: 5117851753017751752} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3144,7 +3145,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &5039497646578578523 RectTransform: m_ObjectHideFlags: 0 @@ -3618,6 +3619,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4670577468917757478} m_CullTransparentMesh: 0 +--- !u!1 &4800293525171391892 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9135295950344405141} + - component: {fileID: 2663872518150856342} + - component: {fileID: 5041169057501345743} + m_Layer: 5 + m_Name: tip1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &9135295950344405141 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4800293525171391892} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.85, y: 0.85, z: 1} + m_Children: [] + m_Father: {fileID: 3324244506947370869} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 240.44992, y: -57.333733} + m_SizeDelta: {x: 583.4, y: 197.15} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2663872518150856342 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4800293525171391892} + m_CullTransparentMesh: 0 +--- !u!114 &5041169057501345743 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4800293525171391892} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 34 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 42 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 11559 --- !u!1 &4819625098459545432 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua index 80ec507dce..7a31ad6265 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua @@ -36,6 +36,7 @@ function RoleAwakeLayout:InitComponent() Util.GetGameObject(self.gameObject,"content/Image/Text"):GetComponent("Text").text = Language[11783] Util.GetGameObject(self.gameObject,"content/Image (3)/Text"):GetComponent("Text").text = Language[11784] Util.GetGameObject(self.gameObject,"content/tip"):GetComponent("Text").text = Language[11785] + this.roleUpStarLayoutTip1 = Util.GetGameObject(self.gameObject,"content/tip1"):GetComponent("Text") Util.GetGameObject(self.gameObject,"content/upStarBtn/Text"):GetComponent("Text").text = Language[11786] Util.GetGameObject(self.gameObject,"content/lvUp/Text"):GetComponent("Text").text = Language[11787] --天赋 @@ -79,17 +80,6 @@ function RoleAwakeLayout:RemoveListener() Game.GlobalEvent:RemoveEvent(GameEvent.Bag.BagGold,this.UpdateHeroUpStarMaterialShow,self) end -function RoleAwakeLayout:OnShow(_sortinglayer,_parent,_curHerodata,_isUpZhen,_heroDatas) - self.gameObject:SetActive(true) - this.sortingOrder = _sortinglayer - curHeroData = _curHerodata - parent = _parent - heroDatas = _heroDatas - isUpZhen = _isUpZhen - self:GetCurHeroUpLvOrUpStarSData() - self:UpdateHeroUpStarData()--进阶 -end - function RoleAwakeLayout:OnShow() self.gameObject:SetActive(true) end @@ -102,6 +92,23 @@ function RoleAwakeLayout:SetData(_sortinglayer,_parent,_curHerodata,_isUpZhen,_h isUpZhen = _isUpZhen self:GetCurHeroUpLvOrUpStarSData() self:UpdateHeroUpStarData()--进阶 + local upStarRankUpConfig + for k, v in ConfigPairs(ConfigManager.GetConfig(ConfigName.HeroRankupConfig)) do + if v.Star == curHeroData.heroConfig.Star and v.LimitStar == curHeroData.star and v.OpenStar == curHeroData.star + 1 then + upStarRankUpConfig = v + break + end + end + if upStarRankUpConfig then + if HarmonyManager.GetSingleAdditions(HarmonyAddType.AddLv) >= upStarRankUpConfig.LimitHongmengLevel then -- 鸿蒙阵神将共鸣等级 + this.upStarBtn.gameObject:SetActive(true) + this.roleUpStarLayoutTip1.gameObject:SetActive(false) + else + this.upStarBtn.gameObject:SetActive(false) + this.roleUpStarLayoutTip1.gameObject:SetActive(true) + this.roleUpStarLayoutTip1.text = "觉醒需求鸿蒙阵等级:"..upStarRankUpConfig.LimitHongmengLevel + end + end end --更新英雄进阶数据