From 9eb66f03e0c0474d28c23578d1d4c17eb363ccab Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Wed, 31 Jan 2024 18:28:47 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9C=A3=E5=99=A8=E4=BF=A1=E6=81=AF=E7=95=8C?= =?UTF-8?q?=E9=9D=A2=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Pokemon/PokemonInfoPanel.prefab | 57 ++++++++++--------- .../~Lua/Modules/Arena/View/ArenaView.lua | 2 + .../Pokemon/view/PokemonInfoPanel_UpLv.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleStoryLayout.lua | 1 + 4 files changed, 35 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab index 9d114186cd..f5182ce7bc 100644 --- a/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Pokemon/PokemonInfoPanel.prefab @@ -1239,7 +1239,7 @@ GameObject: m_Component: - component: {fileID: 4675414765492505688} - component: {fileID: 8208650167721950214} - - component: {fileID: 3323179998152435927} + - component: {fileID: 4931250674839051909} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -1274,7 +1274,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 181565280737611780} m_CullTransparentMesh: 0 ---- !u!114 &3323179998152435927 +--- !u!114 &4931250674839051909 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1283,26 +1283,31 @@ MonoBehaviour: m_GameObject: {fileID: 181565280737611780} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 1, b: 0.023529412, 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_Sprite: {fileID: 21300000, guid: 4413b93004f13514c9a191827d760a5f, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 + m_FontData: + m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6700\u9AD8\u7B49\u7EA7" --- !u!1 &198526555081314674 GameObject: m_ObjectHideFlags: 0 @@ -2252,10 +2257,10 @@ RectTransform: m_Father: {fileID: 1992231238967598092} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 488.80002, y: -96.9} + m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2653371138534210738 CanvasRenderer: @@ -4157,7 +4162,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2754504655914827622 RectTransform: m_ObjectHideFlags: 0 @@ -4203,7 +4208,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2754373779638328464 RectTransform: m_ObjectHideFlags: 0 @@ -8050,7 +8055,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 32 + m_FontSize: 45 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -8625,10 +8630,10 @@ RectTransform: m_Father: {fileID: 1992231238967598092} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 279.1, y: -96.9} + m_SizeDelta: {x: 201, y: 181.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &543774741863406538 CanvasRenderer: @@ -12061,7 +12066,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6273787066303493621 RectTransform: m_ObjectHideFlags: 0 @@ -12079,7 +12084,7 @@ RectTransform: 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: 581.7, y: 117.9} + m_AnchoredPosition: {x: 633, y: 49} m_SizeDelta: {x: 197.07, y: 47.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6276022582899603475 diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index 4b7f9785fd..dacbe07227 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -41,8 +41,10 @@ function ArenaView:InitComponent() this.RecordBtn = Util.GetGameObject(self.gameObject, "rightUp/record") + this.RecordBtn:SetActive(true) this.RefreshBtn = Util.GetGameObject(self.gameObject, "refresh") this.RewardBtn = Util.GetGameObject(self.gameObject, "rightUp/reward") + this.RewardBtn:SetActive(true) this.StoreBtn = Util.GetGameObject(self.gameObject, "rightUp/store") this.sortBtn = Util.GetGameObject(self.gameObject, "rightUp/sortBtn") this.helpBtn = Util.GetGameObject(self.gameObject, "rightUp/helpBtn") diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua index 45aa14bfb0..dda0735428 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonInfoPanel_UpLv.lua @@ -173,7 +173,7 @@ function this.ShowPokemonInfo() isMaterial = 0 local upLvConFig = ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.SpiritAnimalLevel,"Quality",pokemonConFig.Quality,"Level",curPokemonData.lv) isLvEnd = curPokemonData.lv >= pokemonConFig.MaxLevel - Util.GetGameObject(this.noUpLvText,"Image"):GetComponent("Image").sprite = this.spLoader:LoadSprite("r_hero_qingbao-zuigaodengji_zh") + Util.GetGameObject(this.noUpLvText,"Image"):GetComponent("Text").text = "已提升到最高等级" this.noUpLvText:SetActive(isLvEnd) this.upLvItemParent:SetActive(not isLvEnd) this.upLvBtn:SetActive(not isLvEnd) diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua index 21f5239125..b86e8ca2d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleStoryLayout.lua @@ -19,6 +19,7 @@ end function RoleStoryLayout:InitComponent() self.spLoader = SpriteLoader.New() self.infoTextStory = Util.GetGameObject(self.gameObject ,"infoBg/infoRect/infoText"):GetComponent("Text") + Util.GetGameObject(self.gameObject ,"title/Text"):GetComponent("Text").text="英雄传说" end --绑定事件(用于子类重写)