From 6eea05fa06bb79559c28d7820d914d0249e87583 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 26 Oct 2020 17:30:26 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=AB=9E=E6=8A=80=E5=9C=BA=E3=80=91?= =?UTF-8?q?=E9=A2=86=E5=A5=96=E7=95=8C=E9=9D=A2=E6=8A=A5=E9=94=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GeneralRankRewardPanel.prefab | 83 +------------------ .../GeneralPanel/GeneralRankRewardPanel.lua | 2 +- 2 files changed, 3 insertions(+), 82 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab index 58d1e23f12..0e69da1481 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRankRewardPanel.prefab @@ -3368,87 +3368,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: d2f45cb462ee32146a6cfac57a036162, 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 ---- !u!1 &8852520567566857061 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7575865812575048841} - - component: {fileID: 5276202281349785116} - - component: {fileID: 5235405405442694011} - m_Layer: 5 - m_Name: myInfo - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7575865812575048841 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8852520567566857061} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 6925281564069932743} - - {fileID: 2585648178723148069} - - {fileID: 1785438770459517311} - - {fileID: 4010916176053048208} - - {fileID: 3473016552857172522} - m_Father: {fileID: 7762200945649804485} - m_RootOrder: 3 - 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_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5276202281349785116 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8852520567566857061} - m_CullTransparentMesh: 0 ---- !u!114 &5235405405442694011 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8852520567566857061} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, 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: 47ccf8e564bf02a4abcd63d79d634f64, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 3ddf57e863f9779499219883f26c457c, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua index 5ddcd7cd38..7f343e16d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRankRewardPanel.lua @@ -17,7 +17,7 @@ local ActivityId = nil local ConfigList = { [1] = ConfigManager.GetConfig(ConfigName.ActivityRankingReward),--一般奖励表 [2] = ConfigManager.GetConfig(ConfigName.GodSacrificeConfig),--社稷大典奖励表 - -- [3] = ConfigManager.GetConfig(ConfigName.ArenaReward),--竞技场奖励表 + [3] = ConfigManager.GetConfig(ConfigName.ArenaReward),--竞技场奖励表 } -- Tab管理器