From 93b8746cfeebdcf74df99bb097d4919473e21852 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 18 May 2021 14:59:47 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BF=AE=E8=A1=8C=E3=80=91=E7=8E=A9?= =?UTF-8?q?=E5=AE=B6=E4=BF=A1=E6=81=AF=E7=95=8C=E9=9D=A2=E7=A5=9E=E5=8D=B0?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/Popup/PlayerInfoPopup.prefab | 998 +++++++++++++++--- .../~Lua/Message/CommonProto_pb.lua | 69 +- .../~Lua/Modules/Popup/PlayerInfoPopup.lua | 61 +- .../~Lua/Modules/Practice/PracticeManager.lua | 6 + 4 files changed, 937 insertions(+), 197 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab index 54a7117085..d28504ed33 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/PlayerInfoPopup.prefab @@ -4796,7 +4796,7 @@ ParticleSystem: --- !u!199 &148790109625764326 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -9499,7 +9499,7 @@ ParticleSystem: --- !u!199 &4982092013365813535 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14373,7 +14373,7 @@ ParticleSystem: --- !u!199 &9191017234564813313 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -14555,6 +14555,9 @@ GameObject: - component: {fileID: 5062462498499650815} - component: {fileID: 4580550474227406124} - component: {fileID: 8739295058029304903} + - component: {fileID: 4249429546281981961} + - component: {fileID: 7256982522077911478} + - component: {fileID: 3604567527224011676} m_Layer: 5 m_Name: tipImage m_TagString: Untagged @@ -14573,7 +14576,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 232575979434205973} - {fileID: 7314129136831350077} - {fileID: 3904081520180912708} - {fileID: 2815076185458286037} @@ -14584,8 +14586,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.6600001, y: 28.559} - m_SizeDelta: {x: 900, y: 775.02} + m_AnchoredPosition: {x: -0.6600001, y: -3} + m_SizeDelta: {x: 900, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4580550474227406124 CanvasRenderer: @@ -14637,6 +14639,158 @@ MonoBehaviour: isPlayAudio: 1 isHaveCloseBtn: 0 isPlayOnOpen: 1 +--- !u!114 &4249429546281981961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353707272553922709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 15 + m_Bottom: 10 + m_ChildAlignment: 1 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 +--- !u!114 &7256982522077911478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353707272553922709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 60da54ea70faabc49823d0462d3ae80d, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &3604567527224011676 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 353707272553922709} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!1 &373694406516665200 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8745500966058890751} + - component: {fileID: 8690183644943646195} + - component: {fileID: 489888243887225055} + - component: {fileID: 841724629460994292} + m_Layer: 5 + m_Name: imprintInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8745500966058890751 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373694406516665200} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1092993841926297064} + - {fileID: 6311136935046004953} + - {fileID: 7994853467400156283} + m_Father: {fileID: 6507781133543278900} + 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: 445.6, y: -608.1} + m_SizeDelta: {x: 895.3, y: 90} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8690183644943646195 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373694406516665200} + m_CullTransparentMesh: 0 +--- !u!114 &489888243887225055 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373694406516665200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 2 +--- !u!114 &841724629460994292 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 373694406516665200} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 1 --- !u!1 &393867935054448904 GameObject: m_ObjectHideFlags: 0 @@ -19496,7 +19650,7 @@ ParticleSystem: --- !u!199 &5056943522526155145 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -24163,7 +24317,7 @@ ParticleSystem: --- !u!199 &3785188359994672853 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28884,7 +29038,7 @@ ParticleSystem: --- !u!199 &4162552063939220692 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33552,7 +33706,7 @@ ParticleSystem: --- !u!199 &3520701850680857534 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38683,7 +38837,7 @@ ParticleSystem: --- !u!199 &2448079648247233803 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -38847,10 +39001,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} 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: 252.6, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &752123143644996745 GameObject: @@ -43496,7 +43650,7 @@ ParticleSystem: --- !u!199 &2569753523486402195 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -43570,7 +43724,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &780062469786353507 RectTransform: m_ObjectHideFlags: 0 @@ -43592,7 +43746,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -80.99378, y: -408.95117} + m_AnchoredPosition: {x: -692, y: -15} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &783141801496888454 @@ -44232,10 +44386,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 382.6, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &977141007827599846 GameObject: @@ -44648,6 +44802,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u4E3B\u7EBF\u9635\u5BB9:" LanguageIndex: 0 +--- !u!1 &1046312422225750744 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1092993841926297064} + - component: {fileID: 2191657263790240596} + - component: {fileID: 3612753574769433605} + m_Layer: 5 + m_Name: tip + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1092993841926297064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046312422225750744} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8745500966058890751} + 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: 288.1, y: -36} + m_SizeDelta: {x: 576.2, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2191657263790240596 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046312422225750744} + m_CullTransparentMesh: 0 +--- !u!114 &3612753574769433605 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1046312422225750744} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.93725497, b: 0.8000001, 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_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 48 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 30 + m_MaxSize: 48 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u7D2B\u5E9C\u795E\u5370:" + LanguageIndex: 0 --- !u!1 &1065821362340676078 GameObject: m_ObjectHideFlags: 0 @@ -49398,7 +49632,7 @@ ParticleSystem: --- !u!199 &7324639803679475557 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54029,7 +54263,7 @@ ParticleSystem: --- !u!199 &7172683182181672100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -54744,7 +54978,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2823588033645276165 RectTransform: m_ObjectHideFlags: 0 @@ -54762,9 +54996,9 @@ RectTransform: m_Father: {fileID: 6507781133543278900} 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: 445.6, y: -667.64996} m_SizeDelta: {x: 895.3, y: 209.1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7641010589560934493 @@ -59616,7 +59850,7 @@ ParticleSystem: --- !u!199 &4265103140430626036 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -64807,7 +65041,7 @@ ParticleSystem: --- !u!199 &4943627185890565814 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -70036,7 +70270,7 @@ ParticleSystem: --- !u!199 &6407276649207380679 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -74608,7 +74842,7 @@ ParticleSystem: --- !u!199 &6411361250930786800 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -75164,6 +75398,125 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2008714543781324339 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9211033836197355870} + - component: {fileID: 6108220804671371360} + - component: {fileID: 6255223837210828838} + - component: {fileID: 4594737963799249879} + m_Layer: 5 + m_Name: imprintPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9211033836197355870 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008714543781324339} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0.00012207031} + m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801} + m_Children: + - {fileID: 5804187574708000575} + - {fileID: 6725494915959327550} + m_Father: {fileID: 5402761081988941873} + 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: -159, y: 784} + m_SizeDelta: {x: 110, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6108220804671371360 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008714543781324339} + m_CullTransparentMesh: 0 +--- !u!114 &6255223837210828838 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008714543781324339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.35686275} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: c250d38548859854aac89d61f4f367cc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4594737963799249879 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2008714543781324339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6255223837210828838} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &2026505854048402245 GameObject: m_ObjectHideFlags: 0 @@ -79736,7 +80089,7 @@ ParticleSystem: --- !u!199 &2248187322806398115 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -79837,80 +80190,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2117675438859254125 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 232575979434205973} - - component: {fileID: 53568527404370663} - - component: {fileID: 2130864036518570407} - m_Layer: 5 - m_Name: tipImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &232575979434205973 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117675438859254125} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801} - m_Children: [] - m_Father: {fileID: 5062462498499650815} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -450.03607, y: 481.59106} - m_SizeDelta: {x: 900, y: 1024.7} - m_Pivot: {x: 0, y: 1} ---- !u!222 &53568527404370663 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117675438859254125} - m_CullTransparentMesh: 0 ---- !u!114 &2130864036518570407 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2117675438859254125} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 60da54ea70faabc49823d0462d3ae80d, type: 3} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &2153110656214329498 GameObject: m_ObjectHideFlags: 0 @@ -84611,7 +84890,7 @@ ParticleSystem: --- !u!199 &2056578059423130521 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -84861,6 +85140,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2257827446578635471 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6725494915959327550} + - component: {fileID: 1748004733367375062} + - component: {fileID: 6717465035458961465} + m_Layer: 5 + m_Name: hero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6725494915959327550 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257827446578635471} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9211033836197355870} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1748004733367375062 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257827446578635471} + m_CullTransparentMesh: 0 +--- !u!114 &6717465035458961465 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2257827446578635471} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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: 21300000, guid: f34957a7dff29bf44962ffd2e5f7ae2a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &2289325198934189121 GameObject: m_ObjectHideFlags: 0 @@ -89615,7 +89968,7 @@ ParticleSystem: --- !u!199 &3120077215394990954 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94695,7 +95048,7 @@ ParticleSystem: --- !u!199 &7471044272247662300 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -94787,10 +95140,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} 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: 122.600006, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2580011673149244452 GameObject: @@ -99445,7 +99798,7 @@ ParticleSystem: --- !u!199 &1252519594050884031 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -99537,10 +99890,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 512.6, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2624040708023246521 GameObject: @@ -104431,7 +104784,7 @@ ParticleSystem: --- !u!199 &7728079455863758084 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -109180,7 +109533,7 @@ ParticleSystem: --- !u!199 &3045979354143730918 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -114224,7 +114577,7 @@ ParticleSystem: --- !u!199 &3899722718212982798 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -114622,6 +114975,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3256794237465934539 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7994853467400156283} + - component: {fileID: 363556481547668153} + - component: {fileID: 8039084442613640528} + m_Layer: 5 + m_Name: line + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7994853467400156283 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3256794237465934539} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 8745500966058890751} + 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: 447.65, y: -66} + m_SizeDelta: {x: 895.3, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &363556481547668153 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3256794237465934539} + m_CullTransparentMesh: 0 +--- !u!114 &8039084442613640528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3256794237465934539} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &3273743300540294097 GameObject: m_ObjectHideFlags: 0 @@ -119320,7 +119747,7 @@ ParticleSystem: --- !u!199 &589196844548357803 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -124214,7 +124641,7 @@ ParticleSystem: --- !u!199 &2997530149261667875 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -124339,14 +124766,15 @@ RectTransform: - {fileID: 7770473621880018405} - {fileID: 3027098716292461123} - {fileID: 2823588033645276165} + - {fileID: 8745500966058890751} - {fileID: 6463706357779087193} m_Father: {fileID: 5062462498499650815} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000061035156, y: 69} - m_SizeDelta: {x: -26, y: -180.05} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 891.2, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6125699845383256747 MonoBehaviour: @@ -124366,7 +124794,7 @@ MonoBehaviour: m_Top: 10 m_Bottom: 0 m_ChildAlignment: 1 - m_Spacing: 10 + m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 @@ -128997,7 +129425,7 @@ ParticleSystem: --- !u!199 &5616665529502572980 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -134242,7 +134670,7 @@ ParticleSystem: --- !u!199 &6297049041660232371 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -139307,7 +139735,7 @@ ParticleSystem: --- !u!199 &3061828490372090331 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -144658,7 +145086,7 @@ ParticleSystem: --- !u!199 &189638598642628905 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -150490,7 +150918,7 @@ ParticleSystem: --- !u!199 &3668776509587732539 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -150585,6 +151013,123 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4982208008752397941 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5804187574708000575} + - component: {fileID: 1128472642294734133} + - component: {fileID: 1328410601406125626} + - component: {fileID: 1935510416035735276} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5804187574708000575 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982208008752397941} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 9211033836197355870} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1128472642294734133 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982208008752397941} + m_CullTransparentMesh: 0 +--- !u!114 &1328410601406125626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982208008752397941} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 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: 21300000, guid: 758192f667b1da44eafd6f97a48deb66, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &1935510416035735276 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4982208008752397941} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1328410601406125626} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &4988248785908532981 GameObject: m_ObjectHideFlags: 0 @@ -155339,7 +155884,7 @@ ParticleSystem: --- !u!199 &1525906973065453500 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -160199,7 +160744,7 @@ ParticleSystem: --- !u!199 &8040976243220094536 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -165180,7 +165725,7 @@ ParticleSystem: --- !u!199 &6185216823374329277 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -170421,7 +170966,7 @@ ParticleSystem: --- !u!199 &3657988726988831654 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -175317,7 +175862,7 @@ ParticleSystem: --- !u!199 &5068839175535446245 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -180666,7 +181211,7 @@ ParticleSystem: --- !u!199 &2094348334497438208 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -180911,6 +181456,7 @@ RectTransform: - {fileID: 9064202090855767920} - {fileID: 5062462498499650815} - {fileID: 780062469786353507} + - {fileID: 9211033836197355870} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -180995,12 +181541,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5062462498499650815} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -0.000026464462, y: 428} - m_SizeDelta: {x: 393.1, y: 78} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 393.1, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &861391297715015056 CanvasRenderer: @@ -185778,7 +186324,7 @@ ParticleSystem: --- !u!199 &7358211241672181674 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -190486,7 +191032,7 @@ ParticleSystem: --- !u!199 &5247238362140272329 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -190614,10 +191160,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 642.6, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6244740264160662978 GameObject: @@ -193050,6 +193596,66 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7035847503924543733 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6311136935046004953} + - component: {fileID: 1711501408100857050} + m_Layer: 0 + m_Name: Imprints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6311136935046004953 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7035847503924543733} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100.00813} + m_LocalScale: {x: 1.0000801, y: 1.0000801, z: 1.0000801} + m_Children: [] + m_Father: {fileID: 8745500966058890751} + 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: 447.63, y: -62} + m_SizeDelta: {x: 895.26, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1711501408100857050 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7035847503924543733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 20 + m_ChildAlignment: 4 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 110, y: 110} + m_Spacing: {x: 20, y: 10} + m_Constraint: 1 + m_ConstraintCount: 5 --- !u!1 &7040471423820825363 GameObject: m_ObjectHideFlags: 0 @@ -198065,7 +198671,7 @@ ParticleSystem: --- !u!199 &271453212813778959 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -202696,7 +203302,7 @@ ParticleSystem: --- !u!199 &9024831251810077855 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -207342,7 +207948,7 @@ ParticleSystem: --- !u!199 &4374573709437933587 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -211952,7 +212558,7 @@ ParticleSystem: --- !u!199 &5450983251236665416 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -212044,10 +212650,10 @@ RectTransform: m_Father: {fileID: 4695500235552396171} 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_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 772.6, y: -60.84} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7349747979633125261 GameObject: @@ -216693,7 +217299,7 @@ ParticleSystem: --- !u!199 &8525895370444853774 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -221859,7 +222465,7 @@ ParticleSystem: --- !u!199 &8690969303022921562 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -226692,7 +227298,7 @@ ParticleSystem: --- !u!199 &1007953872804928636 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -231757,7 +232363,7 @@ ParticleSystem: --- !u!199 &825704488939151993 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -236460,7 +237066,7 @@ ParticleSystem: --- !u!199 &8445370598039826089 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -241655,7 +242261,7 @@ ParticleSystem: --- !u!199 &489231107773497802 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -242009,12 +242615,12 @@ RectTransform: - {fileID: 6536633968459279225} - {fileID: 2920017732210072783} m_Father: {fileID: 6507781133543278900} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 960, y: 60} + m_SizeDelta: {x: 960, y: 95.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4976320884223371891 MonoBehaviour: @@ -242031,12 +242637,12 @@ MonoBehaviour: m_Padding: m_Left: 0 m_Right: 0 - m_Top: 0 + m_Top: 10 m_Bottom: 0 m_ChildAlignment: 1 m_Spacing: 30 m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 + m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 --- !u!1 &8338237057977567738 @@ -242185,7 +242791,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5062462498499650815} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -242685,6 +243291,7 @@ GameObject: - component: {fileID: 6298743869595522208} - component: {fileID: 6891701304760783498} - component: {fileID: 95555316501053380} + - component: {fileID: 2878137019212257593} m_Layer: 5 m_Name: btnClose m_TagString: Untagged @@ -242704,11 +243311,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5062462498499650815} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 407, y: 437} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 866, y: -28} m_SizeDelta: {x: 154, y: 120} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6231546823930135511 @@ -242809,6 +243416,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2878137019212257593 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8648036357217287074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8651820832107646356 GameObject: m_ObjectHideFlags: 0 @@ -242937,6 +243564,7 @@ GameObject: - component: {fileID: 7314129136831350077} - component: {fileID: 6318626259727760182} - component: {fileID: 7126427324962117033} + - component: {fileID: 2516334979170254677} m_Layer: 5 m_Name: Image m_TagString: Untagged @@ -242956,7 +243584,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5062462498499650815} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -243000,6 +243628,26 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!114 &2516334979170254677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8697499311240453056} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 1 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &8702813374509980052 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua index 3c48bc8f27..01410638b4 100644 --- a/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua @@ -77,7 +77,6 @@ HERO_LOCKSTATE_FIELD = protobuf.FieldDescriptor(); HERO_JEWELS_FIELD = protobuf.FieldDescriptor(); HERO_CREATETYPE_FIELD = protobuf.FieldDescriptor(); HERO_CHANGEID_FIELD = protobuf.FieldDescriptor(); -HERO_SEALIDLIST_FIELD = protobuf.FieldDescriptor(); POKEMONINFO = protobuf.Descriptor(); POKEMONINFO_TEMPID_FIELD = protobuf.FieldDescriptor(); POKEMONINFO_ID_FIELD = protobuf.FieldDescriptor(); @@ -440,6 +439,10 @@ EXPERTINFO_SEX_FIELD = protobuf.FieldDescriptor(); SIGNININFO = protobuf.Descriptor(); SIGNININFO_DAYS_FIELD = protobuf.FieldDescriptor(); SIGNININFO_STATE_FIELD = protobuf.FieldDescriptor(); +PURPLESEALSHOWINFO = protobuf.Descriptor(); +PURPLESEALSHOWINFO_ID_FIELD = protobuf.FieldDescriptor(); +PURPLESEALSHOWINFO_TYPE_FIELD = protobuf.FieldDescriptor(); +PURPLESEALSHOWINFO_HEROTID_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO = protobuf.Descriptor(); TEAMSIMPLEINFO_HEROID_FIELD = protobuf.FieldDescriptor(); TEAMSIMPLEINFO_HEROTID_FIELD = protobuf.FieldDescriptor(); @@ -452,6 +455,7 @@ TEAMONETEAMINFO_TEAM_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_POKEMONINFOS_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_TOTALFORCE_FIELD = protobuf.FieldDescriptor(); TEAMONETEAMINFO_REMAINHP_FIELD = protobuf.FieldDescriptor(); +TEAMONETEAMINFO_SEALSHOW_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO = protobuf.Descriptor(); TEAMONEINFO_UID_FIELD = protobuf.FieldDescriptor(); TEAMONEINFO_LEVEL_FIELD = protobuf.FieldDescriptor(); @@ -1367,21 +1371,11 @@ HERO_CHANGEID_FIELD.default_value = 0 HERO_CHANGEID_FIELD.type = 5 HERO_CHANGEID_FIELD.cpp_type = 1 -HERO_SEALIDLIST_FIELD.name = "sealIdList" -HERO_SEALIDLIST_FIELD.full_name = ".rpc.protocols.Hero.sealIdList" -HERO_SEALIDLIST_FIELD.number = 17 -HERO_SEALIDLIST_FIELD.index = 15 -HERO_SEALIDLIST_FIELD.label = 3 -HERO_SEALIDLIST_FIELD.has_default_value = false -HERO_SEALIDLIST_FIELD.default_value = {} -HERO_SEALIDLIST_FIELD.type = 5 -HERO_SEALIDLIST_FIELD.cpp_type = 1 - HERO.name = "Hero" HERO.full_name = ".rpc.protocols.Hero" HERO.nested_types = {} HERO.enum_types = {} -HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD, HERO_SEALIDLIST_FIELD} +HERO.fields = {HERO_ID_FIELD, HERO_HEROID_FIELD, HERO_LEVEL_FIELD, HERO_BREAKID_FIELD, HERO_STAR_FIELD, HERO_SKINID_FIELD, HERO_EQUIPIDLIST_FIELD, HERO_CREATETIME_FIELD, HERO_STARBREAKID_FIELD, HERO_ESPECIALEQUIPLEVEL_FIELD, HERO_SOULPOS_FIELD, HERO_LOCKSTATE_FIELD, HERO_JEWELS_FIELD, HERO_CREATETYPE_FIELD, HERO_CHANGEID_FIELD} HERO.is_extendable = false HERO.extensions = {} POKEMONINFO_TEMPID_FIELD.name = "tempId" @@ -4837,6 +4831,43 @@ SIGNININFO.enum_types = {} SIGNININFO.fields = {SIGNININFO_DAYS_FIELD, SIGNININFO_STATE_FIELD} SIGNININFO.is_extendable = false SIGNININFO.extensions = {} +PURPLESEALSHOWINFO_ID_FIELD.name = "id" +PURPLESEALSHOWINFO_ID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.id" +PURPLESEALSHOWINFO_ID_FIELD.number = 1 +PURPLESEALSHOWINFO_ID_FIELD.index = 0 +PURPLESEALSHOWINFO_ID_FIELD.label = 1 +PURPLESEALSHOWINFO_ID_FIELD.has_default_value = false +PURPLESEALSHOWINFO_ID_FIELD.default_value = 0 +PURPLESEALSHOWINFO_ID_FIELD.type = 5 +PURPLESEALSHOWINFO_ID_FIELD.cpp_type = 1 + +PURPLESEALSHOWINFO_TYPE_FIELD.name = "type" +PURPLESEALSHOWINFO_TYPE_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.type" +PURPLESEALSHOWINFO_TYPE_FIELD.number = 2 +PURPLESEALSHOWINFO_TYPE_FIELD.index = 1 +PURPLESEALSHOWINFO_TYPE_FIELD.label = 1 +PURPLESEALSHOWINFO_TYPE_FIELD.has_default_value = false +PURPLESEALSHOWINFO_TYPE_FIELD.default_value = 0 +PURPLESEALSHOWINFO_TYPE_FIELD.type = 5 +PURPLESEALSHOWINFO_TYPE_FIELD.cpp_type = 1 + +PURPLESEALSHOWINFO_HEROTID_FIELD.name = "heroTId" +PURPLESEALSHOWINFO_HEROTID_FIELD.full_name = ".rpc.protocols.PurpleSealShowInfo.heroTId" +PURPLESEALSHOWINFO_HEROTID_FIELD.number = 3 +PURPLESEALSHOWINFO_HEROTID_FIELD.index = 2 +PURPLESEALSHOWINFO_HEROTID_FIELD.label = 1 +PURPLESEALSHOWINFO_HEROTID_FIELD.has_default_value = false +PURPLESEALSHOWINFO_HEROTID_FIELD.default_value = 0 +PURPLESEALSHOWINFO_HEROTID_FIELD.type = 5 +PURPLESEALSHOWINFO_HEROTID_FIELD.cpp_type = 1 + +PURPLESEALSHOWINFO.name = "PurpleSealShowInfo" +PURPLESEALSHOWINFO.full_name = ".rpc.protocols.PurpleSealShowInfo" +PURPLESEALSHOWINFO.nested_types = {} +PURPLESEALSHOWINFO.enum_types = {} +PURPLESEALSHOWINFO.fields = {PURPLESEALSHOWINFO_ID_FIELD, PURPLESEALSHOWINFO_TYPE_FIELD, PURPLESEALSHOWINFO_HEROTID_FIELD} +PURPLESEALSHOWINFO.is_extendable = false +PURPLESEALSHOWINFO.extensions = {} TEAMSIMPLEINFO_HEROID_FIELD.name = "heroid" TEAMSIMPLEINFO_HEROID_FIELD.full_name = ".rpc.protocols.TeamSimpleInfo.heroid" TEAMSIMPLEINFO_HEROID_FIELD.number = 1 @@ -4946,11 +4977,22 @@ TEAMONETEAMINFO_REMAINHP_FIELD.default_value = {} TEAMONETEAMINFO_REMAINHP_FIELD.type = 3 TEAMONETEAMINFO_REMAINHP_FIELD.cpp_type = 2 +TEAMONETEAMINFO_SEALSHOW_FIELD.name = "sealShow" +TEAMONETEAMINFO_SEALSHOW_FIELD.full_name = ".rpc.protocols.TeamOneTeamInfo.sealShow" +TEAMONETEAMINFO_SEALSHOW_FIELD.number = 5 +TEAMONETEAMINFO_SEALSHOW_FIELD.index = 4 +TEAMONETEAMINFO_SEALSHOW_FIELD.label = 3 +TEAMONETEAMINFO_SEALSHOW_FIELD.has_default_value = false +TEAMONETEAMINFO_SEALSHOW_FIELD.default_value = {} +TEAMONETEAMINFO_SEALSHOW_FIELD.message_type = PURPLESEALSHOWINFO +TEAMONETEAMINFO_SEALSHOW_FIELD.type = 11 +TEAMONETEAMINFO_SEALSHOW_FIELD.cpp_type = 10 + TEAMONETEAMINFO.name = "TeamOneTeamInfo" TEAMONETEAMINFO.full_name = ".rpc.protocols.TeamOneTeamInfo" TEAMONETEAMINFO.nested_types = {} TEAMONETEAMINFO.enum_types = {} -TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD} +TEAMONETEAMINFO.fields = {TEAMONETEAMINFO_TEAM_FIELD, TEAMONETEAMINFO_POKEMONINFOS_FIELD, TEAMONETEAMINFO_TOTALFORCE_FIELD, TEAMONETEAMINFO_REMAINHP_FIELD, TEAMONETEAMINFO_SEALSHOW_FIELD} TEAMONETEAMINFO.is_extendable = false TEAMONETEAMINFO.extensions = {} TEAMONEINFO_UID_FIELD.name = "uid" @@ -6975,6 +7017,7 @@ Pokemoncomonpent = protobuf.Message(POKEMONCOMONPENT) PosMineral = protobuf.Message(POSMINERAL) Privilege = protobuf.Message(PRIVILEGE) PurpleMansionSeal = protobuf.Message(PURPLEMANSIONSEAL) +PurpleSealShowInfo = protobuf.Message(PURPLESEALSHOWINFO) QuestionOptions = protobuf.Message(QUESTIONOPTIONS) RankInfo = protobuf.Message(RANKINFO) RedOneDetail = protobuf.Message(REDONEDETAIL) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua index 832e400d44..304e105fe4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/PlayerInfoPopup.lua @@ -1,6 +1,7 @@ require("Base/BasePanel") local PlayerInfoPopup = Inherit(BasePanel) local this = PlayerInfoPopup +local XiuXianSkillConfig = ConfigManager.GetConfig(ConfigName.XiuXianSkillConfig) local _ViewConfig = { [PLAYER_INFO_VIEW_TYPE.NORMAL] = { @@ -80,11 +81,16 @@ function PlayerInfoPopup:InitComponent() this.pokemonObj=Util.GetGameObject(self.transform, "tipImage/panel/pokemonInfo").gameObject this.boxLine = Util.GetGameObject(self.transform, "tipImage/panel/defendbox/line") this.btnBox = Util.GetGameObject(self.transform, "tipImage/panel/box") - this.bgImg= Util.GetGameObject(self.transform, "tipImage/tipImage"):GetComponent("RectTransform") + -- this.bgImg= Util.GetGameObject(self.transform, "tipImage/tipImage"):GetComponent("RectTransform") this.btnList = {} this.btnList[1] = Util.GetGameObject(this.btnBox, "btn1") this.btnList[2] = Util.GetGameObject(this.btnBox, "btn2") this.btnList[3] = Util.GetGameObject(this.btnBox, "btn3") + --神印信息 + this.imprintObj = Util.GetGameObject(self.transform, "tipImage/panel/imprintInfo") + this.imprintGrid = Util.GetGameObject(this.imprintObj, "Imprints") + this.imprintPre = Util.GetGameObject(self.transform, "imprintPre") + this.imprintItemList = {} end --绑定事件(用于子类重写) @@ -251,8 +257,6 @@ function this.FormationAdapter(teamInfo) for i, demon in ipairs(this.Demons) do Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1)) Util.GetGameObject(demon, "hero"):SetActive(false) - Util.AddOnceClick(frameBtn, function() - end) end --队伍阵容 for i, hero in ipairs(teamInfo.team) do @@ -289,17 +293,15 @@ function this.FormationAdapter(teamInfo) local len=#teamInfo.PokemonInfos LogError("长度:"..len) if len>0 then - this.bgImg.sizeDelta=Vector2.New(900,1024) + -- this.bgImg.sizeDelta=Vector2.New(900,1024) this.pokemonObj:SetActive(true) for i, demon in ipairs(this.Pokemons) do demon.gameObject:SetActive(false) Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetQuantityImageByquality(1)) - Util.GetGameObject(demon, "hero"):SetActive(false) - Util.AddOnceClick(frameBtn, function() - end) + Util.GetGameObject(demon, "hero"):SetActive(false) end else - this.bgImg.sizeDelta=Vector2.New(900,850) + -- this.bgImg.sizeDelta=Vector2.New(900,850) this.pokemonObj:SetActive(false) end @@ -323,7 +325,47 @@ function this.FormationAdapter(teamInfo) end) end end - + + --神印信息 + LogBlue("神印数量:"..tostring(#teamInfo.sealShow)) + if teamInfo.sealShow and #teamInfo.sealShow > 0 then + this.imprintObj:SetActive(true) + if not this.imprintItemList then + this.imprintItemList = {} + end + for i = 1, #this.imprintItemList do + this.imprintItemList[i].gameObject:SetActive(false) + end + for i = 1, #teamInfo.sealShow do + local item = this.imprintItemList[i] + local value = teamInfo.sealShow[i] + if not item then + item = newObject(this.imprintPre) + item.name = "imprintPre_"..i + item.transform:SetParent(this.imprintGrid.transform) + item.transform.localScale = Vector3.one + item.transform.localPosition = Vector3.zero + this.imprintItemList[i] = item + end + item.gameObject:SetActive(true) + local icon = Util.GetGameObject(item,"icon"):GetComponent("Image") + local hero = Util.GetGameObject(item,"hero"):GetComponent("Image") + LogBlue("value.id:"..tostring(value.id)) + icon.sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[value.id].Icon)) + if value.type == 1 then + hero.gameObject:SetActive(false) + hero.sprite = Util.LoadSprite(GetResourcePath(XiuXianSkillConfig[value.id].Icon)) + else + hero.gameObject:SetActive(false) + end + Util.AddOnceClick(item.gameObject,function () + LogBlue("显示神印信息") + end) + end + else + this.imprintObj:SetActive(false) + end + end -- 刷新按钮显示 @@ -420,6 +462,7 @@ function PlayerInfoPopup:OnDestroy() end titleLive = nil titleLiveStr = nil + this.imprintItemList = {} end return PlayerInfoPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua index f41d3c946d..9ddc216df6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua @@ -219,4 +219,10 @@ function this.SetNameColor(name,level) return ""..name.."" end +function this.GetOtherImprintList(team) + for i, hero in ipairs(team) do + local demonId = team.team[i].heroTid + end +end + return PracticeManager \ No newline at end of file