From 5552718d8f3832c09a3384eaebe4d572c153592e Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 24 Jun 2024 17:54:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=92=E8=A1=8C=E6=A6=9C=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WorldArenaRankRewardPanel.prefab | 102 +++++++++--------- .../WorldArena/WorldArenaRankRewardPanel.lua | 10 +- 2 files changed, 56 insertions(+), 56 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab index 0efb9b75cf..3c0301d59f 100644 --- a/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/WorldArena/WorldArenaRankRewardPanel.prefab @@ -17,7 +17,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8009645694155283336 RectTransform: m_ObjectHideFlags: 0 @@ -111,7 +111,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 417, y: 616} - m_SizeDelta: {x: 142, y: 131} + m_SizeDelta: {x: 154, y: 139} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7497665713539836559 CanvasRenderer: @@ -248,7 +248,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -1029, y: -148.13455} - m_SizeDelta: {x: 916, y: 134.07} + m_SizeDelta: {x: 880, y: 135} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &518155264100080293 GameObject: @@ -361,8 +361,8 @@ 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: -1.8700001, y: 509.50742} - m_SizeDelta: {x: 912, y: 80} + m_AnchoredPosition: {x: -2, y: 503.19} + m_SizeDelta: {x: 883.66, y: 67.35} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &735733834326703280 CanvasRenderer: @@ -385,7 +385,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.627451} + m_Color: {r: 0.6226415, g: 0.55222374, b: 0.4669811, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -980,7 +980,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 191.45, y: 100} + m_SizeDelta: {x: 210, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4032380655912086169 CanvasRenderer: @@ -1074,8 +1074,8 @@ 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: 0, y: -511} - m_SizeDelta: {x: 900, y: 300} + m_AnchoredPosition: {x: -0.083, y: -511} + m_SizeDelta: {x: 891.084, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6077617221098580338 CanvasRenderer: @@ -1098,7 +1098,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} + m_Color: {r: 0.68235296, g: 0.65882355, b: 0.654902, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1370,8 +1370,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 58c503111f310224a9a04ab39a004308, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1493,7 +1493,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: -333.63, y: 23.35} + m_AnchoredPosition: {x: -319.7, y: 23.35} m_SizeDelta: {x: 241.3, y: 79.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6208288474253002476 @@ -1647,8 +1647,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -0.10236, y: -345} - m_SizeDelta: {x: 916, y: 82.6} + m_AnchoredPosition: {x: 0, y: -240} + m_SizeDelta: {x: 900, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3021464597540486535 CanvasRenderer: @@ -1671,15 +1671,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.67058825} 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: 190952d644da9724daf666e2a2c4f68d, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 288461e87c49b6d4eb6b055d683d345c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1752,7 +1752,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5eb7fbeffdba3c448a555d0a7da444cf, type: 3} + m_Sprite: {fileID: 21300000, guid: f30bf38c24a00694dba03295d1981811, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1943,7 +1943,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: -4, y: 595} + m_AnchoredPosition: {x: -4, y: 605} m_SizeDelta: {x: 250, y: 93.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6004146289363034106 @@ -2024,7 +2024,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 91, y: -13} - m_SizeDelta: {x: 630.2, y: 102.61} + m_SizeDelta: {x: 610, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1103944196297539819 MonoBehaviour: @@ -2245,7 +2245,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: -336.13, y: -40} + m_AnchoredPosition: {x: -325.1, y: -40} m_SizeDelta: {x: 236.26, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1214376515074893388 @@ -2399,7 +2399,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: 0.0015106, y: -650} + m_AnchoredPosition: {x: 0, y: -543} m_SizeDelta: {x: 900, y: 41.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7481442445468601724 @@ -2553,8 +2553,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -59.150024} - m_SizeDelta: {x: 0, y: -43.9} + m_AnchoredPosition: {x: -2.5, y: -13.299988} + m_SizeDelta: {x: -59, y: -176.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7588976886023052104 CanvasRenderer: @@ -2622,7 +2622,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.84313726, g: 0.78431374, b: 0.6627451, a: 1} + m_Color: {r: 0.5566038, g: 0.37510255, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2679,7 +2679,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: -354.6, y: 11.804998} + m_AnchoredPosition: {x: -333.4, y: 16.5} m_SizeDelta: {x: 80, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2446714941602619819 @@ -2755,7 +2755,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: -529} + m_AnchoredPosition: {x: 0, y: -514} m_SizeDelta: {x: 0, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3954599023864074432 @@ -2779,7 +2779,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.67058825} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2830,8 +2830,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 327} - m_SizeDelta: {x: 905, y: 100} + m_AnchoredPosition: {x: -2.24, y: 334} + m_SizeDelta: {x: 894.64, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6969342202941305348 GameObject: @@ -3038,14 +3038,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.79215693, g: 0.6431373, b: 0.56078434, 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: 9658c5a8f1777e74d9a8915414aaa5ac, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3162,8 +3162,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 50} - m_SizeDelta: {x: 1080, y: 100} + m_AnchoredPosition: {x: 3.17, y: 56.7} + m_SizeDelta: {x: 892.27, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2911473332287286545 MonoBehaviour: @@ -3225,7 +3225,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: -357.8, y: -5.6} + m_AnchoredPosition: {x: -342.6, y: 3.5} m_SizeDelta: {x: 96, y: 98} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4553175027325353509 @@ -3327,7 +3327,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &399469844302364465 RectTransform: m_ObjectHideFlags: 0 @@ -3349,8 +3349,8 @@ 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: -0.74, y: -433} - m_SizeDelta: {x: 908.52, y: 141} + m_AnchoredPosition: {x: 0.68, y: -419.13} + m_SizeDelta: {x: 890.6, y: 139.75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &394949053104634444 CanvasRenderer: @@ -3380,8 +3380,8 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 3ddf57e863f9779499219883f26c457c, type: 3} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: baae127f617f4cf449dc698382138f15, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3503,7 +3503,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 250, y: 126} + m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2515518105463319180 CanvasRenderer: @@ -3533,7 +3533,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f2ea0c3cf6fd9a7478fe17314277ad24, type: 3} + m_Sprite: {fileID: 21300000, guid: 9eb616bde89052047ae1d9f20103daa7, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3600,7 +3600,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.95294124, g: 0.7254902, b: 0.21960786, a: 1} + m_Color: {r: 0.4245283, g: 0.32204783, b: 0.09411712, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3735,8 +3735,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -247, y: 0} - m_SizeDelta: {x: 80, y: 2} + m_AnchoredPosition: {x: -247, y: 0.38} + m_SizeDelta: {x: 65.87, y: 2} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5109120868403537230 CanvasRenderer: @@ -3759,7 +3759,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.1792453, g: 0.17163582, b: 0.17163582, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -3947,7 +3947,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &860309430171780594 RectTransform: m_ObjectHideFlags: 0 @@ -3968,7 +3968,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 808.2, y: -50} - m_SizeDelta: {x: 215.5, y: 100} + m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &258188201392131870 CanvasRenderer: @@ -4083,8 +4083,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.22154781} m_AnchorMax: {x: 0.5, y: 0.22154781} - m_AnchoredPosition: {x: -2.5005994, y: 50} - m_SizeDelta: {x: 905, y: 82.6} + m_AnchoredPosition: {x: -2.3, y: -72} + m_SizeDelta: {x: 881.7, y: 82.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1830926445977596706 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua index 05682f4029..1fb213450c 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/WorldArenaRankRewardPanel.lua @@ -20,8 +20,8 @@ local ConfigList = { -- Tab管理器 local TabBox = require("Modules/Common/TabBox") -local _TabImgData = {select = "r_tongyong_xiaanniu_01", default = "r_tongyong_xiaanniu_02",} -local _TabFontColor = { default = Color.New(130 / 255, 128 / 255, 120 / 255, 1), +local _TabImgData = {select = "r_tanchuang_button_003", default = "r_tanchuang_button_001",} +local _TabFontColor = { default = Color.New(236 / 255, 236 / 255, 236 / 255, 1), select = Color.New(154 / 255, 78 / 255, 36 / 255, 1) } local _TabData = { [1]= {txt = "段位奖励"}, @@ -219,7 +219,7 @@ function this.ShowRewardInfo() return a.RankId>b.RankId end) this.arenaBottom.gameObject:SetActive(false) - this.ScrollView:SetRectTransform(Vector2.New(916,1040)) + this.ScrollView:SetRectTransform(Vector2.New(916,990)) this.ScrollView:SetRectPosition(Vector3.New(0,0,0)) elseif tabNum==2 then this.rankTitle.text="排名" @@ -227,8 +227,8 @@ function this.ShowRewardInfo() table.insert(RewardList,configInfo) end this.arenaBottom.gameObject:SetActive(true) - this.ScrollView:SetRectTransform(Vector2.New(916,850)) - this.ScrollView:SetRectPosition(Vector3.New(0,100,0)) + this.ScrollView:SetRectTransform(Vector2.New(916,880)) + this.ScrollView:SetRectPosition(Vector3.New(0,43,0)) end this.ScrollView:SetData(RewardList, function (index, go)