From e35ded2b5dde8ff7d9675595290e7b74459cb4a5 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 14:08:35 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E5=B7=85=E5=B3=B0=E8=B5=9B=E6=98=9F?= =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArenaTopMatch/ArenaTopMatchPanel.prefab | 142 +++++++++--------- .../ArenaTopMatch/View/ATM_CommonInfo.lua | 12 +- 2 files changed, 77 insertions(+), 77 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index f6b0b0bbd2..3434d14799 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -150,10 +150,10 @@ RectTransform: m_Father: {fileID: 136085602} 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: 31, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &95245974 CanvasRenderer: @@ -5418,7 +5418,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &351397706 @@ -15313,10 +15313,10 @@ RectTransform: m_Father: {fileID: 136085602} 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: 97.52, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &506673911 CanvasRenderer: @@ -59919,7 +59919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3414655680617284804 RectTransform: m_ObjectHideFlags: 0 @@ -61619,7 +61619,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826034946034072 @@ -62138,7 +62138,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035233796703 @@ -62424,7 +62424,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826035594093052 @@ -63319,7 +63319,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036035083391 @@ -63683,7 +63683,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 30, y: 0.000022888184} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1868826036237771050 @@ -83322,7 +83322,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261126307273 @@ -83571,9 +83571,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261139886263 @@ -83648,9 +83648,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 475.09, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261196340906 @@ -83842,7 +83842,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261212098139 @@ -84275,9 +84275,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261390384789 @@ -85521,7 +85521,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261646268033 @@ -85619,7 +85619,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261649573758 @@ -85790,9 +85790,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261777695568 @@ -86168,9 +86168,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116261844073132 @@ -86287,7 +86287,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261866451864 @@ -86646,7 +86646,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261958035100 @@ -86744,7 +86744,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116261984099562 @@ -86840,9 +86840,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262002252256 @@ -87221,7 +87221,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262060962360 @@ -87614,9 +87614,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262256548568 @@ -87771,7 +87771,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262294965716 @@ -87867,9 +87867,9 @@ RectTransform: m_Father: {fileID: 4026116261534551149} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615.12, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262325622925 @@ -89205,7 +89205,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262616649152 @@ -89724,9 +89724,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 335.06, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262791904998 @@ -90333,7 +90333,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116262910380400 @@ -90429,9 +90429,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 755.15, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116262916179914 @@ -90852,9 +90852,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 195.03, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263129528938 @@ -90892,7 +90892,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 33.6, y: 4.544998} + m_AnchoredPosition: {x: 28.4, y: 0.000045776367} m_SizeDelta: {x: 99.7, y: 29.09} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4026116263129528932 @@ -91206,9 +91206,9 @@ RectTransform: m_Father: {fileID: 4026116263152147740} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 55, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4026116263232579479 @@ -106663,10 +106663,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} 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: 221.4, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2414242672251041193 CanvasRenderer: @@ -112623,10 +112623,10 @@ RectTransform: m_Father: {fileID: 410237481221277589} 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: 154.87999, y: -31} + m_SizeDelta: {x: 62, y: 62} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &79708565718575260 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua index 5ab372297c..823930a569 100644 --- a/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_CommonInfo.lua @@ -303,14 +303,14 @@ function this.FreshTeam2(formation, isBlue) end for i, hero in ipairs(formation.teamHeroInfos) do local heroData = HeroManager.GetSingleHeroData(formation.teamHeroInfos[i].heroId) - teamRoot[heroData.position].hero:SetActive(true) - teamRoot[heroData.position].levelText.text = heroData.lv + teamRoot[hero.position].hero:SetActive(true) + teamRoot[hero.position].levelText.text = heroData.lv local star,starType = heroData.GetStar(1) - SetHeroStars(this.spLoader, teamRoot[heroData.position].starGrid, star,starType) + SetHeroStars(this.spLoader, teamRoot[hero.position].starGrid, star,starType) local heroConfig = heroData.heroConfig - teamRoot[heroData.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) - heroData,teamRoot[heroData.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) - teamRoot[heroData.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) + teamRoot[hero.position].frame.sprite = this.spLoader:LoadSprite(GetQuantityImageByquality(heroConfig.Quality,heroData.star)) + teamRoot[hero.position].icon.sprite = this.spLoader:LoadSprite(heroData.icon) + teamRoot[hero.position].proIcon.sprite = this.spLoader:LoadSprite(GetProStrImageByProNum(heroConfig.PropertyName)) end end -- 控制显示编队信息 From 420356da83d3a99ca76c1deb30223a10a032ff31 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 14:33:09 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=89=B9=E6=95=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/DamageResult.prefab | 10 +++++----- .../~Lua/Modules/Battle/View/DamageResultPanel.lua | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 759cc9cd2a..9f99acebb4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -844,7 +844,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -1498,7 +1498,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 120} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 CanvasRenderer: @@ -2920,7 +2920,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8608652293910191374 RectTransform: m_ObjectHideFlags: 0 @@ -3602,7 +3602,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: @@ -4410,7 +4410,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3433503071718014541 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index e28acddbcc..88a8efc825 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -55,8 +55,6 @@ function DamageResultPanel:InitComponent() this.TabCtrl = TabBox.New() this.TabCtrl:SetTabAdapter(this.TabAdapter) this.TabCtrl:SetChangeTabCallBack(this.OnTabChange) - this.TabCtrl:Init(this.tabbox, _TabData) - end --绑定事件(用于子类重写) @@ -77,7 +75,7 @@ end --界面打开时调用(用于子类重写) function DamageResultPanel:OnOpen(result) - + this.TabCtrl:Init(this.tabbox, _TabData) this.leftResult.sprite = this.spLoader:LoadSprite(result == 1 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") this.rightResult.sprite = this.spLoader:LoadSprite(result == 0 and "UI_effect_JJC_JieSuan_ShengLi_png_zh" or "UI_effect_JJC_JieSuan_ShiBai_png_zh") @@ -110,7 +108,9 @@ function DamageResultPanel:OnOpen(result) end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function DamageResultPanel:OnShow()end +function DamageResultPanel:OnShow() + +end function this.isTabShow(index) if not this.battleRecord then @@ -402,7 +402,7 @@ function this.HeadAdapter(head, data) starType = 3 end SetHeroStars(this.spLoader, starRoot, star,starType) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 职业 prefess:SetActive(false) -- 属性 @@ -423,7 +423,7 @@ function this.HeadAdapter(head, data) lvText.text = roleLv -- 星级 SetHeroStars(this.spLoader, starRoot, star) - Util.SetParticleSortLayer(starRoot,this.sortingorder + 1) + Util.SetParticleSortLayer(starRoot,this.sortingOrder + 1) -- 头像 frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(SpiritAnimal[id].Quality)) icon:GetComponent("Image").sprite = this.spLoader:LoadSprite(GetResourcePath(SpiritAnimal[id].Icon)) From 0bd44642dc14dee77e5cee3ede1d3c6b2d5b4df1 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 14:44:10 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=88=98=E6=96=97=E7=BB=93=E7=AE=97?= =?UTF-8?q?=E7=95=8C=E9=9D=A2=E6=98=9F=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Battle/DamageResult.prefab | 60 +++++++++---------- .../~Lua/Common/functions.lua | 4 -- 2 files changed, 29 insertions(+), 35 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 9f99acebb4..8a7e7054e6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -780,10 +780,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5759458907260581076} - - component: {fileID: 2268112297203187335} - component: {fileID: 3141451647582073682} - component: {fileID: 5600276639709997912} - component: {fileID: 5138165610675945150} + - component: {fileID: 1473550282977014420} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -811,19 +811,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2268112297203187335 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2479383142512665533} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &3141451647582073682 CanvasRenderer: m_ObjectHideFlags: 0 @@ -893,6 +880,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &1473550282977014420 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2479383142512665533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2658533052818541386 GameObject: m_ObjectHideFlags: 0 @@ -1498,7 +1497,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 120} m_Pivot: {x: 0, y: 1} --- !u!222 &3723123758606190715 CanvasRenderer: @@ -2920,7 +2919,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &8608652293910191374 RectTransform: m_ObjectHideFlags: 0 @@ -3538,10 +3537,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7679809175275777088} - - component: {fileID: 3698492846638881566} - component: {fileID: 4875746903694999264} - component: {fileID: 5725152609552433708} - component: {fileID: 860553753996015348} + - component: {fileID: 228282531681914892} m_Layer: 5 m_Name: scrollRect m_TagString: Untagged @@ -3569,19 +3568,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -50} m_SizeDelta: {x: 0, y: -100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &3698492846638881566 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7941768748633467235} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 --- !u!222 &4875746903694999264 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3651,6 +3637,18 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!114 &228282531681914892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7941768748633467235} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7947261403598486277 GameObject: m_ObjectHideFlags: 0 @@ -4410,7 +4408,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &3433503071718014541 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index b8f455d4b8..49931dadc3 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -409,10 +409,6 @@ function GetStarOrGodSoulLv(index,data) return data.star,index end -function SetOriScale() - -end - --把英雄星级父对象和星级传过来 type 1 第6-11个预设 type 2 第12-17个预设 type 3 第18-24个预设 function SetHeroStars(spLoader, starGrid, star, type,_starSize,_scale,_pivot,rotation) From 8740afa514f6d2e0edbbba58c34bc211cfe33c58 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 15:02:33 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E5=A4=A7=E8=84=91=E5=A4=A9=E5=AE=AB?= =?UTF-8?q?=E7=A5=9E=E9=AD=82=E6=98=9F=E6=98=9F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExpeditionHeroListInfoPopup.prefab | 39 +++++++++++ .../ExpeditionHeroListResurgencePopup.prefab | 39 +++++++++++ .../FindTreasureDispatchPanel.prefab | 69 +++++++++++++++++++ .../UI/Formation/FormationEditPopup.prefab | 39 +++++++++++ .../UI/RoleInfo/RoleUpStarListPanel.prefab | 2 +- 5 files changed, 187 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab index 26e83f4d25..022d68e0f6 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListInfoPopup.prefab @@ -2877,6 +2877,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8060973784394088321} + - component: {fileID: 8442645740951799786} + - component: {fileID: 5047410682410263552} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -2903,6 +2905,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 81.4} m_SizeDelta: {x: 927.5, y: 978.2} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8442645740951799786 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7837577505631096959} + m_CullTransparentMesh: 0 +--- !u!114 &5047410682410263552 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7837577505631096959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &7837584785293409971 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab index e08d54bec9..6a94ef92f5 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionHeroListResurgencePopup.prefab @@ -1200,6 +1200,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3197490103942022047} + - component: {fileID: 133388500665279468} + - component: {fileID: 5419035180060586392} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -1226,6 +1228,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 87.52498} m_SizeDelta: {x: 927.5, y: 965.95} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &133388500665279468 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3406194161806404705} + m_CullTransparentMesh: 0 +--- !u!114 &5419035180060586392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3406194161806404705} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 0} + 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 &3406226350511288493 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab index 908812b0b6..11de750f78 100644 --- a/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/FindTreasure/FindTreasureDispatchPanel.prefab @@ -4258,6 +4258,7 @@ GameObject: m_Component: - component: {fileID: 1939177026611606392} - component: {fileID: 1937634087149734782} + - component: {fileID: 3138624694152778311} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -4292,6 +4293,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1869611150155371252} m_CullTransparentMesh: 0 +--- !u!114 &3138624694152778311 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1869611150155371252} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + 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: 0} + 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 &1869613631891814722 GameObject: m_ObjectHideFlags: 0 @@ -13724,6 +13754,8 @@ GameObject: m_Component: - component: {fileID: 8931883141293784445} - component: {fileID: 314793541967843562} + - component: {fileID: 6554334574166295044} + - component: {fileID: 5403743841401786723} m_Layer: 5 m_Name: selectHeroGrid m_TagString: Untagged @@ -13779,6 +13811,43 @@ MonoBehaviour: m_Spacing: {x: 77.48, y: 0} m_Constraint: 2 m_ConstraintCount: 1 +--- !u!222 &6554334574166295044 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891037395469127299} + m_CullTransparentMesh: 0 +--- !u!114 &5403743841401786723 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8891037395469127299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &8915669173798880494 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab index e194a10c69..efe5dd998f 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab @@ -1326,6 +1326,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 224284833056434696} + - component: {fileID: 8441201234771937878} + - component: {fileID: 3837139053022586153} m_Layer: 5 m_Name: scroll m_TagString: Untagged @@ -1352,6 +1354,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 107} m_SizeDelta: {x: 927.5, y: 927} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8441201234771937878 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739547300218358} + m_CullTransparentMesh: 0 +--- !u!114 &3837139053022586153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1739547300218358} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &1741692233933420 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index b6af52de53..b78f26e7ed 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -929,7 +929,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: From ccab15ab98372c02c103891b48905eec14420bab Mon Sep 17 00:00:00 2001 From: liujiaqi Date: Sun, 7 Nov 2021 14:55:20 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E3=80=90=E8=B5=84=E6=BA=90=E3=80=91?= =?UTF-8?q?=E7=A5=9E=E9=AD=82icon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Icon/Item/r_zjm_shenhun.png | Bin 0 -> 29557 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png diff --git a/Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png b/Assets/ManagedResources/Icon/Item/r_zjm_shenhun.png new file mode 100644 index 0000000000000000000000000000000000000000..68419ac7ca88a814b71b3297853e9ac0da285e90 GIT binary patch literal 29557 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 literal 0 HcmV?d00001 From 057ec06b4c0a5a6a56e720fc328ad8b76c1597ba Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 15:14:00 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArenaTopMatch/ArenaTopMatchPanel.prefab | 736 +++++------------- .../UI/GeneralPanel/GeneralBigPopup.prefab | 63 ++ .../~Lua/Message/MapInfoProto_pb.lua | 13 +- 3 files changed, 251 insertions(+), 561 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab index 3434d14799..78630efce8 100644 --- a/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/ArenaTopMatch/ArenaTopMatchPanel.prefab @@ -112,9 +112,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} 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: 471.4, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &95245971 @@ -5394,7 +5394,6 @@ GameObject: - component: {fileID: 351397705} - component: {fileID: 351397706} - component: {fileID: 1904013367747279327} - - component: {fileID: 4614241612954376116} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -5419,7 +5418,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 30, y: 0.000022888184} - m_SizeDelta: {x: 99.7, y: 29.09} + m_SizeDelta: {x: 99.7, y: 30.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &351397706 MonoBehaviour: @@ -5452,35 +5451,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 351397704} m_CullTransparentMesh: 0 ---- !u!114 &4614241612954376116 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 351397704} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &380148509 GameObject: m_ObjectHideFlags: 0 @@ -20565,9 +20535,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} 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: 193.8, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &862902003 @@ -20683,9 +20653,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} 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: 55, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &907713333 @@ -45178,9 +45148,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 749, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1719915318 @@ -45257,9 +45227,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} 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: 332.6, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1787225927 @@ -50119,9 +50089,9 @@ RectTransform: m_Father: {fileID: 1868826034778785617} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 610.2, y: -55} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1856229260 @@ -61376,6 +61346,8 @@ GameObject: m_Component: - component: {fileID: 1868826034778785617} - component: {fileID: 1868826034778785618} + - component: {fileID: 3503426392593449728} + - component: {fileID: 5125082617439025741} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -61431,6 +61403,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &3503426392593449728 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868826034778785616} + m_CullTransparentMesh: 0 +--- !u!114 &5125082617439025741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1868826034778785616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &1868826034830884837 GameObject: m_ObjectHideFlags: 0 @@ -61595,7 +61604,6 @@ GameObject: - component: {fileID: 1868826034946034071} - component: {fileID: 1868826034946034072} - component: {fileID: 5673796351078933169} - - component: {fileID: 7589816303261715998} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -61653,35 +61661,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826034946034070} m_CullTransparentMesh: 0 ---- !u!114 &7589816303261715998 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826034946034070} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &1868826034946752640 GameObject: m_ObjectHideFlags: 0 @@ -62114,7 +62093,6 @@ GameObject: - component: {fileID: 1868826035233796702} - component: {fileID: 1868826035233796703} - component: {fileID: 3075417289560795821} - - component: {fileID: 8687057859013718675} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62172,35 +62150,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826035233796701} m_CullTransparentMesh: 0 ---- !u!114 &8687057859013718675 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826035233796701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &1868826035237987617 GameObject: m_ObjectHideFlags: 0 @@ -62400,7 +62349,6 @@ GameObject: - component: {fileID: 1868826035594093051} - component: {fileID: 1868826035594093052} - component: {fileID: 2282993351458491329} - - component: {fileID: 8631399308126000176} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -62458,35 +62406,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826035594093050} m_CullTransparentMesh: 0 ---- !u!114 &8631399308126000176 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826035594093050} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &1868826035683771220 GameObject: m_ObjectHideFlags: 0 @@ -63295,7 +63214,6 @@ GameObject: - component: {fileID: 1868826036035083390} - component: {fileID: 1868826036035083391} - component: {fileID: 4469491083960130862} - - component: {fileID: 2894425976571427058} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -63353,35 +63271,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826036035083389} m_CullTransparentMesh: 0 ---- !u!114 &2894425976571427058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826036035083389} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &1868826036070982585 GameObject: m_ObjectHideFlags: 0 @@ -63659,7 +63548,6 @@ GameObject: - component: {fileID: 1868826036237771049} - component: {fileID: 1868826036237771050} - component: {fileID: 7111802892512469401} - - component: {fileID: 3470750373883396530} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -63717,35 +63605,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1868826036237771048} m_CullTransparentMesh: 0 ---- !u!114 &3470750373883396530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1868826036237771048} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &1868826036264750172 GameObject: m_ObjectHideFlags: 0 @@ -67954,7 +67813,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8756775217935235499 RectTransform: m_ObjectHideFlags: 0 @@ -83298,7 +83157,6 @@ GameObject: - component: {fileID: 4026116261126307272} - component: {fileID: 4026116261126307273} - component: {fileID: 8118542585179858548} - - component: {fileID: 14911276904562653} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -83356,35 +83214,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261126307279} m_CullTransparentMesh: 0 ---- !u!114 &14911276904562653 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261126307279} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261126903700 GameObject: m_ObjectHideFlags: 0 @@ -83818,7 +83647,6 @@ GameObject: - component: {fileID: 4026116261212098138} - component: {fileID: 4026116261212098139} - component: {fileID: 351911577483189000} - - component: {fileID: 6898683123539119743} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -83876,35 +83704,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261212098137} m_CullTransparentMesh: 0 ---- !u!114 &6898683123539119743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261212098137} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261279496947 GameObject: m_ObjectHideFlags: 0 @@ -84748,6 +84547,8 @@ GameObject: m_Component: - component: {fileID: 4026116261534551149} - component: {fileID: 4026116261534551150} + - component: {fileID: 6772826342536412112} + - component: {fileID: 609950460406448359} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -84803,6 +84604,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &6772826342536412112 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116261534551148} + m_CullTransparentMesh: 0 +--- !u!114 &609950460406448359 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116261534551148} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &4026116261542644240 GameObject: m_ObjectHideFlags: 0 @@ -85497,7 +85335,6 @@ GameObject: - component: {fileID: 4026116261646268032} - component: {fileID: 4026116261646268033} - component: {fileID: 2589457525423443952} - - component: {fileID: 3690923674897914385} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -85555,35 +85392,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261646268039} m_CullTransparentMesh: 0 ---- !u!114 &3690923674897914385 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261646268039} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261649573756 GameObject: m_ObjectHideFlags: 0 @@ -85595,7 +85403,6 @@ GameObject: - component: {fileID: 4026116261649573757} - component: {fileID: 4026116261649573758} - component: {fileID: 8397914187952360522} - - component: {fileID: 2756407637336490555} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -85653,35 +85460,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261649573756} m_CullTransparentMesh: 0 ---- !u!114 &2756407637336490555 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261649573756} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261660019948 GameObject: m_ObjectHideFlags: 0 @@ -86263,7 +86041,6 @@ GameObject: - component: {fileID: 4026116261866451871} - component: {fileID: 4026116261866451864} - component: {fileID: 7682457415549150016} - - component: {fileID: 5661370104997949624} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86321,35 +86098,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261866451870} m_CullTransparentMesh: 0 ---- !u!114 &5661370104997949624 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261866451870} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261911103185 GameObject: m_ObjectHideFlags: 0 @@ -86622,7 +86370,6 @@ GameObject: - component: {fileID: 4026116261958035107} - component: {fileID: 4026116261958035100} - component: {fileID: 4981083189726720880} - - component: {fileID: 1582876748492318018} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86680,35 +86427,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261958035106} m_CullTransparentMesh: 0 ---- !u!114 &1582876748492318018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261958035106} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261984099560 GameObject: m_ObjectHideFlags: 0 @@ -86720,7 +86438,6 @@ GameObject: - component: {fileID: 4026116261984099561} - component: {fileID: 4026116261984099562} - component: {fileID: 2966269858965094424} - - component: {fileID: 5784572779375931639} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -86778,35 +86495,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116261984099560} m_CullTransparentMesh: 0 ---- !u!114 &5784572779375931639 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116261984099560} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116261984730529 GameObject: m_ObjectHideFlags: 0 @@ -87197,7 +86885,6 @@ GameObject: - component: {fileID: 4026116262060962367} - component: {fileID: 4026116262060962360} - component: {fileID: 4044531212554517326} - - component: {fileID: 746238378995267218} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -87255,35 +86942,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262060962366} m_CullTransparentMesh: 0 ---- !u!114 &746238378995267218 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262060962366} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116262072096506 GameObject: m_ObjectHideFlags: 0 @@ -87747,7 +87405,6 @@ GameObject: - component: {fileID: 4026116262294965723} - component: {fileID: 4026116262294965716} - component: {fileID: 4535279799048966407} - - component: {fileID: 5029114973576945743} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -87805,35 +87462,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262294965722} m_CullTransparentMesh: 0 ---- !u!114 &5029114973576945743 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262294965722} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116262325057893 GameObject: m_ObjectHideFlags: 0 @@ -89181,7 +88809,6 @@ GameObject: - component: {fileID: 4026116262616649159} - component: {fileID: 4026116262616649152} - component: {fileID: 1266220529257659965} - - component: {fileID: 7089031129019080069} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -89239,35 +88866,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262616649158} m_CullTransparentMesh: 0 ---- !u!114 &7089031129019080069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262616649158} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116262639155791 GameObject: m_ObjectHideFlags: 0 @@ -90309,7 +89907,6 @@ GameObject: - component: {fileID: 4026116262910380407} - component: {fileID: 4026116262910380400} - component: {fileID: 557441685851680365} - - component: {fileID: 7168811506763184005} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -90367,35 +89964,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116262910380406} m_CullTransparentMesh: 0 ---- !u!114 &7168811506763184005 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116262910380406} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116262914168895 GameObject: m_ObjectHideFlags: 0 @@ -90868,7 +90436,6 @@ GameObject: - component: {fileID: 4026116263129528939} - component: {fileID: 4026116263129528932} - component: {fileID: 8108344715590403823} - - component: {fileID: 9063506155747608206} m_Layer: 5 m_Name: starGrid m_TagString: Untagged @@ -90926,35 +90493,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4026116263129528938} m_CullTransparentMesh: 0 ---- !u!114 &9063506155747608206 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4026116263129528938} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} - 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: 0} - 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 &4026116263140807814 GameObject: m_ObjectHideFlags: 0 @@ -91118,6 +90656,8 @@ GameObject: m_Component: - component: {fileID: 4026116263152147740} - component: {fileID: 4026116263152147741} + - component: {fileID: 8727677702614122665} + - component: {fileID: 2699180203137277353} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -91173,6 +90713,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &8727677702614122665 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116263152147747} + m_CullTransparentMesh: 0 +--- !u!114 &2699180203137277353 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4026116263152147747} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &4026116263186837814 GameObject: m_ObjectHideFlags: 0 @@ -109924,6 +109501,8 @@ GameObject: m_Component: - component: {fileID: 5920972804787731201} - component: {fileID: 5920972804787731202} + - component: {fileID: 5277159194931872215} + - component: {fileID: 294738224833165928} m_Layer: 0 m_Name: Demons m_TagString: Untagged @@ -109978,6 +109557,43 @@ MonoBehaviour: m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!222 &5277159194931872215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920972804787731200} + m_CullTransparentMesh: 0 +--- !u!114 &294738224833165928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5920972804787731200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &5942198291974117628 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index b1a4fe6c0e..e1d52ac654 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -4335,6 +4335,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7656265836104597532} + - component: {fileID: 5314499766617022713} + - component: {fileID: 6559035210426676433} m_Layer: 5 m_Name: Scroll m_TagString: Untagged @@ -4361,6 +4363,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -28.8} m_SizeDelta: {x: 900, y: 948.1} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5314499766617022713 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669882069863049176} + m_CullTransparentMesh: 0 +--- !u!114 &6559035210426676433 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 669882069863049176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &691946464718676944 GameObject: m_ObjectHideFlags: 0 @@ -29356,6 +29395,7 @@ GameObject: m_Component: - component: {fileID: 4134529790793770453} - component: {fileID: 1090357375526350085} + - component: {fileID: 1387854069419566085} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -29390,6 +29430,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9152079933032544111} m_CullTransparentMesh: 0 +--- !u!114 &1387854069419566085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9152079933032544111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &9160240826233526572 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua index 3db08a1c9a..e75239968a 100644 --- a/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/MapInfoProto_pb.lua @@ -16,6 +16,7 @@ TRIALHEROINFO_HEROHP_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_SKINID_FIELD = protobuf.FieldDescriptor(); TRIALHEROINFO_POSITION_FIELD = protobuf.FieldDescriptor(); +TRIALHEROINFO_GODSOULLV_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION = protobuf.Descriptor(); DIFFICULTMAPOPTION_ID_FIELD = protobuf.FieldDescriptor(); DIFFICULTMAPOPTION_MAPDIFFICULTY_FIELD = protobuf.FieldDescriptor(); @@ -352,11 +353,21 @@ TRIALHEROINFO_POSITION_FIELD.default_value = 0 TRIALHEROINFO_POSITION_FIELD.type = 5 TRIALHEROINFO_POSITION_FIELD.cpp_type = 1 +TRIALHEROINFO_GODSOULLV_FIELD.name = "godSoulLv" +TRIALHEROINFO_GODSOULLV_FIELD.full_name = ".rpc.protocols.TrialHeroInfo.godSoulLv" +TRIALHEROINFO_GODSOULLV_FIELD.number = 8 +TRIALHEROINFO_GODSOULLV_FIELD.index = 7 +TRIALHEROINFO_GODSOULLV_FIELD.label = 1 +TRIALHEROINFO_GODSOULLV_FIELD.has_default_value = false +TRIALHEROINFO_GODSOULLV_FIELD.default_value = 0 +TRIALHEROINFO_GODSOULLV_FIELD.type = 5 +TRIALHEROINFO_GODSOULLV_FIELD.cpp_type = 1 + TRIALHEROINFO.name = "TrialHeroInfo" TRIALHEROINFO.full_name = ".rpc.protocols.TrialHeroInfo" TRIALHEROINFO.nested_types = {} TRIALHEROINFO.enum_types = {} -TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD} +TRIALHEROINFO.fields = {TRIALHEROINFO_HEROID_FIELD, TRIALHEROINFO_TMPID_FIELD, TRIALHEROINFO_STAR_FIELD, TRIALHEROINFO_HEROHP_FIELD, TRIALHEROINFO_LEVEL_FIELD, TRIALHEROINFO_SKINID_FIELD, TRIALHEROINFO_POSITION_FIELD, TRIALHEROINFO_GODSOULLV_FIELD} TRIALHEROINFO.is_extendable = false TRIALHEROINFO.extensions = {} DIFFICULTMAPOPTION_ID_FIELD.name = "Id" From f8b43c4c307587f8468f87421d92f4f76dde8cac Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 15:23:21 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E4=BF=AE=E8=A1=8C=E6=98=9F=E6=98=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Practice/PracticeImprintPanel.prefab | 72 +++++++++++++++++++ .../GeneralBigPopup_XiuXingSelectHero.lua | 2 +- 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab index d4f932bf34..9b4e510a46 100644 --- a/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Practice/PracticeImprintPanel.prefab @@ -3005,6 +3005,7 @@ GameObject: - component: {fileID: 2553759180244413173} - component: {fileID: 5559974153339085360} - component: {fileID: 8594897013185962644} + - component: {fileID: 4439679039454687099} m_Layer: 0 m_Name: Scroll m_TagString: Untagged @@ -3076,6 +3077,14 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!222 &4439679039454687099 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3853548438243551823} + m_CullTransparentMesh: 0 --- !u!1 &3886299620309998347 GameObject: m_ObjectHideFlags: 0 @@ -4168,6 +4177,7 @@ GameObject: m_Component: - component: {fileID: 944098213738272631} - component: {fileID: 5438584371727106758} + - component: {fileID: 2618497146617067296} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -4202,6 +4212,29 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5681427206251380380} m_CullTransparentMesh: 0 +--- !u!114 &2618497146617067296 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5681427206251380380} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5719908235039403081 GameObject: m_ObjectHideFlags: 0 @@ -4648,6 +4681,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4908055247632876805} + - component: {fileID: 2567286864525828672} + - component: {fileID: 7336073635758433815} m_Layer: 5 m_Name: GameObject m_TagString: Untagged @@ -4681,6 +4716,43 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2567286864525828672 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + m_CullTransparentMesh: 0 +--- !u!114 &7336073635758433815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6139901755147080176} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &6278859579252585660 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua index a237423c80..0379102f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_XiuXingSelectHero.lua @@ -117,7 +117,7 @@ function this:ShowSingleData(go,heroData,index) end local star,starType = heroData.GetStar(1) SetHeroStars(self.spLoader, starGrid, star,starType) - Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) + Util.SetParticleSortLayer(starGrid,sortingOrder + 1) Util.AddOnceClick(go, function() for i = 1, #self.maskList do self.maskList[i]:SetActive(false) From 1c2758f26c539a25ac52d3d8983f1a920172c911 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Fri, 5 Nov 2021 15:48:22 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E9=80=81=E7=A5=9E=E7=A5=A0=E6=98=9F?= =?UTF-8?q?=E7=BA=A7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Resolve/ResolvePanel.prefab | 218 +++++++++++++++++- .../~Lua/Modules/Resolve/ResolvePanel.lua | 4 +- .../Resolve/View/Resolve_Dismantle.lua | 10 +- .../Resolve/View/Resolve_EquipTreasure.lua | 5 +- .../Modules/Resolve/View/Resolve_Pokemon.lua | 6 +- .../Modules/Resolve/View/Resolve_Recall.lua | 4 +- .../Modules/Resolve/View/Resolve_Talisman.lua | 4 +- 7 files changed, 225 insertions(+), 26 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab index 49c429db52..c4f22d5dc4 100644 --- a/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab @@ -4189,6 +4189,7 @@ GameObject: m_Component: - component: {fileID: 2492555335493657461} - component: {fileID: 7264707228109259493} + - component: {fileID: 1463406129850090696} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -4223,6 +4224,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2819120374147908973} m_CullTransparentMesh: 0 +--- !u!114 &1463406129850090696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2819120374147908973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &2854028092386135442 GameObject: m_ObjectHideFlags: 0 @@ -5980,6 +6010,7 @@ GameObject: m_Component: - component: {fileID: 4910242485821419028} - component: {fileID: 3684918263632949848} + - component: {fileID: 1093422362649456572} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -6014,6 +6045,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4431145364068676807} m_CullTransparentMesh: 0 +--- !u!114 &1093422362649456572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4431145364068676807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &4480184209769585281 GameObject: m_ObjectHideFlags: 0 @@ -6642,7 +6702,7 @@ RectTransform: m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7198,10 +7258,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} 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: 184.52998, y: -63.65} - m_SizeDelta: {x: 190, y: 58} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5004630570938477890 CanvasRenderer: @@ -8218,6 +8278,7 @@ GameObject: m_Component: - component: {fileID: 5403932856111560861} - component: {fileID: 5403932856111560862} + - component: {fileID: 1662750947976081219} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -8252,6 +8313,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5403932856111560860} m_CullTransparentMesh: 0 +--- !u!114 &1662750947976081219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5403932856111560860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &5403932856370853838 GameObject: m_ObjectHideFlags: 0 @@ -9983,7 +10073,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1508773176926603313 RectTransform: m_ObjectHideFlags: 0 @@ -10033,6 +10123,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7493297396072330528} + - component: {fileID: 7161690682615853999} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -10059,6 +10150,29 @@ RectTransform: m_AnchoredPosition: {x: -27.200073, y: -2.289856} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} +--- !u!114 &7161690682615853999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5774851079038251242} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &5808127690274937458 GameObject: m_ObjectHideFlags: 0 @@ -15073,10 +15187,10 @@ RectTransform: m_Father: {fileID: 235641477404672219} 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: 377.56998, y: -63.65} - m_SizeDelta: {x: 190, y: 58} + 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_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3769464419337462616 CanvasRenderer: @@ -15530,6 +15644,7 @@ GameObject: m_Component: - component: {fileID: 8120306587700567573} - component: {fileID: 1609821383811113227} + - component: {fileID: 2244901784412925840} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -15564,6 +15679,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8702982654703153435} m_CullTransparentMesh: 0 +--- !u!114 &2244901784412925840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8702982654703153435} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &8713559114260582039 GameObject: m_ObjectHideFlags: 0 @@ -15649,6 +15793,7 @@ GameObject: m_Component: - component: {fileID: 121018265363263051} - component: {fileID: 8550694524238033415} + - component: {fileID: 141218723707247498} m_Layer: 5 m_Name: ItemListRoot m_TagString: Untagged @@ -15683,6 +15828,35 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8716657455423796376} m_CullTransparentMesh: 0 +--- !u!114 &141218723707247498 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8716657455423796376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + 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: 0} + 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 &8722264005408772271 GameObject: m_ObjectHideFlags: 0 @@ -15766,6 +15940,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5673655264526685079} + - component: {fileID: 2267312691036561670} m_Layer: 5 m_Name: star m_TagString: Untagged @@ -15792,6 +15967,29 @@ RectTransform: m_AnchoredPosition: {x: -23.200073, y: 1.8100815} m_SizeDelta: {x: 142.16, y: 29.089996} m_Pivot: {x: 0, y: 0} +--- !u!114 &2267312691036561670 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8747452094286943837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 6 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &8774376236652444173 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua index 658dca62bf..6bbfbfba98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/ResolvePanel.lua @@ -91,11 +91,11 @@ function ResolvePanel:BindEvent() print(Language[12153]..tabSortType) if tabSortType == i-1 then tabSortType = 0 - this.contents[curIndex].view.SortTypeClick(0)--全部 + this.contents[curIndex].view.SortTypeClick(this.sortingOrder,0)--全部 this.EndTabBtnSelect() else tabSortType = i-1 - this.contents[curIndex].view.SortTypeClick(i-1) + this.contents[curIndex].view.SortTypeClick(this.sortingOrder,i-1) this.EndTabBtnSelect(heroEndBtns[i]) end PlayerManager.now_index = tabSortType diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua index 7a61002089..387e9100bd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua @@ -1,6 +1,7 @@ ----- 献祭 ----- local this = {} local sortingOrder=0 +local sort = 0 local tabSortType = 0 local tarHero local selectHeroData={}--选择的英雄list did = data @@ -72,14 +73,15 @@ end function this:OnShow(...) local args={...} + sort = args[1] sortingOrder = PlayerManager.now_index or 0 - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(sort,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) - LogRed("isTop "..tostring(isTop).." isAni "..tostring(isAni)) +function this.SortTypeClick(sortingOrder,_sortType,isTop,isAni) + sort = sortingOrder tabSortType=_sortType selectHeroData={} tarHero=HeroManager.GetAllHeroDataMsinusUpWar(_sortType,2) @@ -119,7 +121,7 @@ function this.SingleHeroDataShow(go,_heroData) starSize = Vector2.New(60,57) end SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) - Util.SetParticleSortLayer(starGrid, sortingOrder + 1) + Util.SetParticleSortLayer(starGrid, sort + 1) local choosed =Util.GetGameObject(_go.transform, "choosed") local formationMask =Util.GetGameObject(_go.transform, "formationMask") Util.GetGameObject(_go.transform, "formationMask/formationImage/upImage"):GetComponent("Image").sprite = this.spLoader:LoadSprite("t_tongyong-yishangzheng_zh") diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua index 7d72d83300..682b47f110 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_EquipTreasure.lua @@ -65,15 +65,14 @@ end function this:OnShow(...) local args={...} - sortingOrder =0 sortingOrder = PlayerManager.now_index or 0 --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(0,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) tabSortType=_sortType selectEquipTreasureData={} if tabSortType == 0 then diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua index 517e8b7e01..75bc13f093 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua @@ -166,7 +166,7 @@ function this:BindEvent() end selectChipId = 0 oldChoosed = nil - this.SortTypeClick(sortingOrder) + this.SortTypeClick(0,sortingOrder) end) end) end) @@ -182,11 +182,11 @@ function this:OnShow(...) local args={...} sortingOrder =0 this.chooseObjList = {} - this.SortTypeClick(sortingOrder,args[3],args[4]) + this.SortTypeClick(0,sortingOrder,args[3],args[4]) end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) tabSortType=_sortType selectHeroData={} --所有灵兽数据 diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua index 2846dfe0b6..0c83a303e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua @@ -60,7 +60,7 @@ function this:OnShow(...) sortType = PlayerManager.now_index or 0 --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortType,args[3],args[4]) + this.SortTypeClick(sortingOrder,sortType,args[3],args[4]) end function this:OnClose() @@ -75,7 +75,7 @@ end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) selectHeroData={} tarHero={} diff --git a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua index fd8577f99f..f37abe6d46 100644 --- a/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua +++ b/Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua @@ -61,7 +61,7 @@ function this:OnShow(...) --LogGreen(PlayerManager.now_index) - this.SortTypeClick(sortType,args[3],args[4]) + this.SortTypeClick(sortingOrder,sortType,args[3],args[4]) end function this:OnClose() @@ -76,7 +76,7 @@ end --展示数据 -function this.SortTypeClick(_sortType,isTop,isAni) +function this.SortTypeClick(_sort,_sortType,isTop,isAni) selectHeroData={} tarHero={}