From 2563c6bdd633b133239d89f969ed4174f37d4ba5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 12 Nov 2020 18:17:56 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=81=B5=E5=85=BD=E5=AE=9D=E9=98=81?= =?UTF-8?q?=E3=80=91=E8=B4=A7=E5=B8=81=E6=98=BE=E7=A4=BA=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/DynamicActicity/page10.prefab | 12 ++++++------ .../Prefabs/UI/DynamicActicity/page11.prefab | 14 +++++++------- .../Prefabs/UI/DynamicActicity/page12.prefab | 2 +- .../ManagedResources/~Lua/Common/GlobalDefine.lua | 1 + .../DynamicActivity/DynamicActivityPanel.lua | 2 +- 5 files changed, 16 insertions(+), 15 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab index 4823d78393..d4128e99b3 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page10.prefab @@ -113,7 +113,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: 23.1, y: -421} + m_AnchoredPosition: {x: 0, y: -421} m_SizeDelta: {x: 916.3, y: 178.2} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5769479548548596538 @@ -297,7 +297,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: 13.8, y: -528.3} + m_AnchoredPosition: {x: 0, y: -528.3} m_SizeDelta: {x: 944, y: 503} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4180608101805279973 @@ -450,7 +450,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: 27, y: -717} + m_AnchoredPosition: {x: 0, y: -717} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6399722529843196785 @@ -488,7 +488,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 42 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -812,7 +812,7 @@ GameObject: - component: {fileID: 9076740770643775636} - component: {fileID: 1375469568027521370} m_Layer: 5 - m_Name: page_10 + m_Name: page10 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -886,7 +886,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: 46.93, y: -633.3} + m_AnchoredPosition: {x: 30, y: -633.3} m_SizeDelta: {x: 411.14, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8181562428230969795 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab index 1ac539fd8b..6d4777517d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page11.prefab @@ -108,7 +108,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: -24.68, y: 0.995} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 384.45, y: 110.01} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1352727701486313576 @@ -182,7 +182,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: -167.7, y: 30} + m_AnchoredPosition: {x: -144, y: 37} m_SizeDelta: {x: 151, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &831850144045978660 @@ -635,7 +635,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: 46.93, y: -633.3} + m_AnchoredPosition: {x: 0, y: -633.3} m_SizeDelta: {x: 411.14, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &292884640698123343 @@ -792,7 +792,7 @@ GameObject: - component: {fileID: 607204243134119192} - component: {fileID: 7389440388730887382} m_Layer: 5 - m_Name: page_11 + m_Name: page11 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1278,7 +1278,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: 27, y: -717} + m_AnchoredPosition: {x: 0, y: -717} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3263516619078852349 @@ -1316,7 +1316,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 10 m_MaxSize: 42 - m_Alignment: 0 + m_Alignment: 1 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1574,7 +1574,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: -14.37, y: 8.41} + m_AnchoredPosition: {x: 0, y: 8.41} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7949840497354899192 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab index 552b4248bc..4705ed3f50 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page12.prefab @@ -6968,7 +6968,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 043ce16d68..730da9273c 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -470,6 +470,7 @@ PanelType = { LingShouUpStar={14,16,1203},--灵兽升星 Celebration = {14,16,50003},--社稷大典 YiJingBaoKu = {14,16,1004},--易经宝库 + LingShouBaoGe = {14,16,1204},--灵兽宝阁 } diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index a8a1f3ad6b..8bb5361ee7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -69,7 +69,7 @@ local tabs = { }, [16] = { --灵兽宝阁 default = "l_lingshou_lingshoubaogeanniu02", lock = "l_lingshou_lingshoubaogeanniu02", select = "l_lingshou_lingshoubaogeanniu01", - rpType = RedPointType.LingShouBaoGe,panelType = PanelType.Main,ActType = ActivityTypeDef.LingShouBaoGe + rpType = RedPointType.LingShouBaoGe,panelType = PanelType.LingShouBaoGe,ActType = ActivityTypeDef.LingShouBaoGe }, [17] = { --灵兽特惠 default = "l_lishoutehui_xianshibiao0", lock = "l_lishoutehui_xianshibiao0", select = "l_lishoutehui_anniu",