From 2051a59d74960e407dc2994846b3f99f0bbb89dd Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Tue, 20 Apr 2021 16:43:16 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BE=BE=E4=BA=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E3=80=91=E7=BB=93=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/ExpertPage.prefab | 1170 +++++++++++++++++ .../UI/NewActivity/ExpertPage.prefab.meta | 7 + .../Prefabs/UI/NewActivity/ExpertPre.prefab | 762 +++++++++++ .../UI/NewActivity/ExpertPre.prefab.meta | 7 + .../ResConfigs/ResourcePathConfig.asset | 14 + Assets/ManagedResources/~Lua/Data/UIData.lua | 8 +- .../ActivityGift/ActivityGiftManager.lua | 8 +- .../~Lua/Modules/Expert/ExpertPanel.lua | 10 +- .../Modules/Expert/ExpertRewardSortPanel.lua | 46 +- .../Modules/NewActivity/CommonActPage.lua | 2 +- .../NewActivity/CommonActPageManager.lua | 8 +- .../~Lua/Modules/NewActivity/ExpertPage.lua | 179 +++ .../Modules/NewActivity/ExpertPage.lua.meta | 7 + .../~Lua/Modules/NewActivity/ExpertPre.lua | 104 ++ .../Modules/NewActivity/ExpertPre.lua.meta | 7 + 15 files changed, 2306 insertions(+), 33 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab.meta create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab new file mode 100644 index 0000000000..6a3fe7dce7 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab @@ -0,0 +1,1170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &716759979748813621 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1159716422251647595} + - component: {fileID: 1593187720269143935} + - component: {fileID: 1080504097450626878} + - component: {fileID: 942221934926451937} + - component: {fileID: 7610176009614768944} + m_Layer: 5 + m_Name: rewardBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1159716422251647595 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716759979748813621} + 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: 8494200122882599417} + 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: 267.59998, y: 557.7} + m_SizeDelta: {x: 126, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1593187720269143935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716759979748813621} + m_CullTransparentMesh: 0 +--- !u!114 &1080504097450626878 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716759979748813621} + 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: 56e562f2e809ff74f93897fff77286b0, 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 &942221934926451937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716759979748813621} + 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: 1080504097450626878} + 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 &7610176009614768944 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 716759979748813621} + 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 &2055040477910712794 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6741844964518693350} + m_Layer: 0 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6741844964518693350 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055040477910712794} + 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: 1055293186105187635} + m_Father: {fileID: 8494200122882599417} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 463.4} + m_SizeDelta: {x: 750, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &2109681501757712774 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3552499975457512367} + - component: {fileID: 8654007591988496273} + - component: {fileID: 975439218201850160} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3552499975457512367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109681501757712774} + 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: 984156290069449932} + 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: 707.83, y: -322} + m_SizeDelta: {x: 594.2, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8654007591988496273 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109681501757712774} + m_CullTransparentMesh: 0 +--- !u!114 &975439218201850160 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2109681501757712774} + 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.827451, b: 0.4627451, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 33 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: +--- !u!1 &3509626439992055712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 984156290069449932} + - component: {fileID: 7798801616929473648} + - component: {fileID: 8958523705180314290} + m_Layer: 5 + m_Name: titleBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &984156290069449932 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3509626439992055712} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -26.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 3552499975457512367} + m_Father: {fileID: 2542118471955123022} + 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: -232} + m_SizeDelta: {x: 1080, y: 464} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7798801616929473648 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3509626439992055712} + m_CullTransparentMesh: 0 +--- !u!114 &8958523705180314290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3509626439992055712} + 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: 3c451fed976a89c4c91f3f4a360fdab4, 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 &3873829242199517486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5942445283497050053} + - component: {fileID: 2140230912105837037} + - component: {fileID: 4111546834144432572} + - component: {fileID: 5636815689349370290} + - component: {fileID: 6700216479021505329} + m_Layer: 5 + m_Name: sortBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5942445283497050053 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873829242199517486} + 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: 8494200122882599417} + 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: 402, y: 557} + m_SizeDelta: {x: 126, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2140230912105837037 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873829242199517486} + m_CullTransparentMesh: 0 +--- !u!114 &4111546834144432572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873829242199517486} + 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: 0ae4375e796ee934997142d1bb379d5d, 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 &5636815689349370290 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873829242199517486} + 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: 4111546834144432572} + 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 &6700216479021505329 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3873829242199517486} + 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 &4035918254496712932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7723633687713070159} + - component: {fileID: 8105143636469967474} + - component: {fileID: 6677158442781005092} + m_Layer: 0 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7723633687713070159 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035918254496712932} + 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: 2171467667125433924} + 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: 68, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8105143636469967474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035918254496712932} + m_CullTransparentMesh: 0 +--- !u!114 &6677158442781005092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4035918254496712932} + 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: 47b0d71d3c8ef79468a5fb4d8ec5f365, 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 &4393458997674895721 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1055293186105187635} + - component: {fileID: 4227792808359262645} + - component: {fileID: 2081415492951086377} + m_Layer: 5 + m_Name: timeText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1055293186105187635 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393458997674895721} + 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: 6741844964518693350} + 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 &4227792808359262645 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393458997674895721} + m_CullTransparentMesh: 0 +--- !u!114 &2081415492951086377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4393458997674895721} + 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.909804, g: 0.70980394, b: 0.27450982, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 6fa15837529b0e640af6620b07d3207d, type: 3} + m_FontSize: 30 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\u65F6\u95F4\uFF1A6\u592923\u5C0F\u65F6" + LanguageIndex: 10426 +--- !u!1 &5061917347505177784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2171467667125433924} + - component: {fileID: 2782126524726940666} + - component: {fileID: 8138082417560812891} + - component: {fileID: 2666296788951749844} + - component: {fileID: 8759498638546517333} + m_Layer: 0 + m_Name: helpBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2171467667125433924 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061917347505177784} + 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: 7723633687713070159} + m_Father: {fileID: 8494200122882599417} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -122, y: -102} + m_SizeDelta: {x: 110, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2782126524726940666 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061917347505177784} + m_CullTransparentMesh: 0 +--- !u!114 &8138082417560812891 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061917347505177784} + 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: 2666296788951749844} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &2666296788951749844 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061917347505177784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!95 &8759498638546517333 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5061917347505177784} + 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 &5546113106694008022 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 908440470530249504} + - component: {fileID: 796442575299055910} + - component: {fileID: 2814855105543739999} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &908440470530249504 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5546113106694008022} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -26.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2542118471955123022} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -203.4} + m_SizeDelta: {x: 1080, y: 1678.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &796442575299055910 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5546113106694008022} + m_CullTransparentMesh: 0 +--- !u!114 &2814855105543739999 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5546113106694008022} + 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: 5d9f6e48de1533d4db7d330bdb11e861, 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 &5611855462079955669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2941308413635457260} + - component: {fileID: 2831968414924170811} + - component: {fileID: 3157126341780002912} + m_Layer: 0 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2941308413635457260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611855462079955669} + 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: 8494200122882599417} + 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: 427.3} + m_SizeDelta: {x: 838.1, y: 1216.7} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &2831968414924170811 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611855462079955669} + m_CullTransparentMesh: 0 +--- !u!114 &3157126341780002912 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5611855462079955669} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &7136434605234987920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2494416448225732453} + - component: {fileID: 67067847969484020} + - component: {fileID: 8923470446825177287} + m_Layer: 5 + m_Name: bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2494416448225732453 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7136434605234987920} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -26.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2542118471955123022} + 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.00085831, y: -188.8} + m_SizeDelta: {x: 929.86, y: 1368.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &67067847969484020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7136434605234987920} + m_CullTransparentMesh: 0 +--- !u!114 &8923470446825177287 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7136434605234987920} + 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: 1410c5d21cdab554c82c0fc2eec0f542, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &7801355259236668509 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2542118471955123022} + m_Layer: 0 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2542118471955123022 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7801355259236668509} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 26.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 984156290069449932} + - {fileID: 908440470530249504} + - {fileID: 2494416448225732453} + - {fileID: 1898452653011862347} + m_Father: {fileID: 8494200122882599417} + 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!1 &7818758285897919493 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1898452653011862347} + - component: {fileID: 5129970432395700810} + - component: {fileID: 7850127287368885795} + 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 &1898452653011862347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818758285897919493} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -26.25} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2542118471955123022} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: -0.73242027, y: 167} + m_SizeDelta: {x: 920, y: 8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5129970432395700810 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818758285897919493} + m_CullTransparentMesh: 0 +--- !u!114 &7850127287368885795 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7818758285897919493} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19d5542f3ad36154883cfc2022d17e0a, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &8494200122882599416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8494200122882599417} + - component: {fileID: 8494200122882599418} + m_Layer: 5 + m_Name: ExpertPage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8494200122882599417 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8494200122882599416} + 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: 2542118471955123022} + - {fileID: 6741844964518693350} + - {fileID: 2941308413635457260} + - {fileID: 1159716422251647595} + - {fileID: 5942445283497050053} + - {fileID: 2171467667125433924} + - {fileID: 6798898073330534526} + m_Father: {fileID: 0} + 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 &8494200122882599418 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8494200122882599416} + m_CullTransparentMesh: 0 +--- !u!1 &8867717134409862128 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6798898073330534526} + m_Layer: 0 + m_Name: itemPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6798898073330534526 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8867717134409862128} + 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: 8494200122882599417} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0.000024796, y: 0} + m_SizeDelta: {x: 838.1, y: 224} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab.meta b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab.meta new file mode 100644 index 0000000000..60dfa61cc7 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 95cdb0996d5248e44bfdc2c596546102 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab new file mode 100644 index 0000000000..11270402e7 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab @@ -0,0 +1,762 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1549006157198916719 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 864523393550580880} + - component: {fileID: 7838690648709442926} + - component: {fileID: 8651670029375505506} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &864523393550580880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549006157198916719} + 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: 2165466795919167258} + 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 &7838690648709442926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549006157198916719} + m_CullTransparentMesh: 0 +--- !u!114 &8651670029375505506 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1549006157198916719} + 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.35686275, g: 0.15294118, b: 0.050980393, 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: 1 + m_MinSize: 26 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9886\u53D6" + LanguageIndex: 10002 +--- !u!1 &1939404528658276427 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7349404543774645814} + - component: {fileID: 99358092304302582} + - component: {fileID: 3365694092523730302} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7349404543774645814 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1939404528658276427} + 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: 2165466795919167258} + 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: 81.5, y: 20.7} + m_SizeDelta: {x: 26, y: 26} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &99358092304302582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1939404528658276427} + m_CullTransparentMesh: 0 +--- !u!114 &3365694092523730302 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1939404528658276427} + 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 &2411527205103599634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9182738892898068781} + - component: {fileID: 7678205112993488653} + - component: {fileID: 1359968433389671522} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9182738892898068781 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411527205103599634} + 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: 2703470731847473192} + m_Father: {fileID: 5820639653232517473} + 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: 838.1, y: 224} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7678205112993488653 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411527205103599634} + m_CullTransparentMesh: 0 +--- !u!114 &1359968433389671522 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2411527205103599634} + 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: 578016bcc0473ff47a2694b7d2c27b1e, 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 &2649623082079124918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2703470731847473192} + - component: {fileID: 4202156514750684070} + - component: {fileID: 4336039893520594747} + m_Layer: 5 + m_Name: titleImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2703470731847473192 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649623082079124918} + 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: 9182738892898068781} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 298, y: 65} + m_SizeDelta: {x: 558, y: 44} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4202156514750684070 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649623082079124918} + m_CullTransparentMesh: 0 +--- !u!114 &4336039893520594747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2649623082079124918} + 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 &4491850223724303603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6161670123727734889} + m_Layer: 5 + m_Name: Content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6161670123727734889 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4491850223724303603} + 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: 5896327427724209761} + - {fileID: 5498513991812064143} + - {fileID: 2165466795919167258} + - {fileID: 5308013875970898152} + m_Father: {fileID: 5820639653232517473} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 838.1, y: 224} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5694900419183561711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5896327427724209761} + - component: {fileID: 1228098965015867516} + - component: {fileID: 2073393997662108997} + m_Layer: 5 + m_Name: title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5896327427724209761 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5694900419183561711} + 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: 6161670123727734889} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 144, y: 63.5} + m_SizeDelta: {x: 242.11, y: 39.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1228098965015867516 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5694900419183561711} + m_CullTransparentMesh: 0 +--- !u!114 &2073393997662108997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5694900419183561711} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.9333334, b: 0.83921576, a: 0.816} + 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: 0 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u901A\u5173\u7B80\u5355\u7CBE\u82F1\u526F\u672C\u53E4\u5BFA\u7591\u4E91" + LanguageIndex: 10001 +--- !u!1 &5820639653232517472 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5820639653232517473} + - component: {fileID: 5820639653232517474} + m_Layer: 5 + m_Name: ExpertPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5820639653232517473 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5820639653232517472} + 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: 9182738892898068781} + - {fileID: 6161670123727734889} + m_Father: {fileID: 0} + 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 &5820639653232517474 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5820639653232517472} + m_CullTransparentMesh: 0 +--- !u!1 &7107648047540432899 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2165466795919167258} + - component: {fileID: 3663004555324990348} + - component: {fileID: 743448944178363822} + - component: {fileID: 24205555660950039} + - component: {fileID: 3936567853370022381} + m_Layer: 5 + m_Name: button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2165466795919167258 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7107648047540432899} + 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: 864523393550580880} + - {fileID: 7349404543774645814} + m_Father: {fileID: 6161670123727734889} + m_RootOrder: 2 + 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: -138, y: 1.0999985} + m_SizeDelta: {x: 210.65002, y: 77.61} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3663004555324990348 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7107648047540432899} + m_CullTransparentMesh: 0 +--- !u!114 &743448944178363822 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7107648047540432899} + 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: addacd5860691b74db509358d99a6dfb, 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 &24205555660950039 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7107648047540432899} + 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: 743448944178363822} + 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 &3936567853370022381 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7107648047540432899} + 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 &7194919749458299570 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5498513991812064143} + - component: {fileID: 6829468656616957310} + - component: {fileID: 3974543254435377592} + m_Layer: 5 + m_Name: scrollView + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5498513991812064143 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7194919749458299570} + 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: 6161670123727734889} + 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: -124.68, y: -24.035} + m_SizeDelta: {x: 542.84, y: 123} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6829468656616957310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7194919749458299570} + 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: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!114 &3974543254435377592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7194919749458299570} + 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!1 &8533741767898718104 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5308013875970898152} + - component: {fileID: 8161077092161086158} + - component: {fileID: 7894740051101763423} + m_Layer: 5 + m_Name: info + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5308013875970898152 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8533741767898718104} + 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: 6161670123727734889} + 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: 270, y: -64.50015} + m_SizeDelta: {x: 73.9, y: 42.04} + m_Pivot: {x: 0.36038244, y: 0.5} +--- !u!222 &8161077092161086158 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8533741767898718104} + m_CullTransparentMesh: 0 +--- !u!114 &7894740051101763423 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8533741767898718104} + 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.93333334, b: 0.8392157, a: 0.8156863} + 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: (7/7) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab.meta b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab.meta new file mode 100644 index 0000000000..49bc52294f --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExpertPre.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c04e10e68050cca4894288ba9fb4d2fd +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset index 6b076027d3..cc047e51a2 100644 --- a/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset +++ b/Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset @@ -53297,6 +53297,14 @@ MonoBehaviour: extension: .prefab resPathIndex: 504 resAbNameIndex: 3198 + - resName: ExpertPage + extension: .prefab + resPathIndex: 504 + resAbNameIndex: 3198 + - resName: ExpertPre + extension: .prefab + resPathIndex: 504 + resAbNameIndex: 3198 - resName: GiftPre extension: .prefab resPathIndex: 504 @@ -74723,17 +74731,23 @@ MonoBehaviour: - lz4/atlas/commonatlas.unity3d - lz4/atlas/guildatlas.unity3d - lz4/atlas/mainatlas.unity3d + - lz4/atlas/popupatlas.unity3d - lz4/atlas/publicatlas.unity3d - lz4/atlas/tagatlas.unity3d + - lz4/atlas/tagbuttonatlas.unity3d - lz4/atlas/workshopatlas.unity3d - lz4/bg/l_libao_beijin.unity3d + - lz4/bg/r_daren_dabei.unity3d - lz4/dynamicatlas/artfont/l_mrlb_banner_zh.unity3d + - lz4/dynamicatlas/artfont/r_daren_dianjing_zh.unity3d - lz4/dynamicatlas/l_mrlb_tiao_jpg.unity3d + - lz4/dynamicatlas/r_ymqf_dikuang.unity3d - lz4/dynamicatlas/s_shouchong_anniu.unity3d - lz4/effectresui/meirilibao.unity3d - lz4/effectresui/tiangongxunbao.unity3d - lz4/fonts/artfont_1.unity3d - lz4/fonts/fzjinls.unity3d + - lz4/fonts/kaiu.unity3d - lz4/icons.unity3d - lz4/publicartres/animations.unity3d - lz4/publicartres/materials.unity3d diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 97c0bf1417..8a3fe13717 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -415,8 +415,10 @@ SubUIConfig = { [4] = {name = "CumulativeSignInPage",assetName = "CumulativeSignInPage",script = "Modules/Operating/CumulativeSignInPage"}, [5] = {name = "MonthCardPage",assetName = "MonthCardPage",script = "Modules/Operating/MonthCardPage"}, [6] = {name = "GrowthGiftPage",assetName = "GrowthGiftPage",script = "Modules/Operating/GrowthGiftPage"}, - [7] = {name = "MissionPre",assetName = "MissionPre",script = "Modules/Operating/MissionPre"}, + [7] = {name = "MissionPre",assetName = "MissionPre",script = "Modules/Operating/MissionPre"},--一般任务单条预设 [8] = {name = "UppperMonthCard",assetName = "UppperMonthCard",script = "Modules/Operating/UppperMonthCard"}, - [9] = {name = "ItemUpstarPre",assetName = "ItemUpstarPre",script = "Modules/NewActivity/ItemUpstarPre"}, - [10] = {name = "CommonActPage",assetName = "CommonActPage",script = "Modules/NewActivity/CommonActPage"} + [9] = {name = "ItemUpstarPre",assetName = "ItemUpstarPre",script = "Modules/NewActivity/ItemUpstarPre"},--装备升星单条预设 + [10] = {name = "CommonActPage",assetName = "CommonActPage",script = "Modules/NewActivity/CommonActPage"},--活动界面预设 + [11] = {name = "ExpertPage",assetName = "ExpertPage",script = "Modules/NewActivity/ExpertPage"},--达人界面预设 + [12] = {name = "ExpertPre",assetName = "ExpertPre",script = "Modules/NewActivity/ExpertPre"},--达人单条预设 } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua index c0a325d848..f8242c1190 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/ActivityGiftManager.lua @@ -138,7 +138,13 @@ function this.InitActivityServerData(msg, isUpdate) this.CheckMoneyProgress(v) this.mission[v.activityId] = v - -- LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + if v.activityId == 2603 then + LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) + for n, m in ipairs(v.mission) do + LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) + end + end + LogYellow("刷新活动数据activityId:" .. v.activityId .. " value:" .. v.value) for n, m in ipairs(v.mission) do --LogGreen(" 刷新活动数据missionId:" .. m.missionId .. " state:" .. m.state .. " progress:" .. m.progress) if (v.activityId == ActivityTypeDef.OnlineGift) then diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua index 90c85b40ef..9ce89673f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertPanel.lua @@ -36,11 +36,11 @@ local allActivityNum = #imageSprite local tabBtns = {} local expertRedPointGrid = {}--红点 --local LuckyTurn = require("Modules/LuckyTurnTable/LuckyTurnTablePanel") -local SevenDayGift = require("Modules/ActivityGift/View/SevenDayGift") -local LuckyCat = require("Modules/LuckyCat/View/LuckyCat") -local WeekCard = require("Modules/Expert/WeekCard") -local PatFace = require("Modules/Expert/PatFace") -local DiffMonsterBuy = require("Modules/Expert/DiffMonsterBuy") +-- local SevenDayGift = require("Modules/ActivityGift/View/SevenDayGift") +-- local LuckyCat = require("Modules/LuckyCat/View/LuckyCat") +-- local WeekCard = require("Modules/Expert/WeekCard") +-- local PatFace = require("Modules/Expert/PatFace") +-- local DiffMonsterBuy = require("Modules/Expert/DiffMonsterBuy") local ExChange = require("Modules/Expert/ExChange") local Expert = require("Modules/Expert/Expert") -- local HeHeHe = require("Modules/Expert/HeroStarFeedPage") diff --git a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua index 53a9105ede..0e7f179e82 100644 --- a/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Expert/ExpertRewardSortPanel.lua @@ -160,27 +160,31 @@ function ExpertRewardSortPanel:ActivitySortRewardShow() self:ActivityRewardSingleShow(expertRewardSortTabs[i],rewardTabs[i]) end -- - if activeIndext == 13 then - RankingManager.InitData(rankKingList[5].rankType, function() - this.SetGoldExperSortInfo() - end,ActivityGiftManager.GetActivityIdByType(rankKingList[5].activiteId)) - elseif activeIndext == 10 then - RankingManager.InitData(rankKingList[7].rankType, function() - this.SetGoldExperSortInfo() - end,ActivityGiftManager.GetActivityIdByType(rankKingList[7].activiteId)) - elseif activeIndext == 19 then - RankingManager.InitData(rankKingList[9].rankType, function() - this.SetGoldExperSortInfo() - end,ActivityGiftManager.GetActivityIdByType(rankKingList[9].activiteId)) - elseif activeIndext == 26 then - RankingManager.InitData(rankKingList[10].rankType, function() - this.SetGoldExperSortInfo() - end,ActivityGiftManager.GetActivityIdByType(rankKingList[10].activiteId)) - elseif activeIndext == 27 then - RankingManager.InitData(rankKingList[12].rankType, function() - this.SetGoldExperSortInfo() - end,ActivityGiftManager.GetActivityIdByType(rankKingList[12].activiteId)) - end + -- if activeIndext == 13 then + -- RankingManager.InitData(rankKingList[5].rankType, function() + -- this.SetGoldExperSortInfo() + -- end,ActivityGiftManager.GetActivityIdByType(rankKingList[5].activiteId)) + -- elseif activeIndext == 10 then + -- RankingManager.InitData(rankKingList[7].rankType, function() + -- this.SetGoldExperSortInfo() + -- end,ActivityGiftManager.GetActivityIdByType(rankKingList[7].activiteId)) + -- elseif activeIndext == 19 then + -- RankingManager.InitData(rankKingList[9].rankType, function() + -- this.SetGoldExperSortInfo() + -- end,ActivityGiftManager.GetActivityIdByType(rankKingList[9].activiteId)) + -- elseif activeIndext == 26 then + -- RankingManager.InitData(rankKingList[10].rankType, function() + -- this.SetGoldExperSortInfo() + -- end,ActivityGiftManager.GetActivityIdByType(rankKingList[10].activiteId)) + -- elseif activeIndext == 27 then + -- RankingManager.InitData(rankKingList[12].rankType, function() + -- this.SetGoldExperSortInfo() + -- end,ActivityGiftManager.GetActivityIdByType(rankKingList[12].activiteId)) + -- end + LogGreen("activeIndext:"..tostring(activeIndext)) + RankingManager.InitData(rankKingList[activeIndext].rankType, function() + this.SetGoldExperSortInfo() + end,ActivityGiftManager.GetActivityIdByType(rankKingList[activeIndext].activiteId)) end function this.SetGoldExperSortInfo() local sortNumTabs = {} diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua index 145befade1..6cf39aa28f 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -100,7 +100,7 @@ function CommonActPage:RefreshActData(isTop,isAni) end,not isTop,not isAni) end -function CommonActPage:ShowSingleData(item,sdata,index)--云游商人 +function CommonActPage:ShowSingleData(item,sdata,index) if not self.ItemList then self.ItemList = {} end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 011694d2f4..14dfcefb1f 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -36,10 +36,14 @@ local TypeUpdateFunc = { function this.GetData(actType) if not dataList[actType] then dataList[actType] = this.InitSingleTypeData(actType) - TypeInitFunc[actType]() + if TypeInitFunc[actType] then + TypeInitFunc[actType]() + end end this.UpdateSingleTypeData(actType) - TypeUpdateFunc[actType]() + if TypeUpdateFunc[actType] then + TypeUpdateFunc[actType]() + end return dataList[actType] end diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua new file mode 100644 index 0000000000..d848705fde --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua @@ -0,0 +1,179 @@ +local ExpertPage = {} +function ExpertPage:New(gameObject) + local b = {} + b.gameObject = gameObject + b.transform = gameObject.transform + setmetatable(b, { __index = ExpertPage }) + return b +end + + +--添加事件监听(用于子类重写) +function ExpertPage:AddListener() + +end + +--移除事件监听(用于子类重写) +function ExpertPage:RemoveListener() + +end + + +function ExpertPage:InitComponent() + self.bg = Util.GetGameObject(self.gameObject, "Bg/titleBg"):GetComponent("Image") + self.scrollItem = Util.GetGameObject(self.gameObject, "Scroll") + self.time = Util.GetGameObject(self.gameObject, "time") + self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text") + self.btnHelp = Util.GetGameObject(self.gameObject, "helpBtn") + self.btnReward = Util.GetGameObject(self.gameObject, "rewardBtn") + self.btnSort = Util.GetGameObject(self.gameObject, "sortBtn") + self.helpPosition = self.btnHelp:GetComponent("RectTransform").localPosition + self.itemPre = Util.GetGameObject(self.gameObject, "itemPre") + -- 设置循环滚动,万一内容不停地加 + local rootHight = self.scrollItem.transform.rect.height + local width = self.scrollItem.transform.rect.width + self.scrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, self.scrollItem.transform, + self.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 0)) + self.scrollView.moveTween.MomentumAmount = 1 + self.scrollView.moveTween.Strength = 2 + self.sortingOrder = 0 + + self.ItemList = {} +end + +function ExpertPage:BindEvent() + Util.AddClick(self.btnHelp,function() + UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) + end) +end + +--界面打开时调用(用于子类重写) +function ExpertPage:OnOpen(_activityConfig,_index,parent) + self.actConfig = _activityConfig + self.pageIndex = _index + self.parent = parent + self.gameObject.name = "ExpertPage"..self.actConfig.Id +end + +-- 打开,重新打开时回调 +function ExpertPage:OnShow(_sortingOrder) + self.gameObject:SetActive(true) + self.sortingOrder = _sortingOrder or self.sortingOrder + self.actId = self.actConfig.ActId + self.actType = self.actConfig.ActiveType + if self.actConfig.IfBack == 1 then + if self.actConfig.ActiveType > 0 then + local id = ActivityGiftManager.IsActivityTypeOpen(self.actConfig.ActiveType) + if id and id > 0 then + self.actId = id + local config = ConfigManager.TryGetConfigDataByThreeKey(ConfigName.ActivityGroups,"PageType",self.actConfig.PageType,"ActiveType",self.actConfig.ActiveType,"ActId",id) + if config then + self.actConfig = config + end + else + LogRed("活动类型:"..tostring(self.actConfig.ActiveType).."的活动未开启") + end + end + end + if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then + self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3]) + end + if not self.actConfig.HelpId or self.actConfig.HelpId == "" or self.actConfig.HelpId == 0 then + self.btnHelp:SetActive(false) + else + self.btnHelp:SetActive(true) + end + --拿取数据 + self:RefreshData(true,true,true) + self:RefreshBtns()--刷新上方两个按钮 +end + +function ExpertPage:RefreshBtns() + if not self.actConfig.ShopData or self.actConfig.ShopData == "" then + self.btnSort:SetActive(false) + self.btnReward:SetActive(false) + else + self.btnSort:SetActive(true) + self.btnReward:SetActive(true) + Util.AddOnceClick(self.btnSort,function () + UIManager.OpenPanel(UIName.RankingSingleListPanel,rankKingList[self.actConfig.ShopData[1][1]]) + end) + Util.AddOnceClick(self.btnReward,function () + UIManager.OpenPanel(UIName.ExpertRewardSortPanel,self.ActData.activityId,2,self.actConfig.ShopData[1][1]) + end) + end +end + +--刷新数据 +function ExpertPage:RefreshData(isUpdata,isTop,isAni) + self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType) + if self.actConfig.RpType > 0 then + CheckRedPointStatus(self.actConfig.RpType) + end + self:RefreshActData(isTop,isAni) + self:RefreshTime() +end +--刷新活动数据 +function ExpertPage:RefreshActData(isTop,isAni) + self.scrollView:ForeachItemGO(function(index, go) + go.gameObject:SetActive(false) + end) + self.scrollView:SetData(self.ActData.rewards, function (index, item) + self:ShowSingleData(item, self.ActData.rewards[index],index) + end,not isTop,not isAni) +end + +function ExpertPage:ShowSingleData(item,sdata,index) + if not self.ItemList then + self.ItemList = {} + end + if not self.ItemList[item] then + local subConfig = SubUIConfig[self.actConfig.UIName[2]] + self.ItemList[item] = SubUIManager.Open(subConfig,item.transform) + end + if not sdata then + item.gameObject:SetActive(false) + return + end + item.gameObject:SetActive(true) + self.ItemList[item]:SetData(sdata,self,self.sortingOrder,self.ActData.activityId) +end + +function ExpertPage:RefreshTime() + if self.actConfig.ShowTime == 0 then + self.time:SetActive(false) + return + end + if self.localTimer then + self.localTimer:Stop() + self.localTimer = nil + end + self.time:SetActive(true) + local freshTime = self.ActData.endTime - GetTimeStamp() + self.timeText.text = Language[10023]..TimeToFelaxible(freshTime) + self.localTimer = Timer.New(function () + freshTime = freshTime - 1 + self.timeText.text = Language[10023]..TimeToFelaxible(freshTime) + if freshTime <= 0 then + self.parent:ClosePanel() + end + end, 1, -1, true) + self.localTimer:Start() +end + +function ExpertPage:OnClose() + self.gameObject:SetActive(false) +end + +function ExpertPage:OnDestroy() + for k,v in pairs(self.ItemList) do + SubUIManager.Close(v) + end + self.ItemList = {} + if self.scrollView then + SubUIManager.Close(self.scrollView) + end + self.scrollView=nil +end + +return ExpertPage \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua.meta b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua.meta new file mode 100644 index 0000000000..95afc1d2a2 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b469955891aa4bf4dbbc4abde7325676 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua new file mode 100644 index 0000000000..b6ee60b74e --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua @@ -0,0 +1,104 @@ +ExpertPre = {} +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +function ExpertPre:New(gameObject) + local b = {} + b.gameObject = gameObject + b.transform = gameObject.transform + setmetatable(b, { __index = ExpertPre }) + return b +end + +local BtnState = { + [0] = {Img = "s_slbz_1anniuongse", isRed = true, isGray = false, Text = Language[11948],}, + [1] = {Img = "s_slbz_1anniuhuangse", isRed = false, isGray = false, Text = Language[10556]}, + [2] = {Img = "s_slbz_1anniuongse", isRed = false, isGray = true, Text = Language[11948]}, +} + +--初始化组件(用于子类重写) +function ExpertPre:InitComponent() + self.title = Util.GetGameObject(self.gameObject,"Content/title"):GetComponent("Text") + self.info = Util.GetGameObject(self.gameObject,"Content/info"):GetComponent("Text") + self.grid = Util.GetGameObject(self.gameObject,"Content/scrollView") + self.btnGet = Util.GetGameObject(self.gameObject,"Content/button") + self.redPoint = Util.GetGameObject(self.btnGet,"redPoint") + self.btnText = Util.GetGameObject(self.btnGet,"Text"):GetComponent("Text") +end + +--绑定事件(用于子类重写) +function ExpertPre:BindEvent() +end + +--添加事件监听(用于子类重写) +function ExpertPre:AddListener() +end + +--移除事件监听(用于子类重写) +function ExpertPre:RemoveListener() + +end +function ExpertPre:OnOpen() +end + +function ExpertPre:SetData(_data,_parent,_sortingOrder,_activityId) + self.data = _data + self.parent = _parent + self.sortingOrder = _sortingOrder + self.activityId = _activityId + self:Refresh() +end + +function ExpertPre:Refresh() + -- LogPink("self.data.missionId.:"..tostring(self.data.missionId).." self.data.progress:"..tostring(self.data.progress).." self.data.state:"..tostring(self.data.state)) + local sConFigData = ConfigManager.GetConfigData(ConfigName.ActivityRewardConfig,self.data.missionId) + self.title.text = GetLanguageStrById(sConFigData.ContentsShow) + --设置内容 + if not self.itemList then + self.itemList = {} + end + for i = 1, #sConFigData.Reward do + if not self.itemList[i] then + self.itemList[i] = SubUIManager.Open(SubUIConfig.ItemView,self.grid.transform) + end + self.itemList[i]:OnOpen(false, sConFigData.Reward[i], 0.9,false,false,false,self.sortingOrder) + end + self:SetButton(sConFigData) +end + +function ExpertPre:SetButton(sConFigData) + + local state = 0 + if self.data.state == 0 then + state = self.data.progress >= sConFigData.Values[2][1] and 0 or 1 + else + state = 2 + end + + local btnData = BtnState[state] + self.btnGet:GetComponent("Image").sprite = Util.LoadSprite(btnData.Img) + Util.SetGray(self.btnGet,btnData.isGray) + self.redPoint:SetActive(btnData.isRed) + self.btnText.text = btnData.Text + self.info.text =string.format("%s/%s",self.data.progress,sConFigData.Values[2][1]) + Util.AddOnceClick(self.btnGet, function() + if state == 0 then + NetManager.GetActivityRewardRequest(self.data.missionId, self.activityId, function(drop) + UIManager.OpenPanel(UIName.RewardItemPopup,drop,1,function() + CheckRedPointStatus(RedPointType.Expert_FastExplore) + end) + end) + elseif state == 1 then + JumpManager.GoJump(sConFigData.Jump[1]) + elseif state == 2 then + PopupTipPanel.ShowTip(Language[10101]) + end + end) +end + +function ExpertPre:OnClose() + self.gridList = {} + for k,v in pairs(self.itemList) do + SubUIManager.Close(v) + end +end + +return ExpertPre \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua.meta b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua.meta new file mode 100644 index 0000000000..a5f0af2b93 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/ExpertPre.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5ccd6ae33adc054449a587eb178fcde7 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: