diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 4399b6ee19..37863630cb 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -288,6 +288,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &131596088043286720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6731589704943924282} + - component: {fileID: 5564795324050871818} + - component: {fileID: 2263769275776879578} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6731589704943924282 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 131596088043286720} + 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: 4403385418803474761} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -331.9} + m_SizeDelta: {x: 1080, y: 472} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5564795324050871818 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 131596088043286720} + m_CullTransparentMesh: 0 +--- !u!114 &2263769275776879578 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 131596088043286720} + 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: 6172d140a92073345b6b0d7cd20fb8ed, 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 &156634478321930868 GameObject: m_ObjectHideFlags: 0 @@ -573,6 +647,85 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &223108522459404838 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5489039324293512018} + - component: {fileID: 3194347943538256385} + - component: {fileID: 1512853579565983030} + m_Layer: 5 + m_Name: ItemPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5489039324293512018 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223108522459404838} + 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: 4499192152238623041} + - {fileID: 3323978938496254517} + - {fileID: 5699968993373683288} + - {fileID: 9079045295500488071} + - {fileID: 2031672032753307058} + m_Father: {fileID: 1580303152666221298} + 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: -2540, y: 408} + m_SizeDelta: {x: 1080, y: 240} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3194347943538256385 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223108522459404838} + m_CullTransparentMesh: 0 +--- !u!114 &1512853579565983030 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 223108522459404838} + 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: 064b311ca0c97a0438a84c77d7271da7, 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 &230665814953277176 GameObject: m_ObjectHideFlags: 0 @@ -811,8 +964,7 @@ GameObject: - component: {fileID: 388861434199020551} - component: {fileID: 6554721748171472815} - component: {fileID: 3467210137321788183} - - component: {fileID: 1604068332231895558} - - component: {fileID: 177131891785010614} + - component: {fileID: 168389125429456465} m_Layer: 0 m_Name: tabbox m_TagString: Untagged @@ -881,7 +1033,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 336460749731130647} m_CullTransparentMesh: 0 ---- !u!114 &1604068332231895558 +--- !u!114 &168389125429456465 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -890,39 +1042,9 @@ MonoBehaviour: m_GameObject: {fileID: 336460749731130647} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: -1200242548, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_ShowMaskGraphic: 0 ---- !u!114 &177131891785010614 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 336460749731130647} - 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: 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 &342839652090611094 GameObject: m_ObjectHideFlags: 0 @@ -1366,6 +1488,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &518682250538405114 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9110447908448053101} + - component: {fileID: 7910967414065865773} + - component: {fileID: 8786756061805805577} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9110447908448053101 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518682250538405114} + 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: 7418089345689583210} + m_Father: {fileID: 6872382260446978439} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7910967414065865773 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518682250538405114} + m_CullTransparentMesh: 0 +--- !u!114 &8786756061805805577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 518682250538405114} + 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: a2405fced91d3d443befb9c81440a05b, 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 &529590044623274133 GameObject: m_ObjectHideFlags: 0 @@ -2259,6 +2456,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8609906984241842863} + - component: {fileID: 1123204913743070087} m_Layer: 5 m_Name: page_3 m_TagString: Untagged @@ -2287,6 +2485,14 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1123204913743070087 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 825327667903362075} + m_CullTransparentMesh: 0 --- !u!1 &836829816016930742 GameObject: m_ObjectHideFlags: 0 @@ -2907,8 +3113,10 @@ RectTransform: m_Children: - {fileID: 7802239188457280955} - {fileID: 2073861587703347156} + - {fileID: 2704631156663416568} + - {fileID: 862753748118354898} m_Father: {fileID: 2583667563870890104} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -3848,7 +4056,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &1540895894509602026 +--- !u!1 &1589407182218801186 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3856,53 +4064,54 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1020227240612131736} - - component: {fileID: 2115595651019387228} - - component: {fileID: 7613120531563954774} - m_Layer: 0 - m_Name: Text + - component: {fileID: 4299231318084807277} + - component: {fileID: 7091958631644234883} + - component: {fileID: 880060846672635844} + m_Layer: 5 + m_Name: tiao m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1020227240612131736 +--- !u!224 &4299231318084807277 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540895894509602026} + m_GameObject: {fileID: 1589407182218801186} 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: 4403385418803474761} - m_RootOrder: 1 + m_Children: + - {fileID: 4707548327315096938} + m_Father: {fileID: 1580303152666221298} + 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: -80.9, y: -232.2} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 248, y: 644} + m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2115595651019387228 +--- !u!222 &7091958631644234883 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540895894509602026} + m_GameObject: {fileID: 1589407182218801186} m_CullTransparentMesh: 0 ---- !u!114 &7613120531563954774 +--- !u!114 &880060846672635844 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1540895894509602026} + m_GameObject: {fileID: 1589407182218801186} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} @@ -3913,21 +4122,15 @@ MonoBehaviour: 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: 36 - 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: 0 - m_LineSpacing: 1 - m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A" - LanguageIndex: 0 + m_Sprite: {fileID: 21300000, guid: 26e7b9b885f7a9d4b8681d2e7ccbd265, 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 &1616363811633437511 GameObject: m_ObjectHideFlags: 0 @@ -5938,6 +6141,130 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06" +--- !u!1 &2810249423370311458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3323978938496254517} + - component: {fileID: 1186243876548438045} + - component: {fileID: 4680830711553432473} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3323978938496254517 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810249423370311458} + 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: 8990658614396903666} + - {fileID: 6351062040905151245} + - {fileID: 278825424909160414} + m_Father: {fileID: 5489039324293512018} + 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: -526.94, y: 76} + m_SizeDelta: {x: 243.72, y: 50} + m_Pivot: {x: 0, y: 0.5} +--- !u!114 &1186243876548438045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810249423370311458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: -11.64 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 +--- !u!114 &4680830711553432473 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2810249423370311458} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!1 &2827507354882112753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4499192152238623041} + - component: {fileID: 8579302328573714151} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4499192152238623041 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2827507354882112753} + 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: 580048562921107096} + - {fileID: 852724337733465578} + - {fileID: 90885010552363343} + m_Father: {fileID: 5489039324293512018} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8579302328573714151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2827507354882112753} + m_CullTransparentMesh: 0 --- !u!1 &2845872695486210704 GameObject: m_ObjectHideFlags: 0 @@ -6219,6 +6546,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5956\u52B1\u9884\u89C8" +--- !u!1 &2934658896333159990 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 90885010552363343} + - component: {fileID: 8729821525442469488} + - component: {fileID: 6251353166049645795} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &90885010552363343 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2934658896333159990} + 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: 4499192152238623041} + 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: 17.74, y: 81.5} + m_SizeDelta: {x: 558, y: 44} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &8729821525442469488 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2934658896333159990} + m_CullTransparentMesh: 0 +--- !u!114 &6251353166049645795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2934658896333159990} + 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: 7491ecf89cbc4344c9165af75629b7e4, 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 &2956102144139865065 GameObject: m_ObjectHideFlags: 0 @@ -6456,6 +6857,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &3092867399539100487 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 852724337733465578} + - component: {fileID: 2584092423296781649} + - component: {fileID: 1005819929463264788} + m_Layer: 5 + m_Name: Image (4) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &852724337733465578 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092867399539100487} + 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: 4499192152238623041} + 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: 0.010009766, y: -126.6} + m_SizeDelta: {x: 1080, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2584092423296781649 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092867399539100487} + m_CullTransparentMesh: 0 +--- !u!114 &1005819929463264788 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092867399539100487} + 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: d8148e3d8fa6c434082c2d446061941a, 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 &3106194982758467865 GameObject: m_ObjectHideFlags: 0 @@ -6535,6 +7010,85 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &3126859111995067292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6690904579549707098} + - component: {fileID: 8061267819159101971} + - component: {fileID: 785540166835500147} + m_Layer: 5 + m_Name: price + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6690904579549707098 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3126859111995067292} + 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: 9079045295500488071} + 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.55002, y: 0} + m_SizeDelta: {x: 211.1, y: 61.53} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8061267819159101971 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3126859111995067292} + m_CullTransparentMesh: 0 +--- !u!114 &785540166835500147 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3126859111995067292} + 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.32941177, g: 0.1137255, b: 0.04705883, 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: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u524D\u5F80" --- !u!1 &3154844289562497308 GameObject: m_ObjectHideFlags: 0 @@ -11338,7 +11892,7 @@ ParticleSystem: --- !u!199 &6361814840690037554 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -11707,6 +12261,100 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3286402047869564235 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2704631156663416568} + - component: {fileID: 9016597544808700595} + - component: {fileID: 1093703966588726621} + - component: {fileID: 8592351564464048303} + m_Layer: 5 + m_Name: image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2704631156663416568 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3286402047869564235} + 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: 2991313753996687485} + 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: 0, y: 0} + m_SizeDelta: {x: 128, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9016597544808700595 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3286402047869564235} + m_CullTransparentMesh: 0 +--- !u!114 &1093703966588726621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3286402047869564235} + 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: fcd7f98240d96bb46b47fb807d597750, 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!95 &8592351564464048303 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3286402047869564235} + 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 &3289416830980271015 GameObject: m_ObjectHideFlags: 0 @@ -11927,16 +12575,17 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3378033569526880565} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4403385418803474761} - m_RootOrder: 0 + m_Children: + - {fileID: 5655445736015705706} + m_Father: {fileID: 7227227312977206032} + 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: 0, y: -232} + m_AnchoredPosition: {x: -2.4, y: 604.0999} m_SizeDelta: {x: 584, y: 84} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1810260529094738811 @@ -13535,6 +14184,146 @@ MonoBehaviour: m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &4202581271410772273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9079045295500488071} + - component: {fileID: 5119335483049672238} + - component: {fileID: 2107096496739696620} + - component: {fileID: 608150426590728633} + - component: {fileID: 3528022612710295794} + m_Layer: 5 + m_Name: btnBuy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9079045295500488071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202581271410772273} + 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: 6690904579549707098} + - {fileID: 2343543827181550782} + - {fileID: 7439523667026486320} + m_Father: {fileID: 5489039324293512018} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -182.6, y: -19.95} + m_SizeDelta: {x: 210, y: 74.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5119335483049672238 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202581271410772273} + m_CullTransparentMesh: 0 +--- !u!114 &2107096496739696620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202581271410772273} + 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: 0a532ebdeed70794ab64fbeb4b884ca1, 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 &608150426590728633 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202581271410772273} + 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: 2107096496739696620} + 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 &3528022612710295794 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4202581271410772273} + 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 &4254212552365417261 GameObject: m_ObjectHideFlags: 0 @@ -13902,15 +14691,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 9081327288207073813} - - {fileID: 1020227240612131736} + - {fileID: 6731589704943924282} m_Father: {fileID: 8609906984241842863} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 626} - m_SizeDelta: {x: 0, y: 472} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2296414045006860927 CanvasRenderer: @@ -13940,7 +14728,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 6172d140a92073345b6b0d7cd20fb8ed, type: 3} + m_Sprite: {fileID: 21300000, guid: a2405fced91d3d443befb9c81440a05b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -14122,7 +14910,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2583667563870890104 RectTransform: m_ObjectHideFlags: 0 @@ -14130,22 +14918,97 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4424397832740394888} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 99242603663810206} - {fileID: 8264600894133335383} + - {fileID: 3517814007534982903} - {fileID: 1008042109767524304} - {fileID: 2991313753996687485} - m_Father: {fileID: 1338579734977636462} + m_Father: {fileID: 7227227312977206032} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 463} - m_SizeDelta: {x: 0, y: 240.9} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -1690, y: 529.56} + m_SizeDelta: {x: 1080, y: 192.67} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4453678039707639172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2343543827181550782} + - component: {fileID: 9121413190687973843} + - component: {fileID: 4002466460589229705} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &2343543827181550782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4453678039707639172} + 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: 9079045295500488071} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -13, y: -13} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9121413190687973843 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4453678039707639172} + m_CullTransparentMesh: 0 +--- !u!114 &4002466460589229705 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4453678039707639172} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &4454623815434545685 GameObject: m_ObjectHideFlags: 0 @@ -14446,6 +15309,114 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4579582754692252156} m_CullTransparentMesh: 0 +--- !u!1 &4583480284993322086 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6351062040905151245} + - component: {fileID: 4556552507106168976} + - component: {fileID: 6203438180708654588} + - component: {fileID: 2692277429856374309} + - component: {fileID: 2892856835869042007} + m_Layer: 5 + m_Name: price + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6351062040905151245 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583480284993322086} + 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: 3323978938496254517} + 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: 128.36, y: -25} + m_SizeDelta: {x: 92, y: 47.4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &4556552507106168976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583480284993322086} + m_CullTransparentMesh: 0 +--- !u!114 &6203438180708654588 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583480284993322086} + 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: 0.9215687, b: 0.8078432, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 0 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 50 +--- !u!114 &2692277429856374309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583480284993322086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &2892856835869042007 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4583480284993322086} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -25.6 --- !u!1 &4624338695030170943 GameObject: m_ObjectHideFlags: 0 @@ -15140,8 +16111,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 5655445736015705706} + - {fileID: 2583667563870890104} - {fileID: 1338579734977636462} + - {fileID: 9081327288207073813} m_Father: {fileID: 8609906984241842863} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -15176,15 +16148,14 @@ 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: 2583667563870890104} + m_Children: [] m_Father: {fileID: 7227227312977206032} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -6.9000244} + m_SizeDelta: {x: 0, y: -13.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &4867386187448914786 GameObject: @@ -15493,6 +16464,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5012794481206642759 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7439523667026486320} + - component: {fileID: 1321015926207372417} + - component: {fileID: 8388292383898538467} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7439523667026486320 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012794481206642759} + 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: 9079045295500488071} + 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: 0, y: 0} + m_SizeDelta: {x: 128, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1321015926207372417 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012794481206642759} + m_CullTransparentMesh: 0 +--- !u!114 &8388292383898538467 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5012794481206642759} + 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: fcd7f98240d96bb46b47fb807d597750, 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 &5063259274705246180 GameObject: m_ObjectHideFlags: 0 @@ -16140,7 +17185,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &424732031091494258 RectTransform: m_ObjectHideFlags: 0 @@ -16286,8 +17331,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8264600894133335383} + - component: {fileID: 992739101051798407} + - component: {fileID: 3118120943523370451} m_Layer: 5 - m_Name: mission + m_Name: title m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -16309,9 +17356,51 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -356, y: 86} + m_AnchoredPosition: {x: -198.1, y: 34} m_SizeDelta: {x: 300, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &992739101051798407 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5301297093816642597} + m_CullTransparentMesh: 0 +--- !u!114 &3118120943523370451 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5301297093816642597} + 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.27058825, g: 0.18431373, b: 0.20392159, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 41 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 41 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u767B\u9646\u6709\u793C" --- !u!1 &5335565075277222361 GameObject: m_ObjectHideFlags: 0 @@ -20884,7 +21973,7 @@ ParticleSystem: --- !u!199 &56297470826831929 ParticleSystemRenderer: serializedVersion: 6 - m_ObjectHideFlags: 2 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} @@ -23397,6 +24486,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &6116856162330015501 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5699968993373683288} + - component: {fileID: 5181767804123725618} + - component: {fileID: 289049594850210421} + m_Layer: 5 + m_Name: shadow + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5699968993373683288 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6116856162330015501} + 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: 5489039324293512018} + 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: 0, y: 22} + m_SizeDelta: {x: 158, y: 158} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5181767804123725618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6116856162330015501} + m_CullTransparentMesh: 0 +--- !u!114 &289049594850210421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6116856162330015501} + 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: bd6340bf60e3e884c891b0c25013696b, 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 &6133819594796907194 GameObject: m_ObjectHideFlags: 0 @@ -23828,6 +24991,65 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &6344923951847583693 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4240211928911393712} + - component: {fileID: 8594506145936696643} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4240211928911393712 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344923951847583693} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1580303152666221298} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -6.9000244} + m_SizeDelta: {x: 0, y: -13.7} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8594506145936696643 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6344923951847583693} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 27.91 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &6348808697839174188 GameObject: m_ObjectHideFlags: 0 @@ -23976,6 +25198,154 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &6420320633838348968 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4016774019935538984} + - component: {fileID: 7833627676577434378} + - component: {fileID: 5872360668049189410} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4016774019935538984 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6420320633838348968} + 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: 2031672032753307058} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 1.0000001} +--- !u!114 &7833627676577434378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6420320633838348968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 0 + m_VerticalFit: 0 +--- !u!114 &5872360668049189410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6420320633838348968} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!1 &6460985358256269223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7418089345689583210} + - component: {fileID: 68668057159031517} + - component: {fileID: 441495240168842132} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7418089345689583210 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6460985358256269223} + 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: 9110447908448053101} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -331.9} + m_SizeDelta: {x: 1080, y: 472} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &68668057159031517 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6460985358256269223} + m_CullTransparentMesh: 0 +--- !u!114 &441495240168842132 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6460985358256269223} + 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: 62c676d12a5c53c478719fa1f644a9cb, 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 &6522179889925035594 GameObject: m_ObjectHideFlags: 0 @@ -24598,7 +25968,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 5a2a0a611997b3944ba75981c8085ee5, type: 3} + m_Sprite: {fileID: 21300000, guid: 763e056f5ef269840bd80e4848cbc7b9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -24632,7 +26002,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6642722196727729715} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -24713,6 +26083,7 @@ RectTransform: - {fileID: 4364234898477055512} - {fileID: 8609906984241842863} - {fileID: 424732031091494258} + - {fileID: 6872382260446978439} m_Father: {fileID: 6861030463589856289} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -24921,6 +26292,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6729719861541313597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4707548327315096938} + - component: {fileID: 8044048800987849854} + - component: {fileID: 1146999461252355052} + m_Layer: 0 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4707548327315096938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6729719861541313597} + 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: 4299231318084807277} + 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: 292, y: -41.998} + m_SizeDelta: {x: 584, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8044048800987849854 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6729719861541313597} + m_CullTransparentMesh: 0 +--- !u!114 &1146999461252355052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6729719861541313597} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.96470594, b: 0.87843144, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + 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: "3\u59299\u5C0F\u65F6" + LanguageIndex: 0 --- !u!1 &6854392290164500888 GameObject: m_ObjectHideFlags: 0 @@ -25504,7 +26955,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2251371539274830992 RectTransform: m_ObjectHideFlags: 0 @@ -25524,7 +26975,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 92, y: -94} + m_AnchoredPosition: {x: -1286, y: 180} m_SizeDelta: {x: 184, y: 188} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6961595280145760067 @@ -27554,6 +29005,42 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &7544856967267834323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2031672032753307058} + m_Layer: 5 + m_Name: scrollView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2031672032753307058 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7544856967267834323} + 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: 4016774019935538984} + m_Father: {fileID: 5489039324293512018} + 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: -221, y: -42.7} + m_SizeDelta: {x: 556, y: 140} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7546466463766986482 GameObject: m_ObjectHideFlags: 0 @@ -27792,6 +29279,52 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "5\u884CUP" +--- !u!1 &7629747792796178623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6872382260446978439} + - component: {fileID: 6432047526644594834} + m_Layer: 5 + m_Name: page_5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &6872382260446978439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629747792796178623} + 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: 9110447908448053101} + - {fileID: 1580303152666221298} + m_Father: {fileID: 6860498336681067139} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6432047526644594834 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7629747792796178623} + m_CullTransparentMesh: 0 --- !u!1 &7644006970207137755 GameObject: m_ObjectHideFlags: 0 @@ -28696,6 +30229,100 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 2 +--- !u!1 &7810903683877328413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 278825424909160414} + - component: {fileID: 7319569151150132045} + - component: {fileID: 5489357408252611358} + - component: {fileID: 6590969086930372406} + m_Layer: 5 + m_Name: progress + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &278825424909160414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7810903683877328413} + 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: 3323978938496254517} + 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: 208.72, y: -25} + m_SizeDelta: {x: 35, y: 47.4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7319569151150132045 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7810903683877328413} + m_CullTransparentMesh: 0 +--- !u!114 &5489357408252611358 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7810903683877328413} + 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: 0.9215687, b: 0.8078432, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5143" +--- !u!114 &6590969086930372406 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7810903683877328413} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &7827873992875349411 GameObject: m_ObjectHideFlags: 0 @@ -28883,7 +30510,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0.000030517578, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8625427577928505908 @@ -28992,8 +30619,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1080, y: 240} + m_AnchoredPosition: {x: -1.7, y: 0} + m_SizeDelta: {x: 1080, y: 192.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2119410061444292271 CanvasRenderer: @@ -29180,6 +30807,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7964800950014184832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 862753748118354898} + - component: {fileID: 6222372173720879040} + - component: {fileID: 125481518196621960} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &862753748118354898 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7964800950014184832} + 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: 2991313753996687485} + 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: 90.000015, y: 29.5} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6222372173720879040 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7964800950014184832} + m_CullTransparentMesh: 0 +--- !u!114 &125481518196621960 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7964800950014184832} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &7976863765653352828 GameObject: m_ObjectHideFlags: 0 @@ -29254,6 +30955,44 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &8002697024111661573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1580303152666221298} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1580303152666221298 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8002697024111661573} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5489039324293512018} + - {fileID: 4240211928911393712} + - {fileID: 4299231318084807277} + m_Father: {fileID: 6872382260446978439} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 0, y: -206.9} + m_SizeDelta: {x: 0, y: 1193.8} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8035545393350875167 GameObject: m_ObjectHideFlags: 0 @@ -30571,7 +32310,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.96470594, g: 0.9176471, b: 0.77647066, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -31147,6 +32886,100 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &8625313410389690315 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8990658614396903666} + - component: {fileID: 7104138529442166108} + - component: {fileID: 4603772087116659756} + - component: {fileID: 4934193009545902822} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8990658614396903666 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8625313410389690315} + 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: 3323978938496254517} + 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: 0, y: -25} + m_SizeDelta: {x: 140, y: 47.4} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &7104138529442166108 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8625313410389690315} + m_CullTransparentMesh: 0 +--- !u!114 &4603772087116659756 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8625313410389690315} + 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: 0.9215687, b: 0.8078432, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u7D2F\u8BA1\u5145\u503C" +--- !u!114 &4934193009545902822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8625313410389690315} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &8656796322370693618 GameObject: m_ObjectHideFlags: 0 @@ -31484,13 +33317,13 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 7227227312977206032} + m_Father: {fileID: 9081327288207073813} 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: 60.5, y: 600.9} - m_SizeDelta: {x: 100, y: 50} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 294.40002, y: -351.95496} + m_SizeDelta: {x: 1080, y: 192.67} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5897560853818070714 CanvasRenderer: @@ -31513,7 +33346,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9921569, g: 0.96470594, b: 0.87843144, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -31527,7 +33360,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 3 m_MaxSize: 40 - m_Alignment: 3 + m_Alignment: 4 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -32979,6 +34812,85 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9160590604094742760} m_CullTransparentMesh: 0 +--- !u!1 &9169749953034245099 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3517814007534982903} + - component: {fileID: 6144654468638633574} + - component: {fileID: 5196654599660649865} + m_Layer: 5 + m_Name: mission + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3517814007534982903 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9169749953034245099} + 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: 2583667563870890104} + 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: -198.1, y: -30.4} + m_SizeDelta: {x: 300, y: 64.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6144654468638633574 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9169749953034245099} + m_CullTransparentMesh: 0 +--- !u!114 &5196654599660649865 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9169749953034245099} + 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.27058825, g: 0.18431373, b: 0.20392159, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 40 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 41 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u767B\u9646\u6709\u5229" --- !u!1 &9190178755529013362 GameObject: m_ObjectHideFlags: 0 @@ -33007,13 +34919,87 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2583667563870890104} - m_RootOrder: 2 + 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: -211, y: -17} - m_SizeDelta: {x: 591.1, y: 147} + m_AnchoredPosition: {x: -440.8, y: 4.4} + m_SizeDelta: {x: 132.4, y: 121.6} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9198227127222798050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 580048562921107096} + - component: {fileID: 853868052910298871} + - component: {fileID: 4025187587941595397} + m_Layer: 5 + m_Name: Image (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &580048562921107096 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9198227127222798050} + 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: 4499192152238623041} + 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: 0.010009766, y: 127} + m_SizeDelta: {x: 1080, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &853868052910298871 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9198227127222798050} + m_CullTransparentMesh: 0 +--- !u!114 &4025187587941595397 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9198227127222798050} + 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: d8148e3d8fa6c434082c2d446061941a, 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!1001 &7988170537790062721 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 29f08efa35..7c360f7b1e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1020,6 +1020,8 @@ ActivityTypeDef = { OpenSeverWelfare=55,--开服福利 EightDayGift = 56,--八日登陆 SignInfo = 57,--三日七日签到 + pozhenzhuxian_task = 2000,--破阵诛仙任务 + pozhenzhuxian_recharge = 58,--破阵诛仙累充 } --活动结束需要处理面板关闭类型 diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index fdb0c75679..abcf9ec3ee 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -157,6 +157,7 @@ ConfigName = { RaceTowerConfig = "RaceTowerConfig", RaceTowerRewardConfig = "RaceTowerRewardConfig", HeroSacrifice = "HeroSacrifice", + ThemeActivityTaskConfig = "ThemeActivityTaskConfig", } require "Framework/GameDataBase" diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index 866b371422..7cd5e68aea 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -525,6 +525,8 @@ function this.RefreshActivityRedPoint() CheckRedPointStatus(RedPointType.FindFairy_OneView) CheckRedPointStatus(RedPointType.FindFairy_ThreeView) CheckRedPointStatus(RedPointType.FindFairy_FourView) + CheckRedPointStatus(RedPointType.pozhenzhuxianTask) + CheckRedPointStatus(RedPointType.QinglongSerectTreasure) end function this.GetContinuityRechargeRedPoint() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua index d707fb2931..76251fbfcc 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua @@ -13,15 +13,25 @@ local _PageInfo = {--后期可以做成tableInsert,icon名字都去读表 default = "q_qiankun_baoheanniu_02", lock = "q_qiankun_baoheanniu_02", select = "q_qiankun_baoheanniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, }, - [3] = { --珍奇礼包 + [3] = { --破阵诛仙 + default = "p_pozhengzhuxian_anniu_02", lock = "p_pozhengzhuxian_anniu_02", select = "p_pozhengzhuxian_anniu_01", + rpType = RedPointType.pozhenzhuxianTask,panelType = PanelType.QianKunBox, + }, + [4] = { --珍奇礼包 default = "z_zhenqibaoge_anniu_02", lock = "z_zhenqibaoge_anniu_02", select = "z_zhenqibaoge_anniu_01", rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, + }, + [5] = { --累计充值 + default = "r_huodong_leijichengzhianniu_01", lock = "r_huodong_leijichengzhianniu_01", select = "r_huodong_leijichengzhianniu", + rpType = RedPointType.QianKunBox,panelType = PanelType.QianKunBox, } } local TimeLimitedCall = require("Modules/Operating/TimeLimitedCall") local QianKunBox = require("Modules/Operating/QianKunBox") +local PoZhenZhuXianPage=require("Modules/Operating/PoZhenZhuXianPage") local ZhenQiYiBaoPage=require("Modules/Operating/ZhenQiYiBaoPage") +local LeiJiChongZhiPage=require("Modules/Operating/LeiJiChongZhiPage") --初始化组件(用于子类重写) function DynamicActivityPanel:InitComponent() orginLayer = 0 @@ -32,7 +42,8 @@ function DynamicActivityPanel:InitComponent() this.PageList = { [1] = TimeLimitedCall.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_1")), [2] = QianKunBox.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_2")), - [3] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), + [3] = PoZhenZhuXianPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_3")), + [4] = ZhenQiYiBaoPage.new(self, Util.GetGameObject(self.transform, "bg/pageContent/page_4")), } -- 上部货币显示 @@ -102,7 +113,7 @@ function this.PageTabIsLockCheck(index) end -- tab改变事件 -function this.OnPageTabChange(index, lastIndex) +function this.OnPageTabChange(index) this._CurPageIndex = index for i = 1, #this.PageList do if this.PageList[i] then @@ -111,7 +122,7 @@ function this.OnPageTabChange(index, lastIndex) end end - this.PageList[index]:OnShow(this.sortingOrder, _PageInfo[index].params and unpack(_PageInfo[index].params) or nil) + this.PageList[index]:OnShow(this.sortingOrder,this) this.PageList[index].gameObject:SetActive(true) this.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = _PageInfo[index].panelType }) end diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua deleted file mode 100644 index 27db687e61..0000000000 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua +++ /dev/null @@ -1,47 +0,0 @@ -local PoZhenZhuXian = quick_class("PoZhenZhuXian") -local orginLayer = 0 - -function PoZhenZhuXian:ctor(mainPanel, gameObject) - self.mainPanel = mainPanel.transform - self.gameObject = gameObject - self:InitComponent(gameObject) - self:BindEvent() -end - -function PoZhenZhuXian:InitComponent(gameObject) - -end - -function PoZhenZhuXian:BindEvent() - -end - -function PoZhenZhuXian:OnShow(sortingOrder) - -end - - - ---- 将一段时间转换为天时分秒 -function PoZhenZhuXian:TimeToDHMS(second) - local day = math.floor(second / (24 * 3600)) - local minute = math.floor(second / 60) % 60 - local sec = second % 60 - local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) - if day <= 0 and hour <= 0 then - return string.format(Language[12231],minute, sec) - else - return string.format(Language[12232],day, hour) - end -end - - -function PoZhenZhuXian:OnSortingOrderChange(_sortingOrder) - orginLayer = _sortingOrder -end - -function PoZhenZhuXian:OnHide() - -end - -return PoZhenZhuXian \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua index 3fe62d71d0..cbea0e6be7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua @@ -164,18 +164,15 @@ local type={ } --单个任务 function this:SingleTask(go, rewardSingleData) - local activityRewardGo = go + local activityRewardGo = go activityRewardGo:SetActive(true) local sConFigData = rewardSingleData + local strs = string.split(sConFigData.show) local titleText = Util.GetGameObject(activityRewardGo, "content"):GetComponent("Text") - titleText.text = sConFigData.show - local rewardText = Util.GetGameObject(activityRewardGo, "reward"):GetComponent("Text") - rewardText.text = sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次" - local getRewardProgress = Util.GetGameObject(activityRewardGo.gameObject, "getRewardProgress"):GetComponent("Text") - local state = sConFigData.state local value = sConFigData.taskValue[2][1] - getRewardProgress.gameObject:SetActive(state == 0) - getRewardProgress.text ="("..(math.abs(sConFigData.progress) > math.abs(value) and math.abs(value) or math.abs(sConFigData.progress)) .."/"..math.abs(value)..")" + titleText.text = strs[1].."("..(math.abs(sConFigData.progress) > math.abs(value) and math.abs(value) or math.abs(sConFigData.progress)) .."/"..math.abs(value)..")" + local rewardText = Util.GetGameObject(activityRewardGo, "reward"):GetComponent("Text") + rewardText.text = strs[2]..sConFigData.integral[1][2]..itemConfig[tonumber(sConFigData.integral[1][1])].Name .."/次" local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "lingquButton") local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") diff --git a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua index 0c677b2337..40b84763c9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Mission/QinglongSerectTreasureManager.lua @@ -9,10 +9,18 @@ this.score = 0 this.traiWeekTime = 0 local level = 0 function this.Initialize() +end + +function this.InitializeData() rewardData = {} taskData = {} this.scoreId = TreasureSunlongConfig[1].Integral[1][1] - for i, v in ConfigPairs(TreasureSunlongConfig) do + local id = ActivityGiftManager.GetActivityIdByType(8) + if not ActivityGiftManager.GetActivityOpenStatus(id) then + return + end + local treasureSunlongConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.TreasureSunlongConfig,"ActivityId",id) + for i, v in ConfigPairs(treasureSunlongConfig) do rewardData[v.Level] = {} rewardData[v.Level].level = v.Level if v.Integral then @@ -34,7 +42,8 @@ function this.Initialize() end rewardData[v.Level].Reward = temp end - for i, v in ConfigPairs(TreasureSunLongTaskConfig) do + local treasureSunlongtaskConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.TreasureSunLongTaskConfig,"ActivityId",id) + for i, v in ConfigPairs(treasureSunlongtaskConfig) do if not taskData[v.Type] then taskData[v.Type] = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua new file mode 100644 index 0000000000..f27cd9fc72 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua @@ -0,0 +1,203 @@ +local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage") +local allData={} +local itemsGrid = {}--item重复利用 +local singleTaskPre = {} +local this=PoZhenZhuXianPage +local parent +local endtime = 0 +function PoZhenZhuXianPage:ctor(mainPanel, gameObject) + self.mainPanel = mainPanel + self.gameObject = gameObject + self:InitComponent(gameObject) + self:BindEvent() +end + +function PoZhenZhuXianPage:InitComponent(gameObject) + this.time = Util.GetGameObject(gameObject, "content/tiao/time") + this.itemPre = Util.GetGameObject(gameObject, "content/ItemPre") + this.scrollItem = Util.GetGameObject(gameObject, "content/grid") + local rootHight = this.scrollItem.transform.rect.height + local width = this.scrollItem.transform.rect.width + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, + this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30)) + this.ScrollView.moveTween.MomentumAmount = 1 + this.ScrollView.moveTween.Strength = 2 +end + +--绑定事件(用于子类重写) +function PoZhenZhuXianPage:BindEvent() +end + +--添加事件监听(用于子类重写) +function PoZhenZhuXianPage:AddListener() +end + +--移除事件监听(用于子类重写) +function PoZhenZhuXianPage:RemoveListener() +end +local sortingOrder = 0 +--界面打开时调用(用于子类重写) +function PoZhenZhuXianPage:OnOpen() + +end + +--界面打开或者重新打开后,界面刷新时调用(用于子类重写) +function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent) + sortingOrder = _sortingOrder + parent = _parent + this:OnShowData() +end + +function this.Refresh() + this:OnShowData() + this:SetTime() +end + +function PoZhenZhuXianPage:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + self.timer = Timer.New(function() + local timeDown + for i = 1,#allData do + if allData[i].type == 1 then + timeDown = CalculateSecondsNowTo_N_OClock(5) + singleTaskPre[allData[i].id].text = "剩余:"..TimeToHMS(timeDown) + else + timeDown = endtime - GetTimeStamp() + singleTaskPre[allData[i].id].text = "剩余:"..TimeToDHMS(timeDown) + end + if timeDown < 1 then + this.Refresh() + return + end + end + timeDown = endtime - GetTimeStamp() + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + end, 1, -1, true) + self.timer:Start() +end + +function PoZhenZhuXianPage:OnShowData() + allData = OperatingManager:InitPoZhenZhuXianData() + if allData then + endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task) + this.SortData(allData) + this.ScrollView:SetData(allData, function (index, go) + this.SingleDataShow(go, allData[index]) + singleTaskPre[allData[index].id] = Util.GetGameObject(go,"btn/Text"):GetComponent("Text") + end) + LogError(#allData) + else + parent.OnPageTabChange(1) + PopupTipPanel.ShowTip("活动已结束") + return + end + +end +function PoZhenZhuXianPage:SortData() + if allData==nil then + return + end + table.sort(allData, function(a,b) + if a.type == b.type then + return a.id < b.id + else + return a.type < b.type + end + end) +end +local type={ + [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, + [1]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, + [2]={sprite = "s_slbz_1anniuongse",text = "领取"}, +} +--刷新每一条的显示数据 +function this.SingleDataShow(pre,value) + if pre==nil or value==nil then + return + end + --绑定组件 + local activityRewardGo = pre + activityRewardGo:SetActive(true) + local sConFigData = value + + local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text") + titleText.text = sConFigData.title + local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") + missionText.text = sConFigData.content.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + + local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward") + if (not itemsGrid) then + itemsGrid = {} + end + if not itemsGrid[pre] then + itemsGrid[pre] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) + end + itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false) + + local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn") + local state = sConFigData.state == 1 and sConFigData.state or (sConFigData.progress >= sConFigData.value and 2 or 0) -- 0 前往 1已领奖 2领奖 + + local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") + red:SetActive(state == 2) + + Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text + Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) + Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 1) + Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 1) + + Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function() + if state == 2 then + local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) + NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(respond) + UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1) + this.Refresh() + end) + elseif state == 0 then + if sConFigData.jump then + JumpManager.GoJump(sConFigData.jump[1]) + end + end + end) + +end + +--界面打开时调用(用于子类重写) +function PoZhenZhuXianPage:OnOpen() + +end + +function this.RechargeSuccessFunc(id) + FirstRechargeManager.RefreshAccumRechargeValue(id) + --OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id) + this.OnShowData() +end + +function PoZhenZhuXianPage:OnClose() + +end + +--界面销毁时调用(用于子类重写) +function PoZhenZhuXianPage:OnDestroy() + sortingOrder = 0 +end + +function PoZhenZhuXianPage:OnHide() + sortingOrder = 0 +end +--- 将一段时间转换为天时分秒 +function PoZhenZhuXian:TimeToDHMS(second) + local day = math.floor(second / (24 * 3600)) + local minute = math.floor(second / 60) % 60 + local sec = second % 60 + local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) + if day <= 0 and hour <= 0 then + return string.format(Language[12231],minute, sec) + else + return string.format(Language[12232],day, hour) + end +end + +return PoZhenZhuXianPage \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua.meta b/Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua.meta similarity index 74% rename from Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua.meta rename to Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua.meta index c028e864e4..6bd0fc58b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXian.lua.meta +++ b/Assets/ManagedResources/~Lua/Modules/Operating/LeiJiChongZhiPage.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 71ef8224a4ad0ee4f85cab8503089428 +guid: 4ae960ba920800d4f9d661a3fb195040 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 1419d7ae74..78b558fa64 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -722,4 +722,47 @@ function this.GetQiankunBoxRedPointStatus() end this.TimeLimitedTimes = 0 +this.allData = {} +function this.InitPoZhenZhuXianData() + local id = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) + if not ActivityGiftManager.IsActivityTypeOpen(id) then + return nil + end + this.allData = {} + local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ThemeActivityTaskConfig, "ActivityId", id) + local allMissionData = ActivityGiftManager.GetActivityTypeInfo(id).mission + for i=1,#allListData do + for j=1,#allMissionData do + if allListData[i].Id == allMissionData[j].missionId then + local data = {} + data.id = allMissionData[j].missionId + data.progress = allMissionData[j].progress + data.state = allMissionData[j].state + data.type = allListData[i].Type + local strs = string.split(allListData[i].Show,"#") + data.title = strs[1] + data.content = strs[2] + data.value = allListData[i].TaskValue[2][1] + data.reward = {allListData[i].Integral[1][1],allListData[i].Integral[1][2]} + data.jump = allListData[i].Jump[1] + table.insert(this.allData,data) + end + end + end + return this.allData +end +function this.CheckPoZhenZhuXianTaskRed() + this.InitPoZhenZhuXianData() + if not this.allData then + return false + end + for i=1,#this.allData do + if this.allData[i].state == 0 and + this.allData[i].progress >= this.allData[i].value + then + return true + end + end + return false +end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua new file mode 100644 index 0000000000..1c018ca294 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua @@ -0,0 +1,206 @@ +local PoZhenZhuXianPage = quick_class("PoZhenZhuXianPage") +local allData={} +local itemsGrid = {}--item重复利用 +local singleTaskPre = {} +local this=PoZhenZhuXianPage +local parent +local endtime = 0 +local activityType = { + [1] = {name = "破阵诛仙", bg = "p_pozhengzhuxian_tu",pre = "prefab1"} +} +function PoZhenZhuXianPage:ctor(mainPanel, gameObject) + self.mainPanel = mainPanel + self.gameObject = gameObject + self:InitComponent(gameObject) + self:BindEvent() +end + +function PoZhenZhuXianPage:InitComponent(gameObject) + this.time = Util.GetGameObject(gameObject, "content/tiao/time") + this.itemPre = Util.GetGameObject(gameObject, "content/ItemPre") + this.scrollItem = Util.GetGameObject(gameObject, "content/grid") + local rootHight = this.scrollItem.transform.rect.height + local width = this.scrollItem.transform.rect.width + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, + this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30)) + this.ScrollView.moveTween.MomentumAmount = 1 + this.ScrollView.moveTween.Strength = 2 +end + +--绑定事件(用于子类重写) +function PoZhenZhuXianPage:BindEvent() +end + +--添加事件监听(用于子类重写) +function PoZhenZhuXianPage:AddListener() +end + +--移除事件监听(用于子类重写) +function PoZhenZhuXianPage:RemoveListener() +end +local sortingOrder = 0 +--界面打开时调用(用于子类重写) +function PoZhenZhuXianPage:OnOpen() + +end + +--界面打开或者重新打开后,界面刷新时调用(用于子类重写) +function PoZhenZhuXianPage:OnShow(_sortingOrder,_parent) + sortingOrder = _sortingOrder + parent = _parent + this:OnShowData() +end + +function this.Refresh() + this:OnShowData() + this:SetTime() +end + +function PoZhenZhuXianPage:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + self.timer = Timer.New(function() + local timeDown + for i = 1,#allData do + if allData[i].type == 1 then + timeDown = CalculateSecondsNowTo_N_OClock(5) + singleTaskPre[allData[i].id].text = "剩余:"..TimeToHMS(timeDown) + else + timeDown = endtime - GetTimeStamp() + singleTaskPre[allData[i].id].text = "剩余:"..TimeToDHMS(timeDown) + end + if timeDown < 1 then + this.Refresh() + return + end + end + timeDown = endtime - GetTimeStamp() + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + end, 1, -1, true) + self.timer:Start() +end + +function PoZhenZhuXianPage:OnShowData() + allData = OperatingManager:InitPoZhenZhuXianData() + if allData then + endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task) + this.SortData(allData) + this.ScrollView:SetData(allData, function (index, go) + this.SingleDataShow(go, allData[index]) + singleTaskPre[allData[index].id] = Util.GetGameObject(go,"btn/Text"):GetComponent("Text") + end) + LogError(#allData) + else + parent.OnPageTabChange(1) + PopupTipPanel.ShowTip("活动已结束") + return + end + +end +function PoZhenZhuXianPage:SortData() + if allData==nil then + return + end + table.sort(allData, function(a,b) + if a.type == b.type then + return a.id < b.id + else + return a.type < b.type + end + end) +end +local type={ + [0]={sprite = "s_slbz_1anniuhuangse",text = "前往"}, + [1]={sprite = "s_slbz_1anniuhuise",text = "已领取"}, + [2]={sprite = "s_slbz_1anniuongse",text = "领取"}, +} +--刷新每一条的显示数据 +function this.SingleDataShow(pre,value) + if pre==nil or value==nil then + return + end + --绑定组件 + local activityRewardGo = pre + activityRewardGo:SetActive(true) + local sConFigData = value + + local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text") + titleText.text = sConFigData.title + local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") + missionText.text = sConFigData.content.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + + local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward") + if (not itemsGrid) then + itemsGrid = {} + end + if not itemsGrid[pre] then + itemsGrid[pre] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) + end + itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false) + + local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn") + local state = sConFigData.state == 1 and sConFigData.state or (sConFigData.progress >= sConFigData.value and 2 or 0) -- 0 前往 1已领奖 2领奖 + + local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") + red:SetActive(state == 2) + + Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text + Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) + Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 1) + Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 1) + + Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function() + if state == 2 then + local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) + NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(respond) + UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1) + this.Refresh() + end) + elseif state == 0 then + if sConFigData.jump then + JumpManager.GoJump(sConFigData.jump[1]) + end + end + end) + +end + +--界面打开时调用(用于子类重写) +function PoZhenZhuXianPage:OnOpen() + +end + +function this.RechargeSuccessFunc(id) + FirstRechargeManager.RefreshAccumRechargeValue(id) + --OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id) + this.OnShowData() +end + +function PoZhenZhuXianPage:OnClose() + +end + +--界面销毁时调用(用于子类重写) +function PoZhenZhuXianPage:OnDestroy() + sortingOrder = 0 +end + +function PoZhenZhuXianPage:OnHide() + sortingOrder = 0 +end +--- 将一段时间转换为天时分秒 +function PoZhenZhuXian:TimeToDHMS(second) + local day = math.floor(second / (24 * 3600)) + local minute = math.floor(second / 60) % 60 + local sec = second % 60 + local hour = math.floor(math.floor(second - day * 24 * 3600 - sec - minute * 60) / 3600) + if day <= 0 and hour <= 0 then + return string.format(Language[12231],minute, sec) + else + return string.format(Language[12232],day, hour) + end +end + +return PoZhenZhuXianPage \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua.meta b/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua.meta new file mode 100644 index 0000000000..87e4a9e86e --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Operating/PoZhenZhuXianPage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ede56a3b826abb74e8174170ff538788 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 969e53778d..514d44d160 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -181,6 +181,7 @@ function this.InitRedPointAllRelate() --(24暂时关闭)放开这里就行 RPData:SetParent(RedPointType.TimeLimited, RedPointType.DynamicActivity) RPData:SetParent(RedPointType.QianKunBox, RedPointType.DynamicActivity) + RPData:SetParent(RedPointType.pozhenzhuxianTask, RedPointType.DynamicActivity) -- 好友红点 RPData:SetParent(RedPointType.Friend_Reward, RedPointType.Friend) @@ -385,7 +386,8 @@ function this.RegisterRedCheckFunc() --限时招募 RPData:AddCheckFunc(RedPointType.TimeLimited,OperatingManager.GetTimeLimitRedPointStatus) RPData:AddCheckFunc(RedPointType.QianKunBox,OperatingManager.GetQiankunBoxRedPointStatus) - + RPData:SetParent(RedPointType.pozhenzhuxianTask, OperatingManager.CheckPoZhenZhuXianTaskRed) + RPData:AddCheckFunc(RedPointType.OrdinaryExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.EXPEDITION) RPData:AddCheckFunc(RedPointType.HeroExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN) RPData:AddCheckFunc(RedPointType.EpicExplore, CarbonManager.CarbonRedCheck,FUNCTION_OPEN_TYPE.MONSTER_COMING) diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 7bc88fb800..48aa0d878d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -237,6 +237,7 @@ function this.ChangeVipRedPointState() CheckRedPointStatus(RedPointType.TreasureOfSl) CheckRedPointStatus(RedPointType.SevenDayCarnival) CheckRedPointStatus(RedPointType.Achievement_Main) + CheckRedPointStatus(RedPointType.QinglongSerectTreasureTrail) --CheckRedPointStatus(RedPointType.Achievement_One) --CheckRedPointStatus(RedPointType.Achievement_Two) --CheckRedPointStatus(RedPointType.Achievement_Three) diff --git a/data_execl/base_data/ActivityRewardConfig.xlsx b/data_execl/base_data/ActivityRewardConfig.xlsx index ee920244e4..ca7dbbad92 100644 Binary files a/data_execl/base_data/ActivityRewardConfig.xlsx and b/data_execl/base_data/ActivityRewardConfig.xlsx differ diff --git a/data_execl/base_data/ArtResourcesConfig.xlsx b/data_execl/base_data/ArtResourcesConfig.xlsx index 102c526ed8..b1c1d86828 100644 Binary files a/data_execl/base_data/ArtResourcesConfig.xlsx and b/data_execl/base_data/ArtResourcesConfig.xlsx differ diff --git a/data_execl/base_data/CombatControl.xlsx b/data_execl/base_data/CombatControl.xlsx index 271a688531..dbd6b0f4d1 100644 Binary files a/data_execl/base_data/CombatControl.xlsx and b/data_execl/base_data/CombatControl.xlsx differ diff --git a/data_execl/base_data/EndlessDifficulty.xlsx b/data_execl/base_data/EndlessDifficulty.xlsx index 22ca7bb5e5..200ecd878e 100644 Binary files a/data_execl/base_data/EndlessDifficulty.xlsx and b/data_execl/base_data/EndlessDifficulty.xlsx differ diff --git a/data_execl/base_data/EndlessMapConfig.xlsx b/data_execl/base_data/EndlessMapConfig.xlsx index 148f00ac43..d40b1b663b 100644 Binary files a/data_execl/base_data/EndlessMapConfig.xlsx and b/data_execl/base_data/EndlessMapConfig.xlsx differ diff --git a/data_execl/base_data/GlobalSystemConfig.xlsx b/data_execl/base_data/GlobalSystemConfig.xlsx index e7d20f465f..db524b3728 100644 Binary files a/data_execl/base_data/GlobalSystemConfig.xlsx and b/data_execl/base_data/GlobalSystemConfig.xlsx differ diff --git a/data_execl/base_data/MapPointConfig.xlsx b/data_execl/base_data/MapPointConfig.xlsx index 5ad6ce2e0a..a66af157e6 100644 Binary files a/data_execl/base_data/MapPointConfig.xlsx and b/data_execl/base_data/MapPointConfig.xlsx differ diff --git a/data_execl/base_data/MonsterConfig.xlsx b/data_execl/base_data/MonsterConfig.xlsx index 2fbc3bf6f4..a6bfd890a9 100644 Binary files a/data_execl/base_data/MonsterConfig.xlsx and b/data_execl/base_data/MonsterConfig.xlsx differ diff --git a/data_execl/base_data/PassiveSkillLogicConfig.xlsx b/data_execl/base_data/PassiveSkillLogicConfig.xlsx index 89136da42d..aab2cc2a41 100644 Binary files a/data_execl/base_data/PassiveSkillLogicConfig.xlsx and b/data_execl/base_data/PassiveSkillLogicConfig.xlsx differ diff --git a/data_execl/base_data/PrivilegeTypeConfig.xlsx b/data_execl/base_data/PrivilegeTypeConfig.xlsx index ba5aae8998..5b2755e675 100644 Binary files a/data_execl/base_data/PrivilegeTypeConfig.xlsx and b/data_execl/base_data/PrivilegeTypeConfig.xlsx differ diff --git a/data_execl/base_data/RewardGroup.xlsx b/data_execl/base_data/RewardGroup.xlsx index bf22206e99..43136ec780 100644 Binary files a/data_execl/base_data/RewardGroup.xlsx and b/data_execl/base_data/RewardGroup.xlsx differ diff --git a/data_execl/base_data/RewardItemConfig.xlsx b/data_execl/base_data/RewardItemConfig.xlsx index 1b0f3b016c..6b5137ea96 100644 Binary files a/data_execl/base_data/RewardItemConfig.xlsx and b/data_execl/base_data/RewardItemConfig.xlsx differ diff --git a/data_execl/base_data/SkillConfig.xlsx b/data_execl/base_data/SkillConfig.xlsx index 00ecebb16d..805624477b 100644 Binary files a/data_execl/base_data/SkillConfig.xlsx and b/data_execl/base_data/SkillConfig.xlsx differ diff --git a/data_execl/base_data/SkillLogicConfig.xlsx b/data_execl/base_data/SkillLogicConfig.xlsx index f39b6c2e0a..0e8da6b030 100644 Binary files a/data_execl/base_data/SkillLogicConfig.xlsx and b/data_execl/base_data/SkillLogicConfig.xlsx differ diff --git a/data_execl/base_data/SpecialConfig.xlsx b/data_execl/base_data/SpecialConfig.xlsx index 1075f7e5ad..edcfe07a10 100644 Binary files a/data_execl/base_data/SpecialConfig.xlsx and b/data_execl/base_data/SpecialConfig.xlsx differ diff --git a/data_execl/base_data/StoreConfig.xlsx b/data_execl/base_data/StoreConfig.xlsx index 1e6c925ab4..483808d6ca 100644 Binary files a/data_execl/base_data/StoreConfig.xlsx and b/data_execl/base_data/StoreConfig.xlsx differ diff --git a/data_execl/base_data/ThemeActivityTaskConfig.xlsx b/data_execl/base_data/ThemeActivityTaskConfig.xlsx new file mode 100644 index 0000000000..4349eaec2a Binary files /dev/null and b/data_execl/base_data/ThemeActivityTaskConfig.xlsx differ