diff --git a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab index 402d0cdf19..edb0c078ab 100644 --- a/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Fight/FightPointPassMainPanel.prefab @@ -259,9 +259,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 56.000015, y: -636.63} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 112, y: 148.66} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &107230299 @@ -5297,9 +5297,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 117, y: -56} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 234, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &698392787 @@ -5413,6 +5413,7 @@ GameObject: - component: {fileID: 708116010} - component: {fileID: 708116009} - component: {fileID: 708116008} + - component: {fileID: 3720942971087223829} m_Layer: 5 m_Name: progressLayout m_TagString: Untagged @@ -5440,7 +5441,7 @@ RectTransform: m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: -59, y: 18.7} - m_SizeDelta: {x: 380, y: 70} + m_SizeDelta: {x: 0, y: 70} m_Pivot: {x: 1, y: 0} --- !u!114 &708116011 MonoBehaviour: @@ -5456,7 +5457,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 + m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5516,6 +5517,48 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 708116006} m_CullTransparentMesh: 0 +--- !u!114 &3720942971087223829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 708116006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 708116011} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &921277673 GameObject: m_ObjectHideFlags: 0 @@ -5919,10 +5962,10 @@ RectTransform: m_Father: {fileID: 708116007} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 230, y: 68.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 158, y: 0} + m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1240811747 CanvasRenderer: @@ -6091,7 +6134,7 @@ RectTransform: - {fileID: 1398615584} - {fileID: 3144727546776224643} m_Father: {fileID: 6976277603980592380} - m_RootOrder: 13 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -6168,10 +6211,10 @@ RectTransform: m_Father: {fileID: 708116007} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 55, y: 68.95} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 300.5, y: 0} + m_SizeDelta: {x: 0, y: 68.95} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1596169479 CanvasRenderer: @@ -6574,9 +6617,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 56, y: -496.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 112, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2110103218 @@ -32053,7 +32096,7 @@ RectTransform: m_Children: - {fileID: 3570938872826634124} m_Father: {fileID: 6976277603980592380} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -32177,9 +32220,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -208.75} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 217.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473222624206509369 @@ -57867,9 +57910,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -392.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6889475057108059259 @@ -69146,9 +69189,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 53, y: -53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3791543136630995348 @@ -80053,7 +80096,7 @@ RectTransform: - {fileID: 3829532297210306968} - {fileID: 5073206815621103962} m_Father: {fileID: 6976277603980592380} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -86066,10 +86109,10 @@ RectTransform: m_Father: {fileID: 708116007} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -35} - m_SizeDelta: {x: 52, y: 69.49} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 354, y: 0} + m_SizeDelta: {x: 0, y: 69.49} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5594570048363825325 CanvasRenderer: @@ -86242,9 +86285,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 269.44, y: -53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5575929133019220475 @@ -86383,7 +86426,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 55, y: -137} - m_SizeDelta: {x: 322.44, y: 74.5} + m_SizeDelta: {x: 0, y: 74.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5535357721351960960 MonoBehaviour: @@ -101598,7 +101641,7 @@ RectTransform: - {fileID: 7964108409033408373} - {fileID: 8006389423642367895} m_Father: {fileID: 6976277603980592380} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -102086,9 +102129,9 @@ RectTransform: m_Father: {fileID: 3952385394978222417} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 50, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &109213283015355470 @@ -102227,9 +102270,9 @@ RectTransform: m_Father: {fileID: 1012972711} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 101.75, y: -276.15} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 203.5, y: 308.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5423471315474658513 @@ -103665,9 +103708,9 @@ RectTransform: m_Father: {fileID: 3814890933284291651} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 161.22, y: -53} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 106, y: 106} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7914440216826683292 @@ -124571,10 +124614,10 @@ RectTransform: - {fileID: 2931816858255176032} - {fileID: 1929407693109997001} - {fileID: 3381452459641002547} + - {fileID: 1388929535} - {fileID: 7718967529276036518} - {fileID: 7556113482846472712} - {fileID: 4670671735622619351} - - {fileID: 1388929535} - {fileID: 5912275222556601812} - {fileID: 5594570047289342361} m_Father: {fileID: 3223588515252977199} diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 03a8dfae95..9eb43084a2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -122,6 +122,7 @@ function FightPointPassMainPanel:InitComponent() -- 主线任务显示 this.mainTask = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask") + this.goVipButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout") this.titleText = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout/titleText"):GetComponent("Text") this.progressText = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/progressLayout/progressText"):GetComponent("Text") this.getRewardButton = Util.GetGameObject(self.gameObject, "Bg/RightDown/mainTask/getRewardButton") @@ -299,6 +300,10 @@ function FightPointPassMainPanel:BindEvent() UIManager.OpenPanel(UIName.FightLevelChapterPanel) end) + Util.AddClick(this.goVipButton, function() + UIManager.OpenPanel(UIName.VipPanelV2) + end) + Util.AddClick(this.getRewardButton, function() local t, task = VipManager.GetVipTaskShowInFight() if t == 1 and task.state == VipTaskStatusDef.NotFinished then @@ -471,7 +476,7 @@ function this.refreshVipTask() elseif t == 1 then -- 不能激活时显示任务 local taskConfigInfo = ConfigManager.GetConfigData(ConfigName.TaskConfig, task.missionId) - this.titleText.text = GetLanguageStrById(taskConfigInfo.Desc)..string.format("(%s/%s)", task.progress, taskConfigInfo.TaskValue[2][1]) + this.titleText.text = GetLanguageStrById(taskConfigInfo.Desc)..string.format("(%s/%s)", UIColorStr.GREEN, task.progress, taskConfigInfo.TaskValue[2][1]) this.progressText.text = "" this.mainTaskGRewardImage:SetActive(task.state ~= VipTaskStatusDef.NotFinished) this.mainTaskJumpImage:SetActive(task.state == VipTaskStatusDef.NotFinished)