diff --git a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab index 1fbe708f78..59ce44a3f1 100644 --- a/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab @@ -5452,7 +5452,7 @@ ParticleSystem: --- !u!199 &4777639059258701071 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -10361,7 +10361,7 @@ ParticleSystem: --- !u!199 &3410931527795591877 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15600,7 +15600,7 @@ ParticleSystem: --- !u!199 &8980732446303756264 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -15936,7 +15936,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1837687756800740674 RectTransform: m_ObjectHideFlags: 0 @@ -17243,7 +17243,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3363796285663876381} - m_RootOrder: 7 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -23057,7 +23057,7 @@ ParticleSystem: --- !u!199 &321836528266777232 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28370,7 +28370,7 @@ ParticleSystem: --- !u!199 &3624021359470482407 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -28480,6 +28480,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4192656317406380058} m_CullTransparentMesh: 0 +--- !u!1 &4393499606481496861 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6694074892350137113} + - component: {fileID: 6915921386120270260} + - component: {fileID: 6370156389573338636} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6694074892350137113 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393499606481496861} + 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: 3404279405243076626} + 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: 163, y: -35} + m_SizeDelta: {x: 76, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6915921386120270260 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393499606481496861} + m_CullTransparentMesh: 0 +--- !u!114 &6370156389573338636 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393499606481496861} + 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.5137255, g: 0.32156864, b: 0.22352941, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 49 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u6311\u6218" + LanguageIndex: 10244 --- !u!1 &4410195329124716282 GameObject: m_ObjectHideFlags: 0 @@ -33272,7 +33352,7 @@ ParticleSystem: --- !u!199 &3696223909751564976 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -33751,6 +33831,85 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6218\u6597\u5956\u52B1" LanguageIndex: 10419 +--- !u!1 &5144604327645658002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5979371385660445369} + - component: {fileID: 5498398686762856135} + - component: {fileID: 3975036889340113909} + m_Layer: 5 + m_Name: IconNum + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5979371385660445369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144604327645658002} + 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: 3404279405243076626} + 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: 97.5, y: -35} + m_SizeDelta: {x: 55, y: 42} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5498398686762856135 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144604327645658002} + m_CullTransparentMesh: 0 +--- !u!114 &3975036889340113909 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5144604327645658002} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.5137255, g: 0.32156864, b: 0.22352943, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 49 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 100 --- !u!1 &5218872038552655939 GameObject: m_ObjectHideFlags: 0 @@ -35455,6 +35614,144 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &6750873187959254312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6538311094022736740} + - component: {fileID: 8825816331412522549} + - component: {fileID: 4594781335919263614} + - component: {fileID: 8398765716997261231} + - component: {fileID: 6856016017295890341} + m_Layer: 5 + m_Name: returnLook + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6538311094022736740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750873187959254312} + 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: 3363796285663876381} + m_RootOrder: 6 + 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: 331, y: -171} + m_SizeDelta: {x: 127, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8825816331412522549 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750873187959254312} + m_CullTransparentMesh: 0 +--- !u!114 &4594781335919263614 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750873187959254312} + 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: e4427c9bb4208c642b0f3d059959fb90, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &8398765716997261231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750873187959254312} + 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: 3 + 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: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + 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: 4594781335919263614} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &6856016017295890341 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750873187959254312} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 --- !u!1 &6835784565493960570 GameObject: m_ObjectHideFlags: 0 @@ -41043,7 +41340,7 @@ ParticleSystem: --- !u!199 &2953780818559839100 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45689,7 +45986,7 @@ ParticleSystem: --- !u!199 &2949702989991448651 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -45808,7 +46105,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5870638006424343246 RectTransform: m_ObjectHideFlags: 0 @@ -46053,7 +46350,7 @@ RectTransform: m_Children: - {fileID: 11441060535492725} m_Father: {fileID: 3363796285663876381} - m_RootOrder: 6 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -47711,6 +48008,101 @@ MonoBehaviour: m_LineSpacing: 1.32 m_Text: "\u8BF7\u9009\u62E9\u4E00\u4E2A\u795E\u5C06\u8FDB\u884C\u62DB\u52DF\uFF0C\u957F\u6309\u5934\u50CF\u53EF\u67E5\u770B\u795E\u5C06\u8BE6\u7EC6\u4FE1\u606F" LanguageIndex: 10411 +--- !u!1 &8965047729144241638 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5660651079400691020} + - component: {fileID: 286124065444150248} + - component: {fileID: 1653207345492292411} + - component: {fileID: 6946744540412437323} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5660651079400691020 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8965047729144241638} + 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: 3404279405243076626} + 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: 40, y: -35} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &286124065444150248 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8965047729144241638} + m_CullTransparentMesh: 0 +--- !u!114 &1653207345492292411 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8965047729144241638} + 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: 292ef1dfcd26c54468ba4398663bd63d, 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 &6946744540412437323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8965047729144241638} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: -1 + m_MinHeight: -1 + m_PreferredWidth: 60 + m_PreferredHeight: 60 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1 &9036317870784048407 GameObject: m_ObjectHideFlags: 0 @@ -47819,6 +48211,8 @@ RectTransform: - {fileID: 3175862705118350079} - {fileID: 322065179352098904} - {fileID: 5457695113008529805} + - {fileID: 6538311094022736740} + - {fileID: 3404279405243076626} - {fileID: 7679680131682865016} - {fileID: 8757410237699380744} m_Father: {fileID: 7660847883609977980} @@ -47837,6 +48231,206 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9154626355533289875} m_CullTransparentMesh: 0 +--- !u!1 &9194982792720629936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3404279405243076626} + - component: {fileID: 4644864955242000865} + - component: {fileID: 1555644896220716132} + - component: {fileID: 7719437229385345392} + - component: {fileID: 2236915061470875090} + - component: {fileID: 2071507010709373990} + - component: {fileID: 2015329172393107403} + - component: {fileID: 8735958777745435586} + m_Layer: 5 + m_Name: fightBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3404279405243076626 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.99991995, y: 0.99991995, z: 0.99991995} + m_Children: + - {fileID: 5660651079400691020} + - {fileID: 5979371385660445369} + - {fileID: 6694074892350137113} + m_Father: {fileID: 3363796285663876381} + m_RootOrder: 7 + 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: -582.6} + m_SizeDelta: {x: 221, y: 70} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4644864955242000865 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_CullTransparentMesh: 0 +--- !u!114 &1555644896220716132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + 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: cc47a59ad14ba0344b8eaa93093a8bd5, 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 &7719437229385345392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + 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: 3 + 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: 1555644896220716132} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!95 &2236915061470875090 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6ffe000b5a58aac48a9d130543849d76, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2071507010709373990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 10 + m_Right: 20 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &2015329172393107403 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 2 +--- !u!114 &8735958777745435586 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9194982792720629936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreLayout: 0 + m_MinWidth: 221 + m_MinHeight: -1 + m_PreferredWidth: -1 + m_PreferredHeight: -1 + m_FlexibleWidth: -1 + m_FlexibleHeight: -1 + m_LayoutPriority: 1 --- !u!1001 &2471775789871830794 PrefabInstance: m_ObjectHideFlags: 0 @@ -47844,11 +48438,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 3274204420621330496} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero4 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -47954,6 +48543,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero4 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -47974,11 +48568,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2187535576244049135} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero2 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -48084,6 +48673,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero2 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -48104,11 +48698,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 410062387173518693} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero6 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -48214,6 +48803,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero6 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -48234,11 +48828,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4712119047133306745} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero3 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -48344,6 +48933,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero3 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -48364,11 +48958,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 192657534952313714} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero5 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -48474,6 +49063,11 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero5 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive @@ -48494,11 +49088,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1837687755842177320} m_Modifications: - - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, - type: 3} - propertyPath: m_Name - value: Hero1 - objectReference: {fileID: 0} - target: {fileID: 2535060995107670383, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_LocalPosition.x @@ -48604,6 +49193,16 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_Name + value: Hero1 + objectReference: {fileID: 0} + - target: {fileID: 2321054590987622477, guid: e356d5948e4971f499cfe38db3551f59, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2320031819680067764, guid: e356d5948e4971f499cfe38db3551f59, type: 3} propertyPath: m_IsActive diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index 5713fa2254..b47cd9edc6 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -258,6 +258,124 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &414755014871277628 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 894077670209580548} + - component: {fileID: 7471683844779997972} + - component: {fileID: 951071963710012933} + - component: {fileID: 1842878190628668814} + m_Layer: 5 + m_Name: HeroPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &894077670209580548 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414755014871277628} + 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: 848410903052176699} + - {fileID: 7783751494494281313} + - {fileID: 5412537264586205169} + - {fileID: 6836166906844610119} + - {fileID: 8869950626152695975} + - {fileID: 4372851946636959098} + - {fileID: 823191990533769100} + - {fileID: 1686371823404824180} + - {fileID: 4440740485894073966} + - {fileID: 2888086770361782851} + m_Father: {fileID: 5958908542893353267} + 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: -312.5, y: 4.4999557} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7471683844779997972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414755014871277628} + m_CullTransparentMesh: 0 +--- !u!114 &951071963710012933 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414755014871277628} + 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: 1 + 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: 680236765062544443} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1842878190628668814 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 414755014871277628} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &582247181667879863 GameObject: m_ObjectHideFlags: 0 @@ -384,6 +502,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 2/2 LanguageIndex: 0 +--- !u!1 &772252164610775235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8869950626152695975} + - component: {fileID: 4732822042619208868} + - component: {fileID: 4898920778654142038} + m_Layer: 5 + m_Name: lv + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8869950626152695975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772252164610775235} + 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: 6155871277893386186} + m_Father: {fileID: 894077670209580548} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 51, y: 59} + m_SizeDelta: {x: 48, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4732822042619208868 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772252164610775235} + m_CullTransparentMesh: 0 +--- !u!114 &4898920778654142038 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 772252164610775235} + 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: c73ac4f44d9a7194488674d4fa335c10, 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 &977347506885705026 GameObject: m_ObjectHideFlags: 0 @@ -1683,7 +1876,7 @@ GameObject: m_Component: - component: {fileID: 5958908542893353267} m_Layer: 5 - m_Name: pre + m_Name: itemPre m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1700,7 +1893,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7841933899132682386} + - {fileID: 894077670209580548} - {fileID: 1664753309249076465} - {fileID: 2880914640044392098} - {fileID: 7211989387791583570} @@ -1713,6 +1906,85 @@ RectTransform: m_AnchoredPosition: {x: -1968, y: -889} m_SizeDelta: {x: 890.93, y: 260.6} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2993850618277382935 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6155871277893386186} + - component: {fileID: 3080689522063892976} + - component: {fileID: 8415983019866886539} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6155871277893386186 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2993850618277382935} + 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: 8869950626152695975} + 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: 0.0000019073, y: 0} + m_SizeDelta: {x: 57.37, y: 35.96} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3080689522063892976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2993850618277382935} + m_CullTransparentMesh: 0 +--- !u!114 &8415983019866886539 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2993850618277382935} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 28 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 999 --- !u!1 &3051639498548854135 GameObject: m_ObjectHideFlags: 0 @@ -1836,6 +2108,200 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3692676939840393261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4440740485894073966} + - component: {fileID: 7686962563570700601} + m_Layer: 5 + m_Name: orderImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4440740485894073966 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3692676939840393261} + 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: 4605498287104952535} + m_Father: {fileID: 894077670209580548} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.4666667, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5733333} + m_AnchoredPosition: {x: 0.000011920929, y: 0.0000009536743} + m_SizeDelta: {x: 28.48, y: 17.11} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7686962563570700601 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3692676939840393261} + m_CullTransparentMesh: 0 +--- !u!1 &3799770283536063081 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5412537264586205169} + - component: {fileID: 8221908639822600608} + - component: {fileID: 1037894261157232454} + m_Layer: 5 + m_Name: posIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5412537264586205169 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799770283536063081} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_Children: [] + m_Father: {fileID: 894077670209580548} + 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: 58.624115, y: -59.044212} + m_SizeDelta: {x: 32, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8221908639822600608 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799770283536063081} + m_CullTransparentMesh: 0 +--- !u!114 &1037894261157232454 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3799770283536063081} + 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: b1a92f783ef44174cadd79d112420c8e, 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 &3823540844666728631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6499984993010921341} + - component: {fileID: 7177979752622670145} + - component: {fileID: 1071884703473237267} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6499984993010921341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823540844666728631} + 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: 3720669250017677690} + m_Father: {fileID: 1686371823404824180} + 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: 0, y: 0} + m_SizeDelta: {x: 124, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7177979752622670145 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823540844666728631} + m_CullTransparentMesh: 0 +--- !u!114 &1071884703473237267 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3823540844666728631} + 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: 112b7e56319a40442b34880d158a2d4c, 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 &4044385732248889005 GameObject: m_ObjectHideFlags: 0 @@ -2071,102 +2537,6 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &4807992149663581037 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7107040271161361852} - - component: {fileID: 5121583962984021278} - - component: {fileID: 5228104115385978294} - - component: {fileID: 2104773476416860646} - m_Layer: 5 - m_Name: Text - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7107040271161361852 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4807992149663581037} - 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: 4416583199119498599} - 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: 2.1, y: 2.1} - m_SizeDelta: {x: 160, y: 86.6} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5121583962984021278 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4807992149663581037} - m_CullTransparentMesh: 0 ---- !u!114 &5228104115385978294 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4807992149663581037} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1573420865, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} - m_EffectDistance: {x: 1, y: -1} - m_UseGraphicAlpha: 1 ---- !u!114 &2104773476416860646 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4807992149663581037} - 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.9882353, g: 0.92156863, b: 0.7921569, 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_FontData: - m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} - m_FontSize: 52 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 4 - m_MaxSize: 52 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: "\u6750\u6599" - LanguageIndex: 10142 --- !u!1 &4949698190303221708 GameObject: m_ObjectHideFlags: 0 @@ -2365,6 +2735,81 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u9009\u62E9\u6700\u7EC8\u5956\u52B1" LanguageIndex: 11247 +--- !u!1 &5211183948732333201 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1686371823404824180} + - component: {fileID: 5986265444039204531} + - component: {fileID: 5007790790306547709} + m_Layer: 5 + m_Name: adventured + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1686371823404824180 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211183948732333201} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_Children: + - {fileID: 6499984993010921341} + m_Father: {fileID: 894077670209580548} + m_RootOrder: 7 + 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.00082087517, y: 0.00056807324} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5986265444039204531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211183948732333201} + m_CullTransparentMesh: 0 +--- !u!114 &5007790790306547709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5211183948732333201} + 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: 0, g: 0, b: 0, a: 0.528} + 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 &5356778114707042482 GameObject: m_ObjectHideFlags: 0 @@ -2599,6 +3044,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 2/2 LanguageIndex: 0 +--- !u!1 &5942647270856130795 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4372851946636959098} + - component: {fileID: 4644531404144387081} + - component: {fileID: 804308372275934758} + m_Layer: 5 + m_Name: starPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &4372851946636959098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5942647270856130795} + m_LocalRotation: {x: -0, y: -0, z: -0.135235, w: 0.99081355} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 894077670209580548} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -15.544001} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 15.599998, y: -133.2} + m_SizeDelta: {x: 32, y: 32} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4644531404144387081 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5942647270856130795} + m_CullTransparentMesh: 0 +--- !u!114 &804308372275934758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5942647270856130795} + 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: 8908080ead3926f4e9e9951397b9e29b, 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 &5955664632054071393 GameObject: m_ObjectHideFlags: 0 @@ -2643,6 +3162,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5955664632054071393} m_CullTransparentMesh: 0 +--- !u!1 &5993295522991728787 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4605498287104952535} + - component: {fileID: 4082309682136688753} + - component: {fileID: 955511009991147644} + m_Layer: 5 + m_Name: orderImageText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4605498287104952535 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5993295522991728787} + 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: 4440740485894073966} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -8.499998, y: -13.999998} + m_SizeDelta: {x: 16.48, y: 28.11} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4082309682136688753 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5993295522991728787} + m_CullTransparentMesh: 0 +--- !u!114 &955511009991147644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5993295522991728787} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9622642, g: 0.9577252, b: 0.9577252, 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_FontData: + m_Font: {fileID: 12800000, guid: 634137158f07dff488d018d707aa403a, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 2 --- !u!1 &6129251158678455388 GameObject: m_ObjectHideFlags: 0 @@ -2753,6 +3351,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6233829994492767001 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 848410903052176699} + - component: {fileID: 7865839998384594706} + - component: {fileID: 680236765062544443} + m_Layer: 5 + m_Name: frame + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &848410903052176699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233829994492767001} + 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: 894077670209580548} + 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: 0, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7865839998384594706 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233829994492767001} + m_CullTransparentMesh: 0 +--- !u!114 &680236765062544443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6233829994492767001} + 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: 0f7579036915c65459a15fae41f1c712, 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 &6379312383675149712 GameObject: m_ObjectHideFlags: 0 @@ -2870,7 +3542,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -1.4, y: 370} + m_AnchoredPosition: {x: -1.3999939, y: 370} m_SizeDelta: {x: -172.8, y: 181.9} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &3567101064875257656 @@ -2953,8 +3625,7 @@ RectTransform: 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: 7107040271161361852} + m_Children: [] m_Father: {fileID: 62656658687398584} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3333,6 +4004,50 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7320839717496210357} m_CullTransparentMesh: 0 +--- !u!1 &7419073379637181269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 823191990533769100} + - component: {fileID: 5275029024879718035} + m_Layer: 5 + m_Name: star + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &823191990533769100 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7419073379637181269} + 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: 894077670209580548} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 1.8200684, y: 2.9999847} + m_SizeDelta: {x: 239.96, y: 30} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5275029024879718035 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7419073379637181269} + m_CullTransparentMesh: 0 --- !u!1 &7452275283473295991 GameObject: m_ObjectHideFlags: 0 @@ -3429,6 +4144,86 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6211\u7684\u52A9\u6218" LanguageIndex: 10142 +--- !u!1 &7481252411207050652 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3720669250017677690} + - component: {fileID: 4349982576819509001} + - component: {fileID: 2212056350964076842} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3720669250017677690 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7481252411207050652} + m_LocalRotation: {x: -0, y: -0, z: 0.1426516, w: 0.98977304} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6499984993010921341} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 16.403} + 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: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4349982576819509001 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7481252411207050652} + m_CullTransparentMesh: 0 +--- !u!114 &2212056350964076842 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7481252411207050652} + 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: 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_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5192\u9669\u4E2D" + LanguageIndex: 10224 --- !u!1 &7524838965623775792 GameObject: m_ObjectHideFlags: 0 @@ -3854,6 +4649,80 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &8926881178834677391 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2888086770361782851} + - component: {fileID: 4998480650008272473} + - component: {fileID: 336701978860328758} + m_Layer: 5 + m_Name: heroStage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2888086770361782851 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8926881178834677391} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_Children: [] + m_Father: {fileID: 894077670209580548} + m_RootOrder: 9 + 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: -47.73, y: -17.2} + m_SizeDelta: {x: 50.91, y: 50.91} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4998480650008272473 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8926881178834677391} + m_CullTransparentMesh: 0 +--- !u!114 &336701978860328758 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8926881178834677391} + 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: 9a1e5e795834ae7448fd0aa236d7b64b, 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 &8980495577245095675 GameObject: m_ObjectHideFlags: 0 @@ -3943,127 +4812,151 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null ---- !u!1001 &8055392874732707364 -PrefabInstance: +--- !u!1 &8987806199281342064 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 5958908542893353267} - m_Modifications: - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 53 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -50.8 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_SizeDelta.x - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_SizeDelta.y - value: 135 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1769131154799298, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} - propertyPath: m_Name - value: ItemView - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc289befb290a5544b9c25eae7cf8973, type: 3} ---- !u!224 &7841933899132682386 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 224797861638971062, guid: cc289befb290a5544b9c25eae7cf8973, - type: 3} - m_PrefabInstance: {fileID: 8055392874732707364} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6836166906844610119} + - component: {fileID: 3391068456846604556} + - component: {fileID: 5955093153162351486} + m_Layer: 5 + m_Name: proIcon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6836166906844610119 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987806199281342064} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002141, y: 1.0002141, z: 1.0002141} + m_Children: [] + m_Father: {fileID: 894077670209580548} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -53.4, y: 54} + m_SizeDelta: {x: 74, y: 74} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3391068456846604556 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987806199281342064} + m_CullTransparentMesh: 0 +--- !u!114 &5955093153162351486 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8987806199281342064} + 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: 1c666beff78f70943be2712a7f73f982, 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 &9053479468144006770 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7783751494494281313} + - component: {fileID: 6888543075580129129} + - component: {fileID: 6388686657794518408} + m_Layer: 5 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7783751494494281313 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9053479468144006770} + 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: 894077670209580548} + 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: 140, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6888543075580129129 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9053479468144006770} + m_CullTransparentMesh: 0 +--- !u!114 &6388686657794518408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9053479468144006770} + 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: ec23e936a0dbfce44826bc67f324ec3b, 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 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index d400a9fcc7..23457b85f8 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -13613,7 +13613,7 @@ GameObject: m_Component: - component: {fileID: 3787413743101383427} m_Layer: 5 - m_Name: pre0 + m_Name: pre1 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -26388,6 +26388,76 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185\u5BB9\u6587\u5B57\u5185" LanguageIndex: 11279 +--- !u!114 &3824805063086266116 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141888556147001942} + 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: 1 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &1207475283680438087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141888556147001942} + m_CullTransparentMesh: 0 +--- !u!114 &7506282881015489012 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7141888556147001942} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &7149380988800205505 GameObject: m_ObjectHideFlags: 0 @@ -28560,6 +28630,76 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7679549269722646008} m_CullTransparentMesh: 0 +--- !u!114 &4349174129572227584 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7694933089126481566} + 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: 1 + 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: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &5080701746428790772 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7694933089126481566} + m_CullTransparentMesh: 0 +--- !u!114 &3734388241932857986 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7694933089126481566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, 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 --- !u!1 &7701393640617058818 GameObject: m_ObjectHideFlags: 0 @@ -34916,7 +35056,7 @@ GameObject: m_Component: - component: {fileID: 6248861710717374526} m_Layer: 5 - m_Name: pre1 + m_Name: pre2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -36044,7 +36184,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &658699689053748754 RectTransform: m_ObjectHideFlags: 0 @@ -38847,6 +38987,12 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2597883278941449572} m_PrefabAsset: {fileID: 0} +--- !u!1 &7141888556147001942 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5120765256161470258, guid: 8e67431ac9f0ee24c87e31eeefe8f19e, + type: 3} + m_PrefabInstance: {fileID: 2597883278941449572} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3303804011825781164 PrefabInstance: m_ObjectHideFlags: 0 @@ -38972,3 +39118,9 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3303804011825781164} m_PrefabAsset: {fileID: 0} +--- !u!1 &7694933089126481566 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5120765256161470258, guid: 8e67431ac9f0ee24c87e31eeefe8f19e, + type: 3} + m_PrefabInstance: {fileID: 3303804011825781164} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index aff6849c12..0e100bfac7 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -177,7 +177,9 @@ ConfigName = { HeroSkin = "HeroSkin", BlessingConfigNew = "BlessingConfigNew", BlessingRewardPoolNew = "BlessingRewardPoolNew", - SpiritAnimalSummon = "SpiritAnimalSummon" + SpiritAnimalSummon = "SpiritAnimalSummon", + CampTowerConfig = "CampTowerConfig", + CampTowerSetting = "CampTowerSetting", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 1f189a3a6b..459b996978 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -359,6 +359,8 @@ UIName = { LingShouBaoGeTenResultPanel = 359,--灵兽宝阁十抽 RoleAwakeTalentPopup = 360,--通用大弹窗界面 RoleAwakeSuccessPanel = 361,--通用大弹窗界面 + FourElementMonsterCampPanel = 367, --四灵试炼界面 + MonsterCampMainPanel = 368, --心魔主界面 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua index c6cd7dab79..ecb0a33bf6 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua @@ -65,7 +65,7 @@ local activityType = { }, --势不可挡 限时召唤 [4305] = { - bg = "Bg2", + bg = "Bg2", hero = { [1]={name="Bg2/hero1",id=10014,hero="s_shibukedang_shenjiang1"}, ----哪吒 [2]={name="Bg2/hero3",id=10090,hero="s_shibukedang_shenjiang3"}, --阎罗王 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua index 026ce0ae62..7a8c6110e8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionMonsterInfoPopup.lua @@ -13,6 +13,7 @@ local contentScripts = { [4]= {view=require("Modules/Expedition/View/ExpeditionMonsterInfo_Trail"),panelName="ExpeditionMonsterInfo_Trail",type=EXPEDITON_POPUP_TYPE.Trail}, --贪婪 [5]= {view=require("Modules/Expedition/View/ExpeditionMonsterInfo_Greed"),panelName="ExpeditionMonsterInfo_Greed",type=EXPEDITON_POPUP_TYPE.Greed}, + -- 四灵试炼 boss [6]= {view=require("Modules/Expedition/View/MonsterFormationInfo"),panelName="ExpeditionMonsterInfo_Monster",type = EXPEDITON_POPUP_TYPE.FourElementMonster}, } --子模块预设 diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua index e817bd76db..90394775ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Monster.lua @@ -19,6 +19,9 @@ function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.power = Util.GetGameObject(gameObject, "Power/Value"):GetComponent("Text") this.sureBtn=Util.GetGameObject(gameObject,"sureBtn") + this.sureBtn.gameObject:SetActive(true) + Util.GetGameObject(gameObject,"fightBtn"):SetActive(false) + Util.GetGameObject(gameObject,"returnLook"):SetActive(false) this.sureBtnText=Util.GetGameObject(gameObject,"sureBtn/Text"):GetComponent("Text") --滚动条根节点 this.root = Util.GetGameObject(gameObject, "Root") diff --git a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua index 758fc81f1a..3f252c7764 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expedition/View/MonsterFormationInfo.lua @@ -8,7 +8,8 @@ local fun --item容器 local itemList = {} local heroListGo = {} -local monsterData = {} +local waveId = 0 +local configData = {} local rewardData = {} local type = 1 --1 前往 2 放弃 local liveNodes = {} @@ -18,27 +19,39 @@ local roleConfig=ConfigManager.GetConfig(ConfigName.RoleConfig) function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.power = Util.GetGameObject(gameObject, "Power/Value"):GetComponent("Text") - this.sureBtn=Util.GetGameObject(gameObject,"sureBtn") - this.sureBtnText=Util.GetGameObject(gameObject,"sureBtn/Text"):GetComponent("Text") + --滚动条根节点 this.root = Util.GetGameObject(gameObject, "Root") for i = 1, 6 do heroListGo[i] = Util.GetGameObject(gameObject, "RoleGrid/Bg"..i.."/Hero"..i) end this.backBtn=Util.GetGameObject(gameObject,"BackBtn") + this.fightBtn=Util.GetGameObject(gameObject,"fightBtn") + this.fightBtnText=Util.GetGameObject(this.fightBtn,"Text"):GetComponent("Text") + this.fightBtnIcon=Util.GetGameObject(this.fightBtn,"Icon"):GetComponent("Image") + this.fightBtnNum=Util.GetGameObject(this.fightBtn,"IconNum"):GetComponent("Text") + this.fightBtn.gameObject:SetActive(true) + this.returnLook=Util.GetGameObject(gameObject,"returnLook") + this.returnLook.gameObject:SetActive(true) + Util.GetGameObject(gameObject,"sureBtn"):SetActive(false) end function this:BindEvent() - Util.AddClick(this.sureBtn, function() + Util.AddClick(this.fightBtn, function() this:BtnClickEvent() + end) + Util.AddClick(this.returnLook, function() + end) Util.AddClick(this.backBtn, function() parent:ClosePanel() end) end function this:BtnClickEvent() + --挑战 if type == 1 then parent:ClosePanel() + --扫荡 elseif type == 2 then parent:ClosePanel() end @@ -48,21 +61,25 @@ function this:AddListener() end function this:RemoveListener() + end function this:OnShow(_parent,...) parent=_parent sortingOrder = _parent.sortingOrder --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 local args = {...} - monsterData = args[1] + waveId = args[1] type = args[2] - fun = args[3] - + configData = ConfigManager.GetConfigData(ConfigName.CampTowerConfig,waveId) --组数据 rewardData = {} - local curRewardData = {} - --curNodeConFig = ConfigManager.TryGetConfigData(ConfigName.ExpeditionNodeConfig,monsterData.type) - local Reward --= ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.ExpeditionFloorConfig,"Floor",ExpeditionManager.expeditionLeve,"FloorLay",monsterData.lay - 1) + local curRewardData = {} + local Reward + if type == 1 then + Reward = configData.FirstReward + else + Reward = configData.CommonReward + end if Reward and Reward.Reward and #Reward.Reward > 0 then for i = 1, #Reward.Reward do local rewardGroupConfig = ConfigManager.TryGetConfigData(ConfigName.RewardGroup,Reward.Reward[i]) @@ -88,24 +105,25 @@ function this:OnShow(_parent,...) end -- 编队数据匹配 function this:FormationAdapter() + this.fightBtnNum.gameObject:SetActive(false) + this.fightBtnIcon.gameObject:SetActive(false) if type == 1 then - this.sureBtnText.text = Language[10508] + this.fightBtn.text = "挑战" + elseif type == 2 then - this.sureBtnText.text = Language[10512] + this.fightBtn.text = "扫荡" end - this.titleText.text=Language[10513] + this.titleText.text = string.format("%s层",waveId) + this.power.text = configData.Force - if monsterData == nil then LogError(Language[10511]) return end - this.power.text = monsterData.bossTeaminfo.totalForce + local bossTeaminfo = ConfigManager.GetConfigData(ConfigName.MonsterGroup,configData.Monster) for i = 1, #heroListGo do - heroListGo[i]:SetActive(false) - end - for i = 1, #heroListGo do - if(monsterData.bossTeaminfo.hero[i]) then - local pos = monsterData.bossTeaminfo.hero[i].position - this.SetCardSingleData(heroListGo[pos],monsterData.bossTeaminfo.hero[i],pos) - heroListGo[pos]:SetActive(true) + if (bossTeaminfo.Contents[1][i]) and bossTeaminfo.Contents[1][i] > 0 then + this.SetCardSingleData(heroListGo[i],bossTeaminfo.Contents[1][i],i) + heroListGo[i]:SetActive(true) + else + heroListGo[i]:SetActive(false) end end FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,5,1,sortingOrder,false,rewardData) @@ -121,7 +139,8 @@ end --设置单个上阵英雄信息 function this.SetCardSingleData(o,monsterId, _pos) o.transform.parent:GetComponent("Image").sprite=Util.LoadSprite("bd_xinkapaifan") - local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterId.heroTid) + local monsterconfig = ConfigManager.GetConfigData(ConfigName.MonsterConfig, monsterId) + local heroConfig = ConfigManager.GetConfigData(ConfigName.HeroConfig, monsterconfig.MonsterId) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local fg=Util.GetGameObject(o,"Bg2"):GetComponent("Image") -- local live=Util.GetGameObject(o,"Mask/Live") diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index e8088961d3..a6fcde60e0 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -10,7 +10,7 @@ local contentScripts = { [1] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu"), panelName = "GeneralBigPopup_YiJingBaoKu",type=GENERAL_POPUP_TYPE.YiJingBaoKu}, --易经宝库奖励预览 [2] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKuRewardPreview"), panelName = "GeneralBigPopup_YiJingBaoKuRewardPreview",type=GENERAL_POPUP_TYPE.YiJingBaoKuRewardPreview}, - --易经宝库奖励预览 + --四灵试炼助战 [3] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight"), panelName = "GeneralBigPopup_FourElementHelpFight",type=GENERAL_POPUP_TYPE.FourElementHelpFight}, } --子模块预设 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua index 613b1590ad..3552dddf9d 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua @@ -4,20 +4,22 @@ local this = {} local parent --传入特效层级 local sortingOrder=0 -local curId = nil--当前已选择的物品的Id -local ActData = {} local itemList = {}--克隆预制体列表 -local goList = {}--勾选按钮列表 -local itemIconList={}--ItemView的List -local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) -local _args -local func - +local tabs = {} +local curIndex = 1 +local myHelpHero = {} +local selectHelpHero = {} +local waveId = 0 +local configData = {} function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") - this.itemPre = Util.GetGameObject(gameObject, "itemPre") - this.ConfirmBtn = Util.GetGameObject(gameObject, "ConfirmBtn") - this.Scroll = Util.GetGameObject(gameObject, "Scroll") + this.itemPre = Util.GetGameObject(gameObject, "itemPre") + this.Scroll = Util.GetGameObject(gameObject, "scroller") + this.selectBtn = Util.GetGameObject(gameObject, "tabbox/selectBtn") + this.tabRoot = Util.GetGameObject(gameObject, "tabbox/box") + for i = 1,#this.tabRoot.transform.childCount do + table.insert(tabs,this.tabRoot.transform:GetChild(i - 1).gameObject) + end local rootHight = this.Scroll.transform.rect.height local width = this.Scroll.transform.rect.width @@ -28,20 +30,30 @@ function this:InitComponent(gameObject) end function this:BindEvent() - Util.AddClick(this.ConfirmBtn,function() - if curId and curId ~= 0 then - UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YiJingBaoKuConfirm,curId,function() - NetManager.SelectFinalRewardRequest(curId,ActData.activityId,function () - if func then - func() - end - parent:ClosePanel() - end) - end) - else - PopupTipPanel.ShowTip(Language[11796]) - end - end) + for i = 1,#tabs do + Util.AddClick(tabs[i],function() + this:BtnClick(i) + end) + end + +end + +function this:BtnClick(i) + if curIndex == i then + return + end + this.selectBtn.transform:SetParent(tabs[i].transform) + this.selectBtn:GetComponent("RectTransform").localPosition = Vector3.zero + this.transform:SetAsFirstSibling() + curIndex = i + if i == 1 then + selectHelpHero = {} + --向后端发送请求 + this:RefreshItemData() + else + --筛选合适的神将 + this:RefreshItemData() + end end function this:AddListener() @@ -51,99 +63,71 @@ function this:RemoveListener() end function this:OnShow(_parent,...) - - itemList={} parent=_parent sortingOrder = _parent.sortingOrder - --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 - _args = {...} - ActData = _args[1] - func = _args[2] - this.titleText.text = "选择最终奖励" - curId = ActData.selectId or nil - local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",ActData.curFinalPool) - this.ScrollView:SetData(RewardConfig, function(index, go) - this:SetSingleData(index,go, RewardConfig[index]) - end) + local args = {...} + waveId = args[1] + configData = ConfigManager.GetConfigData(ConfigName.CampTowerConfig,waveId) + this.titleText.text = configData.CampId.."试炼" + myHelpHero = {} + this:BtnClick(1) +end + +function this:RefreshItemData() + local data = curIndex == 1 and selectHelpHero or myHelpHero + table.sort(data,function(a,b) end) + this.ScrollView:Setdata(data,function(index,go) + this:SetSingleData(index,go,data[index]) + end + ) +end + +function this:SingleHeroDataShow(_go, _heroData) + local heroData = _heroData + local go = _go + local orderImage= Util.GetGameObject(go, "orderImage") + orderImage:SetActive(false) + Util.GetGameObject(go, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality, heroData.star)) + Util.GetGameObject(go, "icon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.icon) + Util.GetGameObject(go, "lv/Text"):GetComponent("Text").text = heroData.lv + --Util.GetGameObject(go, "posIcon"):GetComponent("Image").sprite = Util.LoadSprite(heroData.professionIcon) + Util.GetGameObject(go, "proIcon"):GetComponent("Image").sprite = Util.LoadSprite(GetProStrImageByProNum(heroData.heroConfig.PropertyName)) + --Util.GetGameObject(go, "heroStage"):GetComponent("Image").sprite = Util.LoadSprite(HeroStageSprite[heroData.heroConfig.HeroStage]) + Util.GetGameObject(go, "heroStage"):SetActive(false) + + local heroHp = ExpeditionManager.heroInfo[heroData.dynamicId].remainHp + local starGrid = Util.GetGameObject(go, "star") + SetHeroStars(starGrid, heroData.star) + + Util.AddOnceClick(go, function() + UIManager.OpenPanel(UIName.RoleInfoPopup, heroData) + end) end function this:SetSingleData(index,item,data) itemList[index] = item - local icon = Util.GetGameObject(item,"icon") + local itemRoot = Util.GetGameObject(item,"HeroPre") local name = Util.GetGameObject(item,"name"):GetComponent("Text") - local num = Util.GetGameObject(item,"text"):GetComponent("Text") - local limit1 = Util.GetGameObject(item,"limit1"):GetComponent("Text") - local limit2 = Util.GetGameObject(item,"limit2"):GetComponent("Text") - local select = Util.GetGameObject(item,"select") - local go = Util.GetGameObject(item,"select/Go") - - goList[index] = go + local num = Util.GetGameObject(item,"power/text"):GetComponent("Text") + local tip = Util.GetGameObject(item,"tip"):GetComponent("Text") + local select = Util.GetGameObject(item,"Button/tip"):GetComponent("Image") + local selectText = Util.GetGameObject(item,"Button/Text") + local btn = Util.GetGameObject(item,"Button") - item:SetActive(true) - if not itemIconList[item] then - local view = SubUIManager.Open(SubUIConfig.ItemView, icon.transform) - itemIconList[item] = view - end - itemIconList[item]:OnOpen(false,data.Reward,0.9,false) - name.text = itemConfig[data.Reward[1]].Name - - --判断是否选了该物品 - if curId == data.Id then - go:SetActive(true) + this:SingleHeroDataShow(itemRoot, data.heroData) + name.text = itemConfig[data.heroData.heroConfig.Id].Name + num.text = data.power + tip.text = "来自"..data.from..data.userName + tip.gameObject:SetActive(curIndex == 1) + if data.isSelect then + btn:GetComponent("Button").enbled = false else - go:SetActive(false) + btn:GetComponent("Button").enbled = true end - --选择一个物品 - Util.AddOnceClick(select,function() - if go.gameObject.activeSelf then - go:SetActive(false) - curId = nil - else - for index, value in ipairs(goList) do - goList[index]:SetActive(false) - end - go:SetActive(true) - curId = data.Id - end + Util.AddOnceClick(btn,function() + end) - - local t1 = true - local t2 = true - local t3 = true - --判断是否可以选择 - if PlayerManager.level >= data.LevelLimit then - num.gameObject:SetActive(true) - limit1.gameObject:SetActive(false) - select:SetActive(true) - else - limit1.gameObject:SetActive(true) - limit1.text = data.LevelLimit.."级可选" - t1 = false - end - if ActData.curLevel >= data.FloorLimit then - num.gameObject:SetActive(true) - limit2.gameObject:SetActive(false) - select:SetActive(true) - else - limit2.gameObject:SetActive(true) - limit2.text = "第"..data.FloorLimit.."层可选" - t2 = false - end - -- LogRed(ActData.allData[index].rewardId..":"..tostring(ActData.allData[index].progress)) - if ActData.allData[index].progress > data.InitializeNum then - t3 = false - elseif ActData.allData[index].progress == data.InitializeNum and ActData.curLevel > data.InitializeNum then - t3 = false - num.text = ""..(data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum.."" - else - t3 = true - num.text = (data.InitializeNum-ActData.allData[index].progress).."/"..data.InitializeNum - end - - num.gameObject:SetActive(t1 and t2) - select:SetActive(t1 and t2 and t3) - end function this:OnClose() @@ -151,7 +135,7 @@ function this:OnClose() end function this:OnDestroy() - itemIconList={} + itemList = {} end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index 89566c00ac..c84fcd4f7b 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -4,21 +4,28 @@ local this = MonsterCampMainPanel local orginLayer local monsterGroup = ConfigManager.GetConfig(ConfigName.MonsterGroup) local monsterConfig = ConfigManager.GetConfig(ConfigName.MonsterConfig) +local trails = {} + --初始化组件(用于子类重写) function MonsterCampMainPanel:InitComponent() orginLayer = 0 this.btnBack = Util.GetGameObject(self.gameObject, "btnBack") this.waveNum = Util.GetGameObject(self.gameObject, "Bg/waveImg/wave"):GetComponent("Text") - this.nextWave = Util.GetGameObject(self.gameObject, "Bg/btnWave") this.UpView = SubUIManager.Open(SubUIConfig.UpView, self.gameObject.transform) + + for i = 1 ,4 do + table.insert(trails,Util.GetGameObject(self.gameObject, "Bg/SiLingDi/trail"..i)) + end + this.btnShenYing = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/shenyingPro") + this.shenYingProgressText = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Text"):GetComponent("Text") + this.shenYingProgressIma = Util.GetGameObject(self.gameObject, "Bg/SiLingDi/progress/Image"):GetComponent("Image") end --绑定事件(用于子类重写) function MonsterCampMainPanel:BindEvent() Util.AddClick(this.btnBack, function () - -- UIManager.OpenPanel(UIName.MainPanel) PlayerManager.carbonType = 1 UIManager.OpenPanel(UIName.CarbonTypePanelV2) self:ClosePanel() @@ -28,7 +35,9 @@ function MonsterCampMainPanel:BindEvent() JumpManager.GoJump(1011) end) - + Util.AddClick(this.btnShenYing, function () + + end) end --添加事件监听(用于子类重写) @@ -45,9 +54,24 @@ end --界面打开时调用(用于子类重写) function MonsterCampMainPanel:OnOpen(...) SoundManager.PlayMusic(SoundConfig.BGM_Carbon) - this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.MonsterCamp }) - this.waveNum.text =MonsterCampManager.monsterWave +end + +function MonsterCampMainPanel:OnShow() + this.waveNum.text = MonsterCampManager.monsterWave + this.shenYingProgressText = "16/100" + this.shenYingProgressIma.fillAmount = 16/100 + for i = 1,#trails do + + end +end + +function MonsterCampMainPanel:SetSingleTrailData(go,index,data) + local title = Util.GetGameObject(go, "title/Text"):GetComponent("Text") + local curwave = Util.GetGameObject(go, "curwave"):GetComponent("Text") + local canFightWave = Util.GetGameObject(go, "canFightWave"):GetComponent("Text") + local openTime = Util.GetGameObject(go, "openTime"):GetComponent("Text") + end function MonsterCampMainPanel:OnSortingOrderChange() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua index eae60d6c9f..82f9bac604 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_FightReturnLookFourEle.lua @@ -6,8 +6,7 @@ local parent local sortingOrder = 0 --传入不定参 local _args = {} ---传入选择英雄计算返回奖励数据列表 -local dropList = {} +local nodeList = {} --item容器 local itemList = {} --传入选择英雄 @@ -17,32 +16,13 @@ local itemConfig=ConfigManager.GetConfig(ConfigName.ItemConfig) function this:InitComponent(gameObject) this.titleText = Util.GetGameObject(gameObject, "TitleText"):GetComponent("Text") - this.bodyText = Util.GetGameObject(gameObject, "BodyText"):GetComponent("Text") - this.cancelBtn = Util.GetGameObject(gameObject, "CancelBtn") - this.confirmBtn = Util.GetGameObject(gameObject, "ConfirmBtn") - --滚动条根节点 - this.root = Util.GetGameObject(gameObject, "Root/Viewport/Content") + for i = 1, 2 do + table.insert(itemList,Util.GetGameObject(gameObject, "Root/Viewport/Content/pre"..i)) + end end function this:BindEvent() - Util.AddClick(this.cancelBtn,function() - parent:ClosePanel() - end) - Util.AddClick(this.confirmBtn,function() - local data - for k,v in pairs(selectHeroData) do - data=v.dynamicId - break - end - NetManager.HeroRetureEvent(data, function(msg) - HeroManager.ResetHero(data) - PopupTipPanel.ShowTip(Language[12276]) - parent:ClosePanel() - UIManager.OpenPanel(UIName.RewardItemPopup,msg.drop,1,function () - ResolvePanel.SwitchView(2) - end,0,nil,nil,1) - end) - end) + end function this:AddListener() @@ -55,20 +35,47 @@ function this:OnShow(_parent,...) parent=_parent sortingOrder =_parent.sortingOrder local args = {...} - dropList = args[1] - selectHeroData=args[2] - this.root.transform:GetComponent("RectTransform"):DOAnchorPosX(0, 0) - - this.titleText.text=Language[11645] - --返还比 - local num=tonumber(ConfigManager.GetConfigData(ConfigName.SpecialConfig,34).Value)/100 - this.bodyText.text = Language[11646]--string.format(Language[11646], num, "%") - - local _data={} - for i=1,#dropList do - _data[i] = {dropList[i].id,dropList[i].num,nil,dropList[i].star} + local waveId = args[1] + --向后端请求回放数据 + local returnLookData = {} + for i = 1 , #itemList do + this:SetSingleData(itemList[i],returnLookData[i],i) end - FindFairyManager.ResetItemView(this.root,this.root.transform,itemList,8,1,sortingOrder,false,_data) + +end + +function this:SetSingleData(go,data,index) + if data then + go.gameObject:SetActive(true) + else + go.gameObject:SetActive(false) + return + end + + local name = Util.GetGameObject(go, "name"):GetComponent("Text") + local power = Util.GetGameObject(go, "power/Text"):GetComponent("Text") + local tipIma = Util.GetGameObject(go, "tip"):GetComponent("Image") + local tip = Util.GetGameObject(go, "tip/Text"):GetComponent("Text") + + local playerHead = Util.GetGameObject(go, "PlayerHead") + if not nodeList[go] then + nodeList[go] = CommonPool.CreateNode(POOL_ITEM_TYPE.PLAYER_HEAD, playerHead) + end + nodeList[go]:Reset() + nodeList[go]:SetHead(data.head) + nodeList[go]:SetFrame(data.headFrame) + nodeList[go]:SetLevel(data.level) + nodeList[go]:SetScale(Vector3.one * 0.7) + nodeList[go]:SetLayer(sortingOrder) + nodeList[go]:SetEffectScale(0.75) + + local btn = Util.GetGameObject(go, "Button") + Util.AddOnceClick(btn,function() + + end) + Util.AddOnceClick(playerHead,function() + + end) end function this:OnClose()