From 762aef88e0562fbfe0b2aa764d315cc747cc755b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 16 Apr 2021 14:58:40 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E4=BA=91=E6=B8=B8=E5=95=86=E4=BA=BA?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/NewActivity/CommonPage.prefab | 640 ++++++++++++++++++ .../UI/NewActivity/CommonPage.prefab.meta | 7 + .../ManagedResources/~Lua/Common/Managers.lua | 2 + Assets/ManagedResources/~Lua/Data/UIData.lua | 3 +- .../~Lua/Modules/Main/MainPanel.lua | 2 + .../~Lua/Modules/NewActivity.meta | 8 + .../Modules/NewActivity/CommonActPage.lua | 117 ++++ .../NewActivity/CommonActPageManager.lua | 17 + .../Modules/NewActivity/CommonPage.lua.meta | 7 + .../View => NewActivity}/ItemUpstarPre.lua | 0 .../ItemUpstarPre.lua.meta | 0 11 files changed, 802 insertions(+), 1 deletion(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab create mode 100644 Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity.meta create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua create mode 100644 Assets/ManagedResources/~Lua/Modules/NewActivity/CommonPage.lua.meta rename Assets/ManagedResources/~Lua/Modules/{Recharge/View => NewActivity}/ItemUpstarPre.lua (100%) rename Assets/ManagedResources/~Lua/Modules/{Recharge/View => NewActivity}/ItemUpstarPre.lua.meta (100%) diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab new file mode 100644 index 0000000000..b9d949b0f4 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab @@ -0,0 +1,640 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1303472198973847495 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4836386230438267975} + - component: {fileID: 6415175731582749822} + - component: {fileID: 990900999863073278} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4836386230438267975 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303472198973847495} + 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: 6585438849526045221} + m_Father: {fileID: 2384432804281337260} + 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: 412.5} + m_SizeDelta: {x: 584, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6415175731582749822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303472198973847495} + m_CullTransparentMesh: 0 +--- !u!114 &990900999863073278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1303472198973847495} + 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: c79ca6ef5a3666c43b6b15a4d3b88f4e, 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 &1377581433624104458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8478406734519293774} + - component: {fileID: 5370907024936381182} + - component: {fileID: 2395231596824774204} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8478406734519293774 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377581433624104458} + 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: 8671287736119384416} + - {fileID: 7105731049622345673} + m_Father: {fileID: 2384432804281337260} + 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 &5370907024936381182 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377581433624104458} + m_CullTransparentMesh: 0 +--- !u!114 &2395231596824774204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1377581433624104458} + 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 &2384432804281337261 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2384432804281337260} + - component: {fileID: 2384432804281337263} + m_Layer: 5 + m_Name: CommonPage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2384432804281337260 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384432804281337261} + 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: 8478406734519293774} + - {fileID: 3874819813122503755} + - {fileID: 4836386230438267975} + - {fileID: 1192024921614026370} + 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 &2384432804281337263 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384432804281337261} + m_CullTransparentMesh: 0 +--- !u!1 &3236009349922205468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8671287736119384416} + - component: {fileID: 68261452465852448} + - component: {fileID: 2800205120348999130} + m_Layer: 5 + m_Name: banner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8671287736119384416 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236009349922205468} + 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: 8478406734519293774} + 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: 647} + m_SizeDelta: {x: 1080, y: 472} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &68261452465852448 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236009349922205468} + m_CullTransparentMesh: 0 +--- !u!114 &2800205120348999130 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3236009349922205468} + 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: 88ca7caf6d81abf41b630b031bf01771, 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 &3537373025275762826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3874819813122503755} + - component: {fileID: 3090490801835799772} + - component: {fileID: 2146732074960775980} + m_Layer: 5 + m_Name: scrollItem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3874819813122503755 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3537373025275762826} + 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: 2384432804281337260} + 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: -204.72998} + m_SizeDelta: {x: -2, y: -743.44995} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3090490801835799772 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3537373025275762826} + m_CullTransparentMesh: 0 +--- !u!114 &2146732074960775980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3537373025275762826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &5759065364542601348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1192024921614026370} + - component: {fileID: 7858006040774328033} + - component: {fileID: 582648236614516589} + - component: {fileID: 8112466043089625383} + - component: {fileID: 6004624310832476627} + m_Layer: 5 + m_Name: btnHelp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1192024921614026370 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759065364542601348} + 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: 2384432804281337260} + 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: -98, y: 800} + m_SizeDelta: {x: 68, y: 68} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7858006040774328033 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759065364542601348} + m_CullTransparentMesh: 0 +--- !u!114 &582648236614516589 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759065364542601348} + 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!114 &8112466043089625383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759065364542601348} + 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: 582648236614516589} + 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 &6004624310832476627 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5759065364542601348} + 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 &8369141525297597868 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7105731049622345673} + - component: {fileID: 4000121462005275383} + - component: {fileID: 3937092916981505639} + m_Layer: 5 + m_Name: mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7105731049622345673 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369141525297597868} + 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: 8478406734519293774} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 125} + m_SizeDelta: {x: 0, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4000121462005275383 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369141525297597868} + m_CullTransparentMesh: 0 +--- !u!114 &3937092916981505639 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8369141525297597868} + 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: 17126e93d2bacdd438dd8c5560c2b192, 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 &8920601020287104486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6585438849526045221} + - component: {fileID: 964141159564822793} + - component: {fileID: 4306010019230216099} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6585438849526045221 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920601020287104486} + 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: 4836386230438267975} + 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: -1.5} + m_SizeDelta: {x: 467.59998, y: 54.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &964141159564822793 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920601020287104486} + m_CullTransparentMesh: 0 +--- !u!114 &4306010019230216099 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8920601020287104486} + 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.84313726, g: 0.84313726, b: 0.7490196, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 38 + m_FontStyle: 0 + m_BestFit: 1 + m_MinSize: 26 + m_MaxSize: 38 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: + LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab.meta b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab.meta new file mode 100644 index 0000000000..74cc500fa9 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/CommonPage.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5b6d08d62f18ffa44b886c56d4cd7f3a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Common/Managers.lua b/Assets/ManagedResources/~Lua/Common/Managers.lua index eb2eecdee4..d514ccc3a1 100644 --- a/Assets/ManagedResources/~Lua/Common/Managers.lua +++ b/Assets/ManagedResources/~Lua/Common/Managers.lua @@ -187,6 +187,8 @@ local ManagerNames = { "TianShuMiJuan/TianShuMiJuanManger", --十五日登录管理器 "FifteenDayGift/FifteenDayGiftManager", + --一般活动界面管理器 + "NewActivity/CommonActPageManager", --!!!!红点管理(尽量放在最后)!!!!-- "Player/RedpotManager", } diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 0fcf84d4f3..79f0d38bd6 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -410,5 +410,6 @@ SubUIConfig = { [6] = {name = "GrowthGiftPage",assetName = "GrowthGiftPage",script = "Modules/Operating/GrowthGiftPage"}, [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/Recharge/View/ItemUpstarPre"} + [9] = {name = "ItemUpstarPre",assetName = "ItemUpstarPre",script = "Modules/NewActivity/ItemUpstarPre"}, + [10] = {name = "CommonPage",assetName = "CommonPage",script = "Modules/NewActivity/CommonPage"} } \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index a401acaef3..a5a4967ee6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -728,6 +728,8 @@ function this:TabBtnAction(id,actType,data) UIManager.OpenPanel(UIName.FuXingGaoZhaoPanel) elseif id == ActivityTypeDef.ZhiZunHaoLi6 then UIManager.OpenPanel(UIName.ZhiZunHaoLiPanel) + elseif id == ActivityTypeDef.YunYouShangRen then + UIManager.OpenPanel(UIName.ActivityMainPanel,id) end elseif actType == 2 then if id == FUNCTION_OPEN_TYPE.SERVER_START_GIFT then diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity.meta b/Assets/ManagedResources/~Lua/Modules/NewActivity.meta new file mode 100644 index 0000000000..5038fc8005 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3ababe0c73073bf4c852cec560e86cec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua new file mode 100644 index 0000000000..6414588e58 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPage.lua @@ -0,0 +1,117 @@ +local CommonActPage = {} +local rechargeNum = 0 +function CommonActPage:New(gameObject) + local b = {} + b.gameObject = gameObject + b.transform = gameObject.transform + setmetatable(b, { __index = CommonActPage }) + return b +end + + +--添加事件监听(用于子类重写) +function CommonActPage:AddListener() + +end + +--移除事件监听(用于子类重写) +function CommonActPage:RemoveListener() + +end + + +function CommonActPage:InitComponent() + self.bg = Util.GetGameObject(self.gameObject, "Bg/banner"):GetComponent("Image") + self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem") + self.time = Util.GetGameObject(self.gameObject, "time") + self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp") + + -- 设置循环滚动,万一内容不停地加 + 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, 35)) + self.scrollView.moveTween.MomentumAmount = 1 + self.scrollView.moveTween.Strength = 2 + self.sortingOrder = 0 + + self.ItemList = {} +end + +function CommonActPage:BindEvent() +end + +--界面打开时调用(用于子类重写) +function CommonActPage:OnOpen(_activityConfig,_index,parent) + self.actConfig = _activityConfig + self.pageIndex = _index + self.parent = parent + self.gameObject.name = "CommonActPage"..self.actConfig.Id +end + +-- 打开,重新打开时回调 +function CommonActPage: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 + end + end + end + if self.actConfig.Icon[3] and self.actConfig.Icon[3] ~= "" then + self.bg.sprite = Util.LoadSprite(self.actConfig.Icon[3]) + end + --拿取数据 + self:RefreshData(true,true,true) +end + +function CommonActPage:RefreshData(isUpdata,isTop,isAni) + self.ActData = CommonActPageManager.GetData(self.actConfig.ActiveType) + if self.actConfig.RpType > 0 then + CheckRedPointStatus(self.actConfig.RpType) + end + self:RefreshAtData(isTop,isAni) +end + +function CommonActPage:RefreshAtData(isTop,isAni) + self.scrollView:ForeachItemGO(function(index, go) + go.gameObject:SetActive(false) + end) + self.scrollView:SetData(self.shopData, function (index, item) + self:ShowSingleData(item, self.ActData[index],index) + end,not isTop,not isAni) +end + +function CommonActPage:OnClose() + if self.localTimer then + self.localTimer:Stop() + self.localTimer = nil + end + self.gameObject:SetActive(false) +end + +function CommonActPage: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 + if self.localTimer then + self.localTimer:Stop() + self.localTimer = nil + end +end + +return CommonActPage \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua new file mode 100644 index 0000000000..6a181b4795 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -0,0 +1,17 @@ +CommonActPageManager = {} +local this = CommonActPageManager + +function this.Initialize() +end + +function this.GetData(actType) + if actType == ActivityTypeDef.YunYouShangRen then + this.GetYunYouData() + end +end + +function this.GetYunYouData() + -- body +end + +return CommonActPageManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonPage.lua.meta b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonPage.lua.meta new file mode 100644 index 0000000000..5c866b48e0 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonPage.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 17c91ba83ab0f964d85565a9fc1d7edb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/ItemUpstarPre.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua similarity index 100% rename from Assets/ManagedResources/~Lua/Modules/Recharge/View/ItemUpstarPre.lua rename to Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua diff --git a/Assets/ManagedResources/~Lua/Modules/Recharge/View/ItemUpstarPre.lua.meta b/Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua.meta similarity index 100% rename from Assets/ManagedResources/~Lua/Modules/Recharge/View/ItemUpstarPre.lua.meta rename to Assets/ManagedResources/~Lua/Modules/NewActivity/ItemUpstarPre.lua.meta