From 462ad7b96b7749b8e6b23d597cc8fe5fc15b48bf Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 9 Sep 2020 10:52:50 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=BB=E9=A2=98=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E9=80=82=E9=85=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityPanel.prefab | 626 ++++++++---------- .../DynamicActivity/DynamicTaskPage.lua | 6 +- .../DynamicActivity/LeiJiChongZhiPage.lua | 5 +- 3 files changed, 283 insertions(+), 354 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 5fe3a3baea..7203638f57 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -182,10 +182,10 @@ RectTransform: m_Father: {fileID: 6198186616928684023} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6439061006620117983 CanvasRenderer: @@ -238,7 +238,7 @@ GameObject: - component: {fileID: 7864517801529800992} - component: {fileID: 2733141211381053791} m_Layer: 5 - m_Name: reward + m_Name: rewardBtn m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -396,7 +396,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -380} + m_AnchoredPosition: {x: 0, y: -326} m_SizeDelta: {x: 1080, y: 472} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5564795324050871818 @@ -659,10 +659,10 @@ RectTransform: m_Father: {fileID: 879772913056491833} 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: 129.5, y: -37.5} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8566548501705445759 CanvasRenderer: @@ -834,12 +834,12 @@ RectTransform: - {fileID: 5699968993373683288} - {fileID: 9079045295500488071} - {fileID: 2031672032753307058} - m_Father: {fileID: 1580303152666221298} - m_RootOrder: 0 + m_Father: {fileID: 6872382260446978439} + m_RootOrder: 2 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: -1937, y: 427} + m_AnchoredPosition: {x: -1937, y: 220.09998} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3194347943538256385 @@ -911,10 +911,10 @@ RectTransform: m_Father: {fileID: 8135595490674795594} m_RootOrder: 4 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: 14.5, y: -104.7} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7297652135340890028 CanvasRenderer: @@ -1520,10 +1520,10 @@ RectTransform: m_Father: {fileID: 5996551239313135865} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3911296253585539088 CanvasRenderer: @@ -1822,7 +1822,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -2286,7 +2286,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -99.77991} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 29, y: 119.2} m_Pivot: {x: 0, y: 1} --- !u!114 &6826875728029053999 MonoBehaviour: @@ -2483,10 +2483,10 @@ RectTransform: m_Father: {fileID: 328199011576694856} m_RootOrder: 4 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: 14.5, y: -104.7} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2625638712250931573 CanvasRenderer: @@ -2705,10 +2705,10 @@ RectTransform: m_Father: {fileID: 170872249803183511} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5724698235006046804 CanvasRenderer: @@ -2971,7 +2971,9 @@ RectTransform: m_Children: - {fileID: 4403385418803474761} - {fileID: 6731589704943924282} - - {fileID: 7227227312977206032} + - {fileID: 2583667563870890104} + - {fileID: 1338579734977636462} + - {fileID: 9081327288207073813} m_Father: {fileID: 6860498336681067139} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3469,10 +3471,10 @@ RectTransform: m_Father: {fileID: 879772913056491833} m_RootOrder: 2 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: 217, y: -37.5} + m_SizeDelta: {x: 100, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7579919759209297996 CanvasRenderer: @@ -3732,7 +3734,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -43.299988, y: -529.55} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &5621768752946619580 MonoBehaviour: @@ -3979,7 +3981,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 15.7, y: 6.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 267, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6629062156841605555 MonoBehaviour: @@ -4282,10 +4284,10 @@ RectTransform: m_Father: {fileID: 4992847748706284436} m_RootOrder: 3 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: 14.5, y: -82.15} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1536076493661040835 CanvasRenderer: @@ -4809,12 +4811,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4707548327315096938} - m_Father: {fileID: 1580303152666221298} - m_RootOrder: 2 + m_Father: {fileID: 6872382260446978439} + m_RootOrder: 4 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: 601} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -564} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7091958631644234883 @@ -5373,10 +5375,10 @@ RectTransform: m_Father: {fileID: 6198186616928684023} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5573601524408770467 CanvasRenderer: @@ -5751,7 +5753,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 14.5, y: -601.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &3167176307804851335 MonoBehaviour: @@ -6377,9 +6379,9 @@ RectTransform: m_Father: {fileID: 424732031091494258} 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: -2.4, y: 397.2} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -2.4, y: -562.8} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4136480265334163230 @@ -6568,10 +6570,10 @@ RectTransform: m_Father: {fileID: 6198186616928684023} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2654978188828171929 CanvasRenderer: @@ -6795,10 +6797,10 @@ RectTransform: m_Father: {fileID: 5996551239313135865} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3465853364441049518 CanvasRenderer: @@ -6870,9 +6872,9 @@ RectTransform: m_Father: {fileID: 6114044493445337611} 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: -2.4, y: 397.2} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -2.4, y: -562.8} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5726899159507858816 @@ -7470,10 +7472,10 @@ RectTransform: m_Father: {fileID: 4992847748706284436} 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: 14.5, y: -14.5} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4642171412942430234 CanvasRenderer: @@ -7738,7 +7740,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -36.39998, y: -428.56} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &7850278684064706544 MonoBehaviour: @@ -15054,12 +15056,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5655445736015705706} - m_Father: {fileID: 7227227312977206032} - m_RootOrder: 2 + m_Father: {fileID: 8609906984241842863} + m_RootOrder: 4 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: -2.4, y: 604.0999} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -559} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1810260529094738811 @@ -15326,10 +15328,10 @@ RectTransform: m_Father: {fileID: 4283003753957317988} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9061125164448476692 CanvasRenderer: @@ -15549,10 +15551,10 @@ RectTransform: m_Father: {fileID: 9183942328723741465} 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: 104.5, y: -37.5} + m_SizeDelta: {x: 75, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2240149146180738707 CanvasRenderer: @@ -15643,10 +15645,10 @@ RectTransform: m_Father: {fileID: 9183942328723741465} 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: 33.5, y: -37.5} + m_SizeDelta: {x: 67, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1288899161474613176 CanvasRenderer: @@ -15970,7 +15972,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3463243519653302739 RectTransform: m_ObjectHideFlags: 0 @@ -16043,10 +16045,10 @@ RectTransform: m_Father: {fileID: 6198186616928684023} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4118314264330391838 CanvasRenderer: @@ -16755,10 +16757,10 @@ RectTransform: m_Father: {fileID: 8135595490674795594} m_RootOrder: 2 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: 14.5, y: -59.6} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &511939552155662762 CanvasRenderer: @@ -18011,12 +18013,12 @@ RectTransform: - {fileID: 3517814007534982903} - {fileID: 1008042109767524304} - {fileID: 2991313753996687485} - m_Father: {fileID: 7227227312977206032} - m_RootOrder: 0 + m_Father: {fileID: 8609906984241842863} + m_RootOrder: 2 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: -2359, y: 352} + m_AnchoredPosition: {x: -1680, y: 145.09998} m_SizeDelta: {x: 1080, y: 192.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4435377409600837412 @@ -18059,7 +18061,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 14.5, y: -601.8} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &2203776740007227973 MonoBehaviour: @@ -18133,7 +18135,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 55.81, y: -395.93} + m_AnchoredPosition: {x: 55.809998, y: -395.93} m_SizeDelta: {x: 112.3, y: 32.63} m_Pivot: {x: 1, y: 1} --- !u!222 &8527591333639193042 @@ -18380,10 +18382,10 @@ RectTransform: m_Father: {fileID: 170872249803183511} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7045412578090079184 CanvasRenderer: @@ -18769,10 +18771,10 @@ RectTransform: m_Father: {fileID: 328199011576694856} 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: 14.5, y: -14.5} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6885421259035143309 CanvasRenderer: @@ -19443,10 +19445,10 @@ RectTransform: m_Father: {fileID: 5522078613306577319} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9157394005746992223 CanvasRenderer: @@ -19591,9 +19593,9 @@ RectTransform: m_Father: {fileID: 424732031091494258} m_RootOrder: 1 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: 626.25} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -333.75} m_SizeDelta: {x: 1080, y: 471} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7741278553653742348 @@ -19727,44 +19729,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _textSpacing: -28 ---- !u!1 &4851746548656018494 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7227227312977206032} - m_Layer: 5 - m_Name: content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7227227312977206032 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4851746548656018494} - 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: 2583667563870890104} - - {fileID: 1338579734977636462} - - {fileID: 9081327288207073813} - m_Father: {fileID: 8609906984241842863} - m_RootOrder: 2 - 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: -206.9} - m_SizeDelta: {x: 0, y: 1193.8} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4856871968637536000 GameObject: m_ObjectHideFlags: 0 @@ -19788,17 +19752,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4856871968637536000} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: [] - m_Father: {fileID: 7227227312977206032} - m_RootOrder: 1 + m_Father: {fileID: 8609906984241842863} + m_RootOrder: 3 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: -6.9000244} - m_SizeDelta: {x: 0, y: -13.7} + m_AnchoredPosition: {x: 0, y: -213.80005} + m_SizeDelta: {x: 0, y: -739.89996} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4867386187448914786 GameObject: @@ -20394,7 +20358,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -12.96, y: 5.91} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 217, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &5714064264686740442 MonoBehaviour: @@ -20844,10 +20808,10 @@ RectTransform: m_Father: {fileID: 4283003753957317988} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1712644760056095714 CanvasRenderer: @@ -26257,9 +26221,9 @@ RectTransform: m_Father: {fileID: 8773590478479781027} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 529.49, y: -76.910034} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 1.92, y: -79} m_SizeDelta: {x: 853.93, y: 22.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7365148462523986768 @@ -26332,7 +26296,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -26405,10 +26369,10 @@ RectTransform: m_Father: {fileID: 6198186616928684023} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8015540072163714848 CanvasRenderer: @@ -26791,10 +26755,10 @@ RectTransform: m_Father: {fileID: 4992847748706284436} m_RootOrder: 2 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: 14.5, y: -59.6} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1352784247357717341 CanvasRenderer: @@ -27589,10 +27553,10 @@ RectTransform: m_Father: {fileID: 4687026463986099029} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8608424370524635504 CanvasRenderer: @@ -28098,10 +28062,10 @@ RectTransform: m_Father: {fileID: 4687026463986099029} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8849331627237060132 CanvasRenderer: @@ -28246,10 +28210,10 @@ RectTransform: m_Father: {fileID: 4687026463986099029} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1236056628650470769 CanvasRenderer: @@ -28880,10 +28844,10 @@ RectTransform: m_Father: {fileID: 4283003753957317988} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 47.4, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1429130418982938936 CanvasRenderer: @@ -28992,10 +28956,10 @@ RectTransform: m_Father: {fileID: 879772913056491833} 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: 46, y: -37.5} + m_SizeDelta: {x: 92, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1896882772885942809 CanvasRenderer: @@ -29225,10 +29189,10 @@ RectTransform: m_Father: {fileID: 4283003753957317988} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7338425899618925450 CanvasRenderer: @@ -29379,10 +29343,10 @@ RectTransform: m_Father: {fileID: 4283003753957317988} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4859526314874394638 CanvasRenderer: @@ -29528,10 +29492,10 @@ RectTransform: m_Father: {fileID: 170872249803183511} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5897336571445660193 CanvasRenderer: @@ -29672,17 +29636,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6344923951847583693} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: [] - m_Father: {fileID: 1580303152666221298} - m_RootOrder: 1 + m_Father: {fileID: 6872382260446978439} + 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, y: -6.9000244} - m_SizeDelta: {x: 1080, y: 1180.3} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -213.80005} + m_SizeDelta: {x: 0, y: -739.89996} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6348808697839174188 GameObject: @@ -29716,10 +29680,10 @@ RectTransform: m_Father: {fileID: 328199011576694856} 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: 14.5, y: -37.05} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5366481966233601490 CanvasRenderer: @@ -29866,7 +29830,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -327} + m_AnchoredPosition: {x: 0, y: -329} m_SizeDelta: {x: 1080, y: 472} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &68668057159031517 @@ -29938,10 +29902,10 @@ RectTransform: m_Father: {fileID: 4687026463986099029} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3209567511493608727 CanvasRenderer: @@ -30480,10 +30444,10 @@ RectTransform: m_Father: {fileID: 170872249803183511} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2727113478152300234 CanvasRenderer: @@ -31213,10 +31177,10 @@ RectTransform: m_Father: {fileID: 5522078613306577319} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5351890322946543762 CanvasRenderer: @@ -31443,10 +31407,10 @@ RectTransform: m_Father: {fileID: 5996551239313135865} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4356322396109669482 CanvasRenderer: @@ -32684,10 +32648,10 @@ RectTransform: m_Father: {fileID: 8135595490674795594} m_RootOrder: 3 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: 14.5, y: -82.15} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2552849789648522524 CanvasRenderer: @@ -32766,7 +32730,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -43.299988, y: -529.55} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &4964431937110258207 MonoBehaviour: @@ -33543,10 +33507,10 @@ RectTransform: m_Father: {fileID: 8135595490674795594} 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: 14.5, y: -37.05} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2938343172797225684 CanvasRenderer: @@ -33858,7 +33822,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -83.02002} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 29, y: 119.2} m_Pivot: {x: 0, y: 1} --- !u!114 &6770670334210212033 MonoBehaviour: @@ -35265,7 +35229,9 @@ RectTransform: m_Children: - {fileID: 9110447908448053101} - {fileID: 7418089345689583210} - - {fileID: 1580303152666221298} + - {fileID: 5489039324293512018} + - {fileID: 4240211928911393712} + - {fileID: 4299231318084807277} m_Father: {fileID: 6860498336681067139} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -35390,10 +35356,10 @@ RectTransform: m_Father: {fileID: 5996551239313135865} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1664125794945999169 CanvasRenderer: @@ -35545,7 +35511,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 39.666668, y: -38.17} + m_AnchoredPosition: {x: 39.66667, y: -38.17} m_SizeDelta: {x: 69, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4102564784388293894 @@ -35953,10 +35919,10 @@ RectTransform: m_Father: {fileID: 5522078613306577319} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5380362717336812431 CanvasRenderer: @@ -36165,10 +36131,10 @@ RectTransform: m_Father: {fileID: 4992847748706284436} 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: 14.5, y: -37.05} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6149149407240346841 CanvasRenderer: @@ -36294,7 +36260,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: -108.880005} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 29, y: 119.2} m_Pivot: {x: 0, y: 1} --- !u!114 &5792261898672307716 MonoBehaviour: @@ -36368,7 +36334,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 55.81, y: -395.93} + m_AnchoredPosition: {x: 55.809998, y: -395.93} m_SizeDelta: {x: 112.3, y: 32.63} m_Pivot: {x: 1, y: 1} --- !u!222 &5336919609498639620 @@ -36600,7 +36566,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8625427577928505908 @@ -36707,10 +36673,10 @@ RectTransform: m_Father: {fileID: 4687026463986099029} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &37537723815729938 CanvasRenderer: @@ -37077,10 +37043,10 @@ RectTransform: m_Father: {fileID: 5996551239313135865} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 18.5, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1012523285183757621 CanvasRenderer: @@ -37151,10 +37117,10 @@ RectTransform: m_Father: {fileID: 328199011576694856} m_RootOrder: 2 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: 14.5, y: -59.6} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5439300999649445643 CanvasRenderer: @@ -37225,10 +37191,10 @@ RectTransform: m_Father: {fileID: 5522078613306577319} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 134.1, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2231801546933486979 CanvasRenderer: @@ -37267,44 +37233,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8002697024111661573 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1580303152666221298} - m_Layer: 5 - m_Name: content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1580303152666221298 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8002697024111661573} - 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: 5489039324293512018} - - {fileID: 4240211928911393712} - - {fileID: 4299231318084807277} - m_Father: {fileID: 6872382260446978439} - m_RootOrder: 2 - 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: -206.9} - m_SizeDelta: {x: 0, y: 1193.8} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8035545393350875167 GameObject: m_ObjectHideFlags: 0 @@ -37490,9 +37418,9 @@ RectTransform: m_Father: {fileID: 6114044493445337611} m_RootOrder: 1 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: 626.25} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -333.75} m_SizeDelta: {x: 1080, y: 472} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3878045185946790174 @@ -37801,10 +37729,10 @@ RectTransform: m_Father: {fileID: 9183942328723741465} m_RootOrder: 2 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: 179.5, y: -37.5} + m_SizeDelta: {x: 75, y: 53} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6741083563368498907 CanvasRenderer: @@ -38186,10 +38114,10 @@ RectTransform: m_Father: {fileID: 170872249803183511} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 105.2, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6829716411906617251 CanvasRenderer: @@ -39124,9 +39052,9 @@ RectTransform: m_Father: {fileID: 8773590478479781027} 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: 99.25, y: -721.4} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -440.75, y: 226.40002} m_SizeDelta: {x: 872.14, y: 442} m_Pivot: {x: 0, y: 1} --- !u!1 &8396134166349429991 @@ -39240,10 +39168,10 @@ RectTransform: m_Father: {fileID: 8135595490674795594} 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: 14.5, y: -14.5} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7120815993533338053 CanvasRenderer: @@ -39426,10 +39354,10 @@ RectTransform: m_Father: {fileID: 4992847748706284436} m_RootOrder: 4 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: 14.5, y: -104.7} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2868089631253669525 CanvasRenderer: @@ -39547,10 +39475,10 @@ RectTransform: m_Father: {fileID: 328199011576694856} m_RootOrder: 3 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: 14.5, y: -82.15} + m_SizeDelta: {x: 29, y: 29} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8700828069994281533 CanvasRenderer: @@ -40325,10 +40253,10 @@ RectTransform: m_Father: {fileID: 5522078613306577319} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 20} - 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: 76.3, y: -18.5} + m_SizeDelta: {x: 37, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2272050431989387336 CanvasRenderer: @@ -40936,7 +40864,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: -36.39998, y: -428.56} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 152.6, y: 37} m_Pivot: {x: 0, y: 1} --- !u!114 &4990158134938532845 MonoBehaviour: diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua index bca30b96c0..74152a71cb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua @@ -15,9 +15,9 @@ end function DynamicTaskPage:InitComponent(gameObject) itemsGrid = {}--item重复利用 singleTaskPre = {} - this.time = Util.GetGameObject(gameObject, "content/tiao/time"):GetComponent("Text") - this.itemPre = Util.GetGameObject(gameObject, "content/itempre") - this.scrollItem = Util.GetGameObject(gameObject, "content/grid") + this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") + this.itemPre = Util.GetGameObject(gameObject, "itempre") + this.scrollItem = Util.GetGameObject(gameObject, "grid") local rootHight = this.scrollItem.transform.rect.height local width = this.scrollItem.transform.rect.width this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 2906496875..dfaf605b99 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -16,9 +16,10 @@ function LeiJiChongZhiPage:InitComponent(gameObject) this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "ItemPre") this.scrollItem = Util.GetGameObject(gameObject, "grid") - local rootHight = this.scrollItem:GetComponent("RectTransform").sizeDelta + local rootHight = this.scrollItem.transform.rect.height + local width = this.scrollItem.transform.rect.width this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, - this.itemPre, nil, Vector2.New(rootHight.x, rootHight.y), 1, 1, Vector2.New(0, 30)) + this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 2 end From 18ec0b7b20a7cb8e8e9f70cb9cae183bc9c7a631 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Thu, 10 Sep 2020 10:55:29 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=90=E6=97=B6=E5=8F=AC=E5=94=A4?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/RewardPreview.lua | 12 ++++++------ .../~Lua/Modules/DynamicActivity/TimeLimitedCall.lua | 9 ++++----- .../ManagedResources/~Lua/Modules/Main/MainPanel.lua | 2 +- .../~Lua/Modules/Operating/OperatingManager.lua | 9 ++++----- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua index a46547bf12..d8103d0512 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/RewardPreview.lua @@ -9,23 +9,23 @@ local singleRecruit = nil local tenRecruit = nil function RewardPreview:ctor(gameObject) self.gameObject = gameObject - self:InitComponent(gameObject) + self:InitComponent() self:BindEvent() self:OnShow() end -function RewardPreview:InitComponent(gameObject) +function RewardPreview:InitComponent() self.closeBtn = Util.GetGameObject(self.gameObject, "close") self.itemGrid = Util.GetGameObject(self.gameObject, "itemGrid") self.itemPre = Util.GetGameObject(self.gameObject, "itemprefab") - self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x self.slider = Util.GetGameObject(self.gameObject, "Background/Fill"):GetComponent("Image") + self.sliderWidth = Util.GetGameObject(self.gameObject, "Background"):GetComponent("RectTransform").sizeDelta.x self.curtimes = Util.GetGameObject(self.gameObject, "tip1"):GetComponent("Text") end function RewardPreview:BindEvent() Util.AddClick( - self.closeBtn.gameObject, + self.closeBtn, function() self:OnHide() end @@ -61,8 +61,8 @@ function RewardPreview:RefreshRewarid() count = data[#data].Values[1][1] tmp = 0 local position = 0 - local width = self.itemPre.transform:GetComponent("RectTransform").sizeDelta.x - local interval = self.itemGrid.transform:GetComponent("RectTransform").sizeDelta.x - (width * #data) + local width = self.itemPre:GetComponent("RectTransform").sizeDelta.x + local interval = self.itemGrid:GetComponent("RectTransform").sizeDelta.x - (width * #data) if (not listPre) then listPre = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index 45a194a360..85e0bbd8fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -67,7 +67,7 @@ function TimeLimitedCall:InitComponent(gameObject) self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition self.activityBtn = Util.GetGameObject(self.gameObject,"activity") - self.rewardBtn = Util.GetGameObject(self.gameObject,"reward") + self.rewardBtn = Util.GetGameObject(self.gameObject,"rewardBtn") self.rewardBtn:SetActive(false)--(暂时关闭) self.timeupdate=Util.GetGameObject(self.gameObject,"timeupdate"):GetComponent("Text") --免费次数剩余刷新时间 @@ -146,12 +146,11 @@ end function TimeLimitedCall:RefreshNextLevelReward() local curLvstate = 0 local info= ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FindFairy) - LogGreen(info.value) - local curTimes = info.value + local curTimes = 0 local data1 = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig,"ActivityId",activityId) --通过活动id获取阶段任务 local rewarditem for n,m in ipairs(data1) do - curLvstate = self:GetMissionStateById(m.Id,activityId) + curTimes,curLvstate = self:GetMissionStateById(m.Id,activityId) if(curTimes>=m.Values[1][1]) then if curLvstate==0 then curLvstate=0 @@ -251,7 +250,7 @@ end function TimeLimitedCall:GetMissionStateById(num,activityId) local mission= ActivityGiftManager.GetActivityInfo(activityId,num) --从后端获取到的阶段数据 - return mission.state + return mission.progress,mission.state end --刷新剩余次数 diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index cc24f37498..2d073fe642 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -1659,7 +1659,7 @@ function this.RefreshActivityShow() this.questionnaireBtn:SetActive(QuestionnaireManager.GetQuestionState() == 0) --轮转活动 限时召唤 乾坤宝盒 - this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.FindFairy)) + this.btnDynamicActivity:SetActive(not not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct)) end function this.SetSevenDayCarnivalName() diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 59b93939c8..7037baa26b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -750,16 +750,15 @@ end this.TimeLimitedTimes = 0 this.allData = {} function this.InitDynamicActData() - local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.DynamicAct) - if (not id) or id == 0 then - return nil - end - if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) then + local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.DynamicAct) + if (not id) or id < 1 then return nil end + LogGreen("ActivityId:"..id) this.allData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id) local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.DynamicActTask) + LogGreen("allMissionData:"..#allMissionData) for i=1,#allListData do for j=1,#allMissionData do if allListData[i].Id == allMissionData[j].missionId then