From 7058d73193d956cf6680023e97c0b86926e317dc Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 21 Aug 2020 18:30:44 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A0=B4=E9=98=B5=E8=AF=9B=E4=BB=99=20?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DynamicActivityPanel.prefab | 924 +++++++++++------- .../~Lua/Common/GlobalDefine.lua | 3 +- .../DynamicActivity/LeiJiChongZhiPage.lua | 106 +- .../DynamicActivity/PoZhenZhuXianPage.lua | 6 +- .../DynamicActivity/XianShiShangShi.lua | 27 +- .../DynamicActivity/ZhenQiYiBaoPage.lua | 26 +- .../Modules/Operating/OperatingManager.lua | 31 +- .../~Lua/Modules/Task/TaskManager.lua | 9 +- 8 files changed, 733 insertions(+), 399 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index adbde8140e..fc876af18d 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -677,7 +677,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4499192152238623041} - - {fileID: 3323978938496254517} + - {fileID: 1580573158776728580} - {fileID: 5699968993373683288} - {fileID: 9079045295500488071} - {fileID: 2031672032753307058} @@ -953,6 +953,100 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u67E5\u770B\u8BE6\u60C5" +--- !u!1 &281047333737160960 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8317603687345440089} + - component: {fileID: 2214220169635196469} + - component: {fileID: 827337669590413734} + - component: {fileID: 7547675256921548176} + m_Layer: 5 + m_Name: num + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8317603687345440089 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281047333737160960} + 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: 1580573158776728580} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -221.7, y: 32.800003} + m_SizeDelta: {x: 230.6, y: 43.8} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2214220169635196469 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281047333737160960} + m_CullTransparentMesh: 0 +--- !u!114 &827337669590413734 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281047333737160960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} + m_FontSize: 7 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 60 + LanguageIndex: 0 +--- !u!114 &7547675256921548176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 281047333737160960} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Name: + m_EditorClassIdentifier: + _textSpacing: -22 --- !u!1 &336460749731130647 GameObject: m_ObjectHideFlags: 0 @@ -5419,6 +5513,81 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2224757020172228415 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5490403364803716961} + - component: {fileID: 4136480265334163230} + - component: {fileID: 7024903288831331379} + m_Layer: 5 + m_Name: tiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5490403364803716961 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2224757020172228415} + 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: 3833110079261217167} + m_Father: {fileID: 424732031091494258} + 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: -2.4, y: 397.2} + m_SizeDelta: {x: 584, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4136480265334163230 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2224757020172228415} + m_CullTransparentMesh: 0 +--- !u!114 &7024903288831331379 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2224757020172228415} + 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: 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 &2238865164795749230 GameObject: m_ObjectHideFlags: 0 @@ -5610,6 +5779,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &2407185892528601439 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1335230641480247807} + - component: {fileID: 5726899159507858816} + - component: {fileID: 6724943889670237394} + m_Layer: 5 + m_Name: tiao + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1335230641480247807 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407185892528601439} + 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: 7444767448621943880} + m_Father: {fileID: 6114044493445337611} + 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: -2.4, y: 397.2} + m_SizeDelta: {x: 584, y: 84} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5726899159507858816 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407185892528601439} + m_CullTransparentMesh: 0 +--- !u!114 &6724943889670237394 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2407185892528601439} + 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: 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 &2434866380227424614 GameObject: m_ObjectHideFlags: 0 @@ -6659,83 +6903,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u5FC5\u5B9A\u83B7\u5F974\u661F\u53CA\u4EE5\u4E0A\u795E\u5C06" ---- !u!1 &2810249423370311458 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3323978938496254517} - - component: {fileID: 1186243876548438045} - - component: {fileID: 4680830711553432473} - m_Layer: 5 - m_Name: title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3323978938496254517 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2810249423370311458} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 8990658614396903666} - - {fileID: 6351062040905151245} - - {fileID: 278825424909160414} - m_Father: {fileID: 5489039324293512018} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -526.94, y: 76} - m_SizeDelta: {x: 243.72, y: 50} - m_Pivot: {x: 0, y: 0.5} ---- !u!114 &1186243876548438045 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2810249423370311458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: -11.64 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 0 ---- !u!114 &4680830711553432473 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2810249423370311458} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &2827507354882112753 GameObject: m_ObjectHideFlags: 0 @@ -6980,6 +7147,65 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2873977725701640948} m_CullTransparentMesh: 0 +--- !u!1 &2886814467425578357 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5949700931264122684} + - component: {fileID: 8630182237039308045} + m_Layer: 5 + m_Name: grid + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5949700931264122684 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2886814467425578357} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2031672032753307058} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0.00007247925} + m_SizeDelta: {x: 556, y: 140} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8630182237039308045 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2886814467425578357} + 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: 0 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 --- !u!1 &2910750955178774158 GameObject: m_ObjectHideFlags: 0 @@ -7835,6 +8061,45 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 28 LanguageIndex: 0 +--- !u!1 &3177623410781147753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1580573158776728580} + m_Layer: 5 + m_Name: context + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1580573158776728580 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3177623410781147753} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 8990658614396903666} + - {fileID: 8317603687345440089} + - {fileID: 6351062040905151245} + - {fileID: 278825424909160414} + m_Father: {fileID: 5489039324293512018} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3190282152450828183 GameObject: m_ObjectHideFlags: 0 @@ -14014,6 +14279,7 @@ RectTransform: - {fileID: 4692647065333361001} - {fileID: 2814152444981780688} - {fileID: 2126146846047315032} + - {fileID: 1335230641480247807} - {fileID: 2854051434454895923} m_Father: {fileID: 6860498336681067139} m_RootOrder: 5 @@ -15041,7 +15307,6 @@ RectTransform: m_Children: - {fileID: 6690904579549707098} - {fileID: 2343543827181550782} - - {fileID: 7439523667026486320} m_Father: {fileID: 5489039324293512018} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16223,9 +16488,8 @@ GameObject: m_Component: - component: {fileID: 6351062040905151245} - component: {fileID: 4556552507106168976} - - component: {fileID: 6203438180708654588} - component: {fileID: 2692277429856374309} - - component: {fileID: 2892856835869042007} + - component: {fileID: 7788368988821923121} m_Layer: 5 m_Name: price m_TagString: Untagged @@ -16244,14 +16508,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3323978938496254517} - m_RootOrder: 1 + m_Father: {fileID: 1580573158776728580} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 128.36, y: -25} - m_SizeDelta: {x: 92, y: 47.4} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -163.29999, y: 31.3} + m_SizeDelta: {x: 46, y: 47.4} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4556552507106168976 CanvasRenderer: m_ObjectHideFlags: 0 @@ -16260,40 +16524,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4583480284993322086} m_CullTransparentMesh: 0 ---- !u!114 &6203438180708654588 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4583480284993322086} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.9215687, b: 0.8078432, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 12800000, guid: 64e11c7b076fb1148ae80198b1f08a26, type: 2} - m_FontSize: 0 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 40 - m_Alignment: 3 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 1 - m_VerticalOverflow: 1 - m_LineSpacing: 1 - m_Text: 50 --- !u!114 &2692277429856374309 MonoBehaviour: m_ObjectHideFlags: 0 @@ -16308,7 +16538,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 2 m_VerticalFit: 0 ---- !u!114 &2892856835869042007 +--- !u!114 &7788368988821923121 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -16317,10 +16547,26 @@ MonoBehaviour: m_GameObject: {fileID: 4583480284993322086} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 72f543c75b355a741976183c1e74debc, type: 3} + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - _textSpacing: -25.6 + 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: 9be77c95f87e3ec4bab0ebe49fbc9a85, 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 &4624338695030170943 GameObject: m_ObjectHideFlags: 0 @@ -16687,6 +16933,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &4727898780272651682 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7444767448621943880} + - component: {fileID: 5605860046339123812} + - component: {fileID: 4333067554977090811} + m_Layer: 0 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7444767448621943880 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727898780272651682} + 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: 1335230641480247807} + 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: 294.40002, y: -42.7} + m_SizeDelta: {x: 1080, y: 51.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5605860046339123812 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727898780272651682} + m_CullTransparentMesh: 0 +--- !u!114 &4333067554977090811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4727898780272651682} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.96470594, b: 0.87843144, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "3\u59299\u5C0F\u65F6" + LanguageIndex: 0 --- !u!1 &4738701141193756906 GameObject: m_ObjectHideFlags: 0 @@ -17368,80 +17694,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5012794481206642759 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7439523667026486320} - - component: {fileID: 1321015926207372417} - - component: {fileID: 8388292383898538467} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7439523667026486320 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5012794481206642759} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 9079045295500488071} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 128, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1321015926207372417 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5012794481206642759} - m_CullTransparentMesh: 0 ---- !u!114 &8388292383898538467 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5012794481206642759} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: fcd7f98240d96bb46b47fb807d597750, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 --- !u!1 &5063259274705246180 GameObject: m_ObjectHideFlags: 0 @@ -18104,6 +18356,7 @@ RectTransform: - {fileID: 4042508573960468103} - {fileID: 2635879045000533899} - {fileID: 3574234435946583554} + - {fileID: 5490403364803716961} - {fileID: 2620699115784601724} m_Father: {fileID: 6860498336681067139} m_RootOrder: 3 @@ -25978,7 +26231,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4240211928911393712} - - component: {fileID: 8594506145936696643} m_Layer: 5 m_Name: grid m_TagString: Untagged @@ -26000,34 +26252,11 @@ RectTransform: m_Father: {fileID: 1580303152666221298} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -6.9000244} - m_SizeDelta: {x: 0, y: -13.7} + m_SizeDelta: {x: 1080, y: 1180.3} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &8594506145936696643 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6344923951847583693} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 27.91 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 0 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!1 &6348808697839174188 GameObject: m_ObjectHideFlags: 0 @@ -26176,80 +26405,6 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 ---- !u!1 &6420320633838348968 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4016774019935538984} - - component: {fileID: 7833627676577434378} - - component: {fileID: 5872360668049189410} - m_Layer: 5 - m_Name: grid - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4016774019935538984 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6420320633838348968} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 2031672032753307058} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 1.0000001} ---- !u!114 &7833627676577434378 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6420320633838348968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 0 - m_VerticalFit: 0 ---- !u!114 &5872360668049189410 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6420320633838348968} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -405508275, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 10 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 --- !u!1 &6460985358256269223 GameObject: m_ObjectHideFlags: 0 @@ -27115,6 +27270,86 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6699066459941024004 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3833110079261217167} + - component: {fileID: 1273347523724790131} + - component: {fileID: 3583848100214228106} + m_Layer: 0 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3833110079261217167 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6699066459941024004} + 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: 5490403364803716961} + 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: 294.40002, y: -42.7} + m_SizeDelta: {x: 1080, y: 51.9} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1273347523724790131 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6699066459941024004} + m_CullTransparentMesh: 0 +--- !u!114 &3583848100214228106 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6699066459941024004} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9921569, g: 0.96470594, b: 0.87843144, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 36 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "3\u59299\u5C0F\u65F6" + LanguageIndex: 0 --- !u!1 &6708858753205091530 GameObject: m_ObjectHideFlags: 0 @@ -28220,7 +28455,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &2854051434454895923 RectTransform: m_ObjectHideFlags: 0 @@ -28238,11 +28473,11 @@ RectTransform: - {fileID: 2112989838391003837} - {fileID: 7453172689867371035} m_Father: {fileID: 6114044493445337611} - m_RootOrder: 3 + 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: 0, y: 235} + m_AnchoredPosition: {x: -2686, y: 369} m_SizeDelta: {x: 1080, y: 240} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &952584959393060940 @@ -28482,7 +28717,7 @@ RectTransform: - {fileID: 7502613569077029906} - {fileID: 5039575572442799951} m_Father: {fileID: 424732031091494258} - m_RootOrder: 3 + 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} @@ -30072,6 +30307,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2031672032753307058} + - component: {fileID: 8980831459057202516} + - component: {fileID: 3161185947107291972} m_Layer: 5 m_Name: scrollView m_TagString: Untagged @@ -30090,7 +30327,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 4016774019935538984} + - {fileID: 5949700931264122684} m_Father: {fileID: 5489039324293512018} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -30099,6 +30336,50 @@ RectTransform: m_AnchoredPosition: {x: -221, y: -42.7} m_SizeDelta: {x: 556, y: 140} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &8980831459057202516 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7544856967267834323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1367256648, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 5949700931264122684} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 0} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 0 + m_VerticalScrollbarVisibility: 0 + m_HorizontalScrollbarSpacing: 0 + m_VerticalScrollbarSpacing: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.ScrollRect+ScrollRectEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &3161185947107291972 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7544856967267834323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -146154839, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &7546466463766986482 GameObject: m_ObjectHideFlags: 0 @@ -31317,14 +31598,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3323978938496254517} - m_RootOrder: 2 + m_Father: {fileID: 1580573158776728580} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 208.72, y: -25} - m_SizeDelta: {x: 35, y: 47.4} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -86.6001, y: 31.300018} + m_SizeDelta: {x: 105, y: 47.4} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7319569151150132045 CanvasRenderer: m_ObjectHideFlags: 0 @@ -31366,7 +31647,7 @@ MonoBehaviour: m_HorizontalOverflow: 1 m_VerticalOverflow: 1 m_LineSpacing: 1 - m_Text: "\u5143" + m_Text: "\u53EF\u9886\u53D6" --- !u!114 &6590969086930372406 MonoBehaviour: m_ObjectHideFlags: 0 @@ -31568,7 +31849,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0.000030517578, y: 0} + m_AnchoredPosition: {x: 0.000030521504, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0.5} --- !u!114 &8625427577928505908 @@ -34029,7 +34310,6 @@ GameObject: - component: {fileID: 8990658614396903666} - component: {fileID: 7104138529442166108} - component: {fileID: 4603772087116659756} - - component: {fileID: 4934193009545902822} m_Layer: 5 m_Name: title m_TagString: Untagged @@ -34048,14 +34328,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] - m_Father: {fileID: 3323978938496254517} + m_Father: {fileID: 1580573158776728580} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -25} - m_SizeDelta: {x: 140, y: 47.4} - m_Pivot: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -406.93994, y: 29.49997} + m_SizeDelta: {x: 140, y: 43.8} + m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7104138529442166108 CanvasRenderer: m_ObjectHideFlags: 0 @@ -34098,20 +34378,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7D2F\u8BA1\u5145\u503C" ---- !u!114 &4934193009545902822 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8625313410389690315} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_HorizontalFit: 2 - m_VerticalFit: 0 --- !u!1 &8656796322370693618 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index d9ee0681d2..5fbd0328c3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1021,7 +1021,8 @@ ActivityTypeDef = { SignInfo = 57,--三日七日签到 pozhenzhuxian_task = 20000,--破阵诛仙任务 pozhenzhuxian_recharge = 58,--破阵诛仙累充 - + pozhenzhuxian_TimeLimitShop = 20001,--破阵诛仙限时商市 + pozhenzhuxian_Treasure = 20002,--破阵诛仙珍奇宝阁 } --活动结束需要处理面板关闭类型 ActivityTypePanel = { diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua index 03779a5c16..95f3c4a653 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/LeiJiChongZhiPage.lua @@ -1,10 +1,10 @@ local LeiJiChongZhiPage = quick_class("LeiJiChongZhiPage") local allData={} local itemsGrid = {}--item重复利用 -local singleTaskPre = {} local this=LeiJiChongZhiPage local parent local endtime = 0 +local rechargeNum function LeiJiChongZhiPage:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -13,13 +13,12 @@ function LeiJiChongZhiPage:ctor(mainPanel, gameObject) end function LeiJiChongZhiPage:InitComponent(gameObject) - this.time = Util.GetGameObject(gameObject, "content/tiao/time") - this.itemPre = Util.GetGameObject(gameObject, "content/ItemPre") - this.scrollItem = Util.GetGameObject(gameObject, "content/grid") - local rootHight = this.scrollItem.transform.rect.height - local width = this.scrollItem.transform.rect.width + this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") + this.itemPre = Util.GetGameObject(gameObject, "ItemPre") + this.scrollItem = Util.GetGameObject(gameObject, "grid") + local rootHight = this.scrollItem:GetComponent("RectTransform").sizeDelta this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.scrollItem.transform, - this.itemPre, nil, Vector2.New(width, rootHight), 1, 1, Vector2.New(0, 30)) + this.itemPre, nil, Vector2.New(rootHight.x, rootHight.y), 1, 1, Vector2.New(0, 10)) this.ScrollView.moveTween.MomentumAmount = 1 this.ScrollView.moveTween.Strength = 2 end @@ -30,10 +29,12 @@ end --添加事件监听(用于子类重写) function LeiJiChongZhiPage:AddListener() + end --移除事件监听(用于子类重写) function LeiJiChongZhiPage:RemoveListener() + end local sortingOrder = 0 --界面打开时调用(用于子类重写) @@ -43,9 +44,10 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function LeiJiChongZhiPage:OnShow(_sortingOrder,_parent) + rechargeNum= VipManager.GetChargedNum()--已经充值的金额 sortingOrder = _sortingOrder parent = _parent - this:OnShowData() + this.Refresh() end function this.Refresh() @@ -58,37 +60,27 @@ function LeiJiChongZhiPage:SetTime() self.timer:Stop() self.timer = nil end + local timeDown = endtime - GetTimeStamp() + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) self.timer = Timer.New(function() - local timeDown - for i = 1,#allData do - if allData[i].type == 1 then - timeDown = CalculateSecondsNowTo_N_OClock(5) - singleTaskPre[allData[i].id].text = "剩余:"..TimeToHMS(timeDown) - else - timeDown = endtime - GetTimeStamp() - singleTaskPre[allData[i].id].text = "剩余:"..TimeToDHMS(timeDown) - end - if timeDown < 1 then - this.Refresh() - return - end + timeDown = timeDown - 1 + if timeDown < 1 then + parent:ClosePanel() + return end - timeDown = endtime - GetTimeStamp() - this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) end, 1, -1, true) self.timer:Start() end function LeiJiChongZhiPage:OnShowData() - allData = OperatingManager:InitPoZhenZhuXianData() + allData =OperatingManager.InitLeiJiChongZhiData() if allData then - endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_task) + endtime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_recharge) this.SortData(allData) this.ScrollView:SetData(allData, function (index, go) this.SingleDataShow(go, allData[index]) - singleTaskPre[allData[index].id] = Util.GetGameObject(go,"btn/Text"):GetComponent("Text") end) - LogError(#allData) else parent.OnPageTabChange(1) PopupTipPanel.ShowTip("活动已结束") @@ -96,16 +88,21 @@ function LeiJiChongZhiPage:OnShowData() end end +local typeIndex = { + [0] = 2, + [1] = 3, + [2] = 1, +} function LeiJiChongZhiPage:SortData() if allData==nil then return end table.sort(allData, function(a,b) - if a.type == b.type then + if typeIndex[a.state] == typeIndex[b.state] then return a.id < b.id - else - return a.type < b.type - end + else + return typeIndex[a.state] < typeIndex[b.state] + end end) end local type={ @@ -123,41 +120,46 @@ function this.SingleDataShow(pre,value) activityRewardGo:SetActive(true) local sConFigData = value - local titleText = Util.GetGameObject(activityRewardGo, "title"):GetComponent("Text") - titleText.text = sConFigData.title - local missionText = Util.GetGameObject(activityRewardGo, "mission"):GetComponent("Text") - missionText.text = sConFigData.content.."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" - - local reward = Util.GetGameObject(activityRewardGo.gameObject, "reward") + local num = Util.GetGameObject(activityRewardGo, "context/num"):GetComponent("Text") + num.text = sConFigData.value + local progress = Util.GetGameObject(activityRewardGo, "context/progress"):GetComponent("Text") + progress.text ="可领取".."("..(sConFigData.progress > sConFigData.value and sConFigData.value or sConFigData.progress) .."/"..sConFigData.value..")" + + local reward = Util.GetGameObject(activityRewardGo.gameObject, "scrollView/grid") if (not itemsGrid) then itemsGrid = {} end if not itemsGrid[pre] then - itemsGrid[pre] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) + itemsGrid[pre] = {} + end + for k,v in ipairs(sConFigData.reward) do + if not itemsGrid[pre][k] then + itemsGrid[pre][k] = SubUIManager.Open(SubUIConfig.ItemView,reward.transform) + end + itemsGrid[pre][k]:OnOpen(false, {v[1],v[2]}, 0.9, false) end - itemsGrid[pre]:OnOpen(false, sConFigData.reward, 0.9, false) - local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btn") - local state = sConFigData.state == 1 and sConFigData.state or (sConFigData.progress >= sConFigData.value and 2 or 0) -- 0 前往 1已领奖 2领奖 + local lingquButton = Util.GetGameObject(activityRewardGo.gameObject, "btnBuy") + LogYellow("sConFigData.progress:"..sConFigData.progress) + local state = sConFigData.state local red = Util.GetGameObject(lingquButton.gameObject, "redPoint") red:SetActive(state == 2) - Util.GetGameObject(lingquButton.gameObject, "Button/Text"):GetComponent("Text").text = type[state].text - Util.GetGameObject(lingquButton.gameObject, "Button"):GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) - Util.GetGameObject(lingquButton.gameObject, "Button").gameObject:SetActive(state ~= 1) - Util.GetGameObject(lingquButton.gameObject, "image").gameObject:SetActive(state == 1) + Util.GetGameObject(lingquButton.gameObject, "price"):GetComponent("Text").text = type[state].text + lingquButton:GetComponent("Image").sprite = Util.LoadSprite(type[state].sprite) + lingquButton:GetComponent("Button").enabled = (state ~= 1) - Util.AddOnceClick(Util.GetGameObject(lingquButton.gameObject, "Button"), function() + Util.AddOnceClick(lingquButton, function() if state == 2 then - local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_task) + local curActivityId = ActivityGiftManager.GetActivityIdByType(ActivityTypeDef.pozhenzhuxian_recharge) NetManager.GetActivityRewardRequest(sConFigData.id, curActivityId,function(respond) - UIManager.OpenPanel(UIName.RewardItemPopup, respond, 1) + UIManager.OpenPanel(UIName.RewardItemPopup, respond.drop, 1) this.Refresh() end) elseif state == 0 then if sConFigData.jump then - JumpManager.GoJump(sConFigData.jump[1]) + JumpManager.GoJump(sConFigData.jump) end end end) @@ -170,9 +172,7 @@ function LeiJiChongZhiPage:OnOpen() end function this.RechargeSuccessFunc(id) - FirstRechargeManager.RefreshAccumRechargeValue(id) - --OperatingManager.RefreshGiftGoodsBuyTimes(GoodsTypeDef.GiftBuy, id) - this.OnShowData() + end function LeiJiChongZhiPage:OnClose() @@ -182,6 +182,8 @@ end --界面销毁时调用(用于子类重写) function LeiJiChongZhiPage:OnDestroy() sortingOrder = 0 + allData={} + itemsGrid = {} end function LeiJiChongZhiPage:OnHide() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua index 9c0e731207..872dd4bd48 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/PoZhenZhuXianPage.lua @@ -75,10 +75,14 @@ function PoZhenZhuXianPage:SetTime() self.timer = Timer.New(function() five_timeDown = five_timeDown - 1 week_timeDown = week_timeDown - 1 - if five_timeDown <= 0 or week_timeDown <= 0 then + if five_timeDown <= 0 then this.Refresh() return end + if week_timeDown <= 0 then + parent:ClosePanel() + return + end for k,v in pairs(singleTaskPre) do v.com.gameObject:SetActive(true) if v and v.data.type == 1 then diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua index 96a9aeff0c..9585b879ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XianShiShangShi.lua @@ -2,6 +2,7 @@ local XianShiShangShi = quick_class("XianShiShangShi") local allData={} local itemsGrid = {}--item重复利用 local this=XianShiShangShi +local parent function XianShiShangShi:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -10,7 +11,7 @@ function XianShiShangShi:ctor(mainPanel, gameObject) end function XianShiShangShi:InitComponent(gameObject) - + this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "ItemPre3") this.scrollItem = Util.GetGameObject(gameObject, "scrollItem") local rootHight = this.scrollItem.transform.rect.height @@ -41,9 +42,11 @@ function XianShiShangShi:OnOpen() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function XianShiShangShi:OnShow(_sortingOrder) +function XianShiShangShi:OnShow(_sortingOrder,_parent) sortingOrder = _sortingOrder + parent = _parent this:OnShowData() + XianShiShangShi:SetTime() end function XianShiShangShi:OnShowData() allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 22, "Type", GoodsTypeDef.DirectPurchaseGift) @@ -55,6 +58,26 @@ function XianShiShangShi:OnShowData() end end + + +function XianShiShangShi:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_TimeLimitShop) + local timeDown = endTime - GetTimeStamp() + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + self.timer = Timer.New(function() + timeDown = timeDown - 1 + if timeDown < 1 then + parent:ClosePanel() + end + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + end, 1, -1, true) + self.timer:Start() +end + function XianShiShangShi:SortData() if allData==nil then return diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua index 19f93c3492..49a1254fb7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/ZhenQiYiBaoPage.lua @@ -2,6 +2,7 @@ local ZhenQiYiBaoPage = quick_class("ZhenQiYiBaoPage") local allData={} local itemsGrid = {}--item重复利用 local this=ZhenQiYiBaoPage +local parent function ZhenQiYiBaoPage:ctor(mainPanel, gameObject) self.mainPanel = mainPanel self.gameObject = gameObject @@ -10,7 +11,7 @@ function ZhenQiYiBaoPage:ctor(mainPanel, gameObject) end function ZhenQiYiBaoPage:InitComponent(gameObject) - + this.time = Util.GetGameObject(gameObject, "tiao/time"):GetComponent("Text") this.itemPre = Util.GetGameObject(gameObject, "ItemPre3") this.scrollItem = Util.GetGameObject(gameObject, "scrollItem") local rootHight = this.scrollItem.transform.rect.height @@ -41,9 +42,11 @@ function ZhenQiYiBaoPage:OnOpen() end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) -function ZhenQiYiBaoPage:OnShow(_sortingOrder) +function ZhenQiYiBaoPage:OnShow(_sortingOrder,_parent) + parent = _parent sortingOrder = _sortingOrder this:OnShowData() + ZhenQiYiBaoPage:SetTime() end function ZhenQiYiBaoPage:OnShowData() allData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.RechargeCommodityConfig, "ShowType", 23, "Type", GoodsTypeDef.DirectPurchaseGift) @@ -55,6 +58,25 @@ function ZhenQiYiBaoPage:OnShowData() end end + +function ZhenQiYiBaoPage:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + local endTime = ActivityGiftManager.GetTaskEndTime(ActivityTypeDef.pozhenzhuxian_Treasure) + local timeDown = endTime - GetTimeStamp() + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + self.timer = Timer.New(function() + timeDown = timeDown - 1 + if timeDown < 1 then + parent:ClosePanel() + end + this.time.text = "剩余时间:"..TimeToDHMS(timeDown) + end, 1, -1, true) + self.timer:Start() +end + function ZhenQiYiBaoPage:SortData() if allData==nil then return diff --git a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua index 60f486efb1..d5e9ef539e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Operating/OperatingManager.lua @@ -776,25 +776,38 @@ function this.InitLeiJiChongZhiData() if not ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.pozhenzhuxian_recharge) then return nil end - this.allData = {} + this.LeiJiChongZhiData = {} local allListData = ConfigManager.GetAllConfigsDataByKey(ConfigName.ActivityRewardConfig, "ActivityId", id) LogBlue("#allListData:"..#allListData) - local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_recharge).mission + local allMissionData = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.pozhenzhuxian_recharge) + LogYellow(allMissionData.value) LogBlue("#allMissionData"..#allMissionData) for i=1,#allListData do - for j=1,#allMissionData do - if allListData[i].Id == allMissionData[j].missionId then + for j=1,#allMissionData.mission do + if allListData[i].Id == allMissionData.mission[j].missionId then local data = {} - data.id = allMissionData[j].missionId - data.progress = allMissionData[j].progress - data.state = allMissionData[j].state + data.id = allMissionData.mission[j].missionId + data.progress = allMissionData.value data.value = allListData[i].Values[1][1] + data.state = allMissionData.mission[j].state == 1 and allMissionData.mission[j].state or (data.progress>= data.value and 2 or 0) -- 0 前往 1已领奖 2领奖 data.reward = allListData[i].Reward data.jump = allListData[i].Jump[1] - table.insert(this.allData,data) + table.insert(this.LeiJiChongZhiData,data) end end end - return this.allData + return this.LeiJiChongZhiData +end +function this.CheckLeiJiChongZhiRedData() + local mission = this.InitLeiJiChongZhiData() + if not mission or #mission < 1 then + return false + end + for j = 1,#mission do + if mission.state == 2 then + return true + end + end + return false end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua index 6f67a701b0..d4f3165fc4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Task/TaskManager.lua @@ -32,9 +32,12 @@ function this.InitTypeTaskList(_userMissionList) userMissionList.type = _userMissionList[i].type userMissionList.takeTimes = _userMissionList[i].takeTimes userMissionList.heroId = _userMissionList[i].heroId - -- if userMissionList.type == 1 then - -- LogRed("任务 类型:"..userMissionList.type.." 类型:"..userMissionList.missionId.." 状态:"..userMissionList.state) - -- end + if userMissionList.type == 1 then + -- LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state) + end + if not TypeTaskData[_userMissionList[i].type] then + TypeTaskData[_userMissionList[i].type] = {} + end table.insert(TypeTaskData[_userMissionList[i].type], userMissionList) --this.AddTypeData(_userMissionList[i].type, userMissionList) end