From 6f75850ae4dad08d97d3f358df0fa8c82dbd1fb7 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 5 Nov 2020 19:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=98=93=E7=BB=8F=E5=AE=9D=E5=BA=93?= =?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 --- .../DynamicActivityPanel.prefab | 42 +- .../UI/GeneralPanel/GeneralBigPopup.prefab | 1652 +++++++++++++++++ ...refab.meta => GeneralBigPopup.prefab.meta} | 2 +- .../UI/GeneralPanel/GeneralRewardPopup.prefab | 521 ------ .../Prefabs/UI/Popup/GeneralPopup.prefab | 602 ++++++ .../~Lua/Common/GlobalDefine.lua | 2 + Assets/ManagedResources/~Lua/Data/UIData.lua | 2 +- .../~Lua/Message/ActivityProto_pb.lua | 13 +- .../DynamicActivityManager.lua | 14 + .../Modules/DynamicActivity/YiJingBaoKu.lua | 152 +- ...ralRewardPopup.lua => GeneralBigPopup.lua} | 26 +- ...aoKu.lua.meta => GeneralBigPopup.lua.meta} | 2 +- .../View/GeneralBigPopup_YiJingBaoKu.lua | 126 ++ .../GeneralBigPopup_YiJingBaoKu.lua.meta} | 2 +- .../~Lua/Modules/Net/NetManager.lua | 4 +- .../~Lua/Modules/Popup/GeneralPopup.lua | 2 + .../View/GeneralPopup_YiJingBaoKuConfirm.lua} | 26 +- .../GeneralPopup_YiJingBaoKuConfirm.lua.meta | 7 + Assets/ManagedResources/~Lua/View/UpView.lua | 4 +- 19 files changed, 2593 insertions(+), 608 deletions(-) create mode 100644 Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab rename Assets/ManagedResources/Prefabs/UI/GeneralPanel/{GeneralRewardPopup.prefab.meta => GeneralBigPopup.prefab.meta} (74%) delete mode 100644 Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab rename Assets/ManagedResources/~Lua/Modules/GeneralPanel/{GeneralRewardPopup.lua => GeneralBigPopup.lua} (77%) rename Assets/ManagedResources/~Lua/Modules/GeneralPanel/{View/GeneralRewardPopup_YiJingBaoKu.lua.meta => GeneralBigPopup.lua.meta} (74%) create mode 100644 Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua rename Assets/ManagedResources/~Lua/Modules/GeneralPanel/{GeneralRewardPopup.lua.meta => View/GeneralBigPopup_YiJingBaoKu.lua.meta} (74%) rename Assets/ManagedResources/~Lua/Modules/{GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua => Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua} (50%) create mode 100644 Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua.meta diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab index 3a01f3f302..9515f191fe 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/DynamicActivityPanel.prefab @@ -52794,7 +52794,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 37d4d7c5ad140bf4190c9969e44fc647, type: 3} + m_Sprite: {fileID: 21300000, guid: 9ce6d53162abd5645ac7a2d1eba5815f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -59818,6 +59818,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6292815448464137924} m_Modifications: + - target: {fileID: 8738943556520059787, guid: d84e4645d382bd244899351e6efacbc8, + type: 3} + propertyPath: m_Name + value: DynamicActivityPanel_dakai + objectReference: {fileID: 0} - target: {fileID: 684639772055139411, guid: d84e4645d382bd244899351e6efacbc8, type: 3} propertyPath: m_LocalPosition.x @@ -59873,11 +59878,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8738943556520059787, guid: d84e4645d382bd244899351e6efacbc8, - type: 3} - propertyPath: m_Name - value: DynamicActivityPanel_dakai - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d84e4645d382bd244899351e6efacbc8, type: 3} --- !u!4 &5536667510165372974 stripped @@ -59893,6 +59893,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4364234898477055512} m_Modifications: + - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_Name + value: Effect_UI_changjing_qiankuanbaoguo + objectReference: {fileID: 0} - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} propertyPath: m_LocalPosition.x @@ -59948,11 +59953,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8096286917689290514, guid: 385d5e664702ab74aa985d27de27bb19, - type: 3} - propertyPath: m_Name - value: Effect_UI_changjing_qiankuanbaoguo - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} --- !u!4 &5379899409067946649 stripped @@ -59968,6 +59968,16 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 7319957226166616999} m_Modifications: + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_Name + value: UI_Effect_BaoXiang_KeKaiQi + objectReference: {fileID: 0} + - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6473444402870397754, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} propertyPath: m_LocalPosition.x @@ -60073,16 +60083,6 @@ PrefabInstance: propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_Name - value: UI_Effect_BaoXiang_KeKaiQi - objectReference: {fileID: 0} - - target: {fileID: 3774195657356619162, guid: 5daa3a0ddb216d14093aa7cd11574675, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5daa3a0ddb216d14093aa7cd11574675, type: 3} --- !u!224 &3110801484483406645 stripped diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab new file mode 100644 index 0000000000..402720add3 --- /dev/null +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -0,0 +1,1652 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &229268780954427967 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3935664217270767561} + - component: {fileID: 7916252660087398034} + - component: {fileID: 1965549073764668487} + - component: {fileID: 394785002544968059} + - component: {fileID: 8064830531996715363} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3935664217270767561 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229268780954427967} + 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: 1121246613582957263} + m_Father: {fileID: 2221885512223848565} + 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: -600} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7916252660087398034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229268780954427967} + m_CullTransparentMesh: 0 +--- !u!114 &1965549073764668487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229268780954427967} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &394785002544968059 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229268780954427967} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1965549073764668487} + 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 &8064830531996715363 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 229268780954427967} + 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 &691946464718676944 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 908259818212352579} + - component: {fileID: 4346489256818483164} + - component: {fileID: 7327344471466200035} + m_Layer: 0 + m_Name: text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &908259818212352579 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691946464718676944} + 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: 8620459858479164681} + 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: 79.7, y: -19.9} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4346489256818483164 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691946464718676944} + m_CullTransparentMesh: 0 +--- !u!114 &7327344471466200035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 691946464718676944} + 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.27058825, g: 0.14901961, b: 0.03529412, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: 2/2 + LanguageIndex: 0 +--- !u!1 &977347506885705026 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047215351155575106} + - component: {fileID: 1045691740577093394} + - component: {fileID: 865292907753659444} + m_Layer: 5 + m_Name: BGImage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1047215351155575106 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977347506885705026} + 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: 1048101660349373980} + 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: -48.5} + m_SizeDelta: {x: -26, y: -123} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1045691740577093394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977347506885705026} + m_CullTransparentMesh: 0 +--- !u!114 &865292907753659444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977347506885705026} + 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: 9658c5a8f1777e74d9a8915414aaa5ac, 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 &977496088553815404 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047325092235970838} + - component: {fileID: 1048877406825554466} + - component: {fileID: 864922710993866316} + m_Layer: 5 + m_Name: GeneralBigPopup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1047325092235970838 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977496088553815404} + 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: 5978868307199444870} + - {fileID: 2423465471356683207} + 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!223 &1048877406825554466 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977496088553815404} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &864922710993866316 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 977496088553815404} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &978145573653132144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1048101660349373980} + - component: {fileID: 1044914172167571856} + - component: {fileID: 865264305584851392} + m_Layer: 5 + m_Name: BG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1048101660349373980 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978145573653132144} + 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: 1047215351155575106} + - {fileID: 1047217009310732986} + m_Father: {fileID: 2423465471356683207} + 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.19999999, y: -14.6} + m_SizeDelta: {x: 917, y: 1336} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1044914172167571856 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978145573653132144} + m_CullTransparentMesh: 0 +--- !u!114 &865264305584851392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978145573653132144} + 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: 3e71ed27c496acc4b92fe95a6e2d6339, 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 &978403310732148754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1047217009310732986} + - component: {fileID: 1044999302860371034} + - component: {fileID: 865790168788386528} + - component: {fileID: 865814461233238620} + - component: {fileID: 5037962448146283796} + m_Layer: 5 + m_Name: BackBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1047217009310732986 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978403310732148754} + 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: 1048101660349373980} + 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: 417.2, y: 630.6} + m_SizeDelta: {x: 142, y: 131} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1044999302860371034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978403310732148754} + m_CullTransparentMesh: 0 +--- !u!114 &865790168788386528 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978403310732148754} + 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: 35da2f4636803c446b5f488a6f757f93, 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 &865814461233238620 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978403310732148754} + 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: 865790168788386528} + 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 &5037962448146283796 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 978403310732148754} + 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 &1359635642570325336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7701004833287482638} + - component: {fileID: 1129836208852214349} + - component: {fileID: 6478409879204134543} + m_Layer: 0 + m_Name: name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7701004833287482638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359635642570325336} + 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: 8620459858479164681} + 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: -26.3, y: 39.2} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1129836208852214349 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359635642570325336} + m_CullTransparentMesh: 0 +--- !u!114 &6478409879204134543 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1359635642570325336} + 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.98823535, g: 0.882353, b: 0.6784314, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 35 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 3 + m_MaxSize: 40 + m_Alignment: 3 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5565\u5565\u5565\u5565\u5565\u5565" + LanguageIndex: 0 +--- !u!1 &1958333681059384058 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1121246613582957263} + - component: {fileID: 4559600061116322183} + - component: {fileID: 1109587659225351327} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1121246613582957263 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1958333681059384058} + 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: 3935664217270767561} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4559600061116322183 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1958333681059384058} + m_CullTransparentMesh: 0 +--- !u!114 &1109587659225351327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1958333681059384058} + 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.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u786E \u8BA4" + LanguageIndex: 10123 +--- !u!1 &2005787329047355383 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5978868307199444870} + - component: {fileID: 1072730558999711384} + - component: {fileID: 7835085401096484185} + m_Layer: 5 + m_Name: Mask + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5978868307199444870 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005787329047355383} + 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: 1047325092235970838} + 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 &1072730558999711384 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005787329047355383} + m_CullTransparentMesh: 0 +--- !u!114 &7835085401096484185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2005787329047355383} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} + 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 &2756625957159874447 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8620459858479164681} + - component: {fileID: 2907061961995680823} + - component: {fileID: 6102367347739713066} + m_Layer: 0 + m_Name: itemPre + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8620459858479164681 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2756625957159874447} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 25.517683} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 5258393330353106522} + - {fileID: 7701004833287482638} + - {fileID: 908259818212352579} + - {fileID: 886790496823652559} + - {fileID: 8903710139760804361} + - {fileID: 444174996902775064} + m_Father: {fileID: 2221885512223848565} + 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: -844, y: 333} + m_SizeDelta: {x: 400, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2907061961995680823 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2756625957159874447} + m_CullTransparentMesh: 0 +--- !u!114 &6102367347739713066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2756625957159874447} + 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 &3566301907704835273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2198083829920946346} + - component: {fileID: 1944023224611005911} + - component: {fileID: 5635845975219520081} + m_Layer: 0 + m_Name: Scroll + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2198083829920946346 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3566301907704835273} + 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: 2221885512223848565} + 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: 0, y: 0} + m_SizeDelta: {x: 800, y: 1000} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1944023224611005911 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3566301907704835273} + m_CullTransparentMesh: 0 +--- !u!114 &5635845975219520081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3566301907704835273} + 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 &4186176485394922406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2221885512223848565} + - component: {fileID: 7244423468402220393} + m_Layer: 5 + m_Name: GeneralBigPopup_YiJingBaoKu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2221885512223848565 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4186176485394922406} + 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: 7734073512610482850} + - {fileID: 3935664217270767561} + - {fileID: 8620459858479164681} + - {fileID: 2198083829920946346} + m_Father: {fileID: 2423465471356683207} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7244423468402220393 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4186176485394922406} + m_CullTransparentMesh: 0 +--- !u!1 &4949698190303221708 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5326976425865026437} + - component: {fileID: 5121640613269329807} + - component: {fileID: 6789730157159323261} + m_Layer: 5 + m_Name: Go + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5326976425865026437 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949698190303221708} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 444174996902775064} + 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: 105, y: 98} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5121640613269329807 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949698190303221708} + m_CullTransparentMesh: 0 +--- !u!114 &6789730157159323261 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4949698190303221708} + 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: 4df0b51ed49908a4791aed4bd1447949, 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 &5021184295932731769 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5258393330353106522} + - component: {fileID: 8093167534901660274} + m_Layer: 0 + m_Name: icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5258393330353106522 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021184295932731769} + 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: 8620459858479164681} + 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: -135, y: 15} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8093167534901660274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5021184295932731769} + m_CullTransparentMesh: 0 +--- !u!1 &5486504090114868561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7734073512610482850} + - component: {fileID: 2402523920063634022} + - component: {fileID: 925815085005163295} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7734073512610482850 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486504090114868561} + 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: 2221885512223848565} + 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: 598} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2402523920063634022 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486504090114868561} + m_CullTransparentMesh: 0 +--- !u!114 &925815085005163295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5486504090114868561} + 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.92549026, g: 0.8588236, b: 0.74509805, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u9009\u62E9\u6700\u7EC8\u5956\u52B1" + LanguageIndex: 11247 +--- !u!1 &6129251158678455388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 444174996902775064} + - component: {fileID: 3601071905900668928} + - component: {fileID: 1441396485296937008} + - component: {fileID: 6924042386595941345} + m_Layer: 5 + m_Name: select + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &444174996902775064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6129251158678455388} + 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: 5440593123132818074} + - {fileID: 5326976425865026437} + m_Father: {fileID: 8620459858479164681} + m_RootOrder: 5 + 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: 150, y: -20} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &3601071905900668928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6129251158678455388} + 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: 6924042386595941345} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!222 &1441396485296937008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6129251158678455388} + m_CullTransparentMesh: 0 +--- !u!114 &6924042386595941345 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6129251158678455388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &6918866875061293507 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2423465471356683207} + - component: {fileID: 2626866440542157198} + - component: {fileID: 8789961111911033626} + m_Layer: 5 + m_Name: Contents + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2423465471356683207 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6918866875061293507} + 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: 1048101660349373980} + - {fileID: 2221885512223848565} + m_Father: {fileID: 1047325092235970838} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2626866440542157198 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6918866875061293507} + m_CullTransparentMesh: 0 +--- !u!114 &8789961111911033626 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6918866875061293507} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fcf53bbee510dca40b2f81e3c0d426c6, type: 3} + m_Name: + m_EditorClassIdentifier: + tweenSequeue: + - initV3: {x: 0, y: -355, z: 0} + initFloat: 0 + isInit: 0 + changeV3: {x: 0, y: -38.5, z: 0} + changeFloat: 0 + duration: 0.8 + delay: 0 + curveType: 10 + changeType: 0 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 2423465471356683207} + - initV3: {x: 0, y: 0, z: 0} + initFloat: 0 + isInit: 0 + changeV3: {x: 0, y: 0, z: 0} + changeFloat: 1 + duration: 1 + delay: 0 + curveType: 7 + changeType: 8 + sequeueType: 1 + loop: 0 + loopType: 0 + targetObj: {fileID: 2423465471356683207} + isPlayAudio: 1 + isHaveCloseBtn: 0 + isPlayOnOpen: 1 +--- !u!1 &7290619288221516257 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8903710139760804361} + - component: {fileID: 3531939111863712032} + - component: {fileID: 4301251597130181692} + m_Layer: 0 + m_Name: limit2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8903710139760804361 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7290619288221516257} + 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: 8620459858479164681} + 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: -26.3, y: -38.6} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3531939111863712032 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7290619288221516257} + m_CullTransparentMesh: 0 +--- !u!114 &4301251597130181692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7290619288221516257} + 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.27058825, g: 0.14901961, b: 0.03529412, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "80\u7EA7\u540E\u53EF\u9009" + LanguageIndex: 0 +--- !u!1 &8052020371798592084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5440593123132818074} + - component: {fileID: 6871265040969598629} + - component: {fileID: 731641907333267882} + m_Layer: 5 + m_Name: Bg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5440593123132818074 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8052020371798592084} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 100} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 444174996902775064} + 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: 52, y: 52} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6871265040969598629 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8052020371798592084} + m_CullTransparentMesh: 0 +--- !u!114 &731641907333267882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8052020371798592084} + 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: d1e04308c0a66644a804a2800a96d3a2, 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 &8091251771609615643 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 886790496823652559} + - component: {fileID: 1594211010499769338} + - component: {fileID: 5329484661387765801} + m_Layer: 0 + m_Name: limit1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &886790496823652559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8091251771609615643} + 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: 8620459858479164681} + 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: -28, y: -8.9} + m_SizeDelta: {x: 100, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1594211010499769338 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8091251771609615643} + m_CullTransparentMesh: 0 +--- !u!114 &5329484661387765801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8091251771609615643} + 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.27058825, g: 0.14901961, b: 0.03529412, 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: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u4EC5\u9650\u7B2C\u4E8C\u5C42" + LanguageIndex: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab.meta b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab.meta similarity index 74% rename from Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab.meta rename to Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab.meta index 9cd38515a2..16ab3ad876 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab.meta +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0b7c27abfac73be42a4ece4fdfac542f +guid: c6db2069ee4ece94ea2e679e7ac05cbc PrefabImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab deleted file mode 100644 index c3174a97d4..0000000000 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralRewardPopup.prefab +++ /dev/null @@ -1,521 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1116927058785068034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 907479869567701112} - - component: {fileID: 909305791854918476} - - component: {fileID: 1013325459502896930} - m_Layer: 5 - m_Name: GeneralRewardPopup - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &907479869567701112 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116927058785068034} - 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: 907778881421333200} - - {fileID: 908397081887868786} - - {fileID: 907663269056220116} - - {fileID: 908447241345478148} - 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!223 &909305791854918476 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116927058785068034} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &1013325459502896930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116927058785068034} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &1116972295493209446 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 907778881421333200} - - component: {fileID: 905988923829170810} - - component: {fileID: 1013435931171085182} - m_Layer: 5 - m_Name: maskImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &907778881421333200 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116972295493209446} - 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: 907479869567701112} - 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 &905988923829170810 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116972295493209446} - m_CullTransparentMesh: 0 ---- !u!114 &1013435931171085182 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116972295493209446} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.78431374} - 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 &1117139944955683884 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 907660511917920300} - - component: {fileID: 906305051299597948} - - component: {fileID: 1014154263177250138} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &907660511917920300 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117139944955683884} - 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: 908397081887868786} - 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: -48.5} - m_SizeDelta: {x: -26, y: -123} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &906305051299597948 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117139944955683884} - m_CullTransparentMesh: 0 ---- !u!114 &1014154263177250138 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117139944955683884} - 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: 9658c5a8f1777e74d9a8915414aaa5ac, 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 &1117772445239155068 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 907663269056220116} - - component: {fileID: 905304791133416756} - - component: {fileID: 1014219414974421902} - - component: {fileID: 1014190724801268530} - - component: {fileID: 5186647702405293178} - m_Layer: 5 - m_Name: btnBack - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &907663269056220116 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117772445239155068} - 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: 907479869567701112} - 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: 417, y: 616} - m_SizeDelta: {x: 142, y: 131} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &905304791133416756 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117772445239155068} - m_CullTransparentMesh: 0 ---- !u!114 &1014219414974421902 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117772445239155068} - 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: 35da2f4636803c446b5f488a6f757f93, 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 &1014190724801268530 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117772445239155068} - 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: 1014219414974421902} - 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 &5186647702405293178 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117772445239155068} - 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 &1117800403748449258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 908447241345478148} - - component: {fileID: 905325434429553504} - - component: {fileID: 4997509925506180063} - m_Layer: 5 - m_Name: Title - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &908447241345478148 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117800403748449258} - 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: 907479869567701112} - 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: -4, y: 595} - m_SizeDelta: {x: 250, y: 93.4} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &905325434429553504 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117800403748449258} - m_CullTransparentMesh: 0 ---- !u!114 &4997509925506180063 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117800403748449258} - 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.97647065, g: 0.89019614, b: 0.7137255, 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: 45 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 1 - m_MaxSize: 100 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: "\u6700\u7EC8\u5956\u52B1" - LanguageIndex: 10055 ---- !u!1 &1117964228733807134 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 908397081887868786} - - component: {fileID: 905394336783618302} - - component: {fileID: 1014108094059729070} - m_Layer: 5 - m_Name: bgImage - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &908397081887868786 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117964228733807134} - 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: 907660511917920300} - m_Father: {fileID: 907479869567701112} - 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.19999999, y: -14.6} - m_SizeDelta: {x: 917, y: 1336} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &905394336783618302 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117964228733807134} - m_CullTransparentMesh: 0 ---- !u!114 &1014108094059729070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1117964228733807134} - 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: 3e71ed27c496acc4b92fe95a6e2d6339, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab index d128740373..03d1f28418 100644 --- a/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab @@ -2816,6 +2816,145 @@ MonoBehaviour: m_ChildForceExpandHeight: 1 m_ChildControlWidth: 0 m_ChildControlHeight: 0 +--- !u!1 &226954152480910776 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 424908658516270379} + - component: {fileID: 4981646034961737949} + - component: {fileID: 8020067412684962006} + - component: {fileID: 59982477161185081} + - component: {fileID: 4952943771223799575} + m_Layer: 5 + m_Name: CancelBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &424908658516270379 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 226954152480910776} + 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: 8431793784240067069} + m_Father: {fileID: 1557565913901413994} + 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: -208.4, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4981646034961737949 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 226954152480910776} + m_CullTransparentMesh: 0 +--- !u!114 &8020067412684962006 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 226954152480910776} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &59982477161185081 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 226954152480910776} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 8020067412684962006} + 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 &4952943771223799575 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 226954152480910776} + 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 &243862882516282283 GameObject: m_ObjectHideFlags: 0 @@ -6117,6 +6256,41 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u53D6 \u6D88" LanguageIndex: 10407 +--- !u!1 &1391876571049735074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5782088423025344887} + m_Layer: 5 + m_Name: Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5782088423025344887 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1391876571049735074} + 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: 1557565913901413994} + 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: 810.6, y: 341} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1407263221980730447 GameObject: m_ObjectHideFlags: 0 @@ -6242,6 +6416,145 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u8BBE \u7F6E" LanguageIndex: 11266 +--- !u!1 &1488530099621652730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6296532974758491347} + - component: {fileID: 2012263460902141515} + - component: {fileID: 1446344149449128426} + - component: {fileID: 4469387348050159153} + - component: {fileID: 8872358619853994959} + m_Layer: 5 + m_Name: ConfirmBtn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6296532974758491347 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488530099621652730} + 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: 35085352120810994} + m_Father: {fileID: 1557565913901413994} + 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: 168.20007, y: -265.09998} + m_SizeDelta: {x: 250, y: 110} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2012263460902141515 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488530099621652730} + m_CullTransparentMesh: 0 +--- !u!114 &1446344149449128426 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488530099621652730} + 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: f615ecdbbffd77f4b89afe678ee4d8d5, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &4469387348050159153 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488530099621652730} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 3 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 21300000, guid: 22a363a0a33620f419259e82ebf04f91, + type: 3} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1446344149449128426} + 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 &8872358619853994959 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1488530099621652730} + 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 &1494693370113232633 GameObject: m_ObjectHideFlags: 0 @@ -6379,6 +6692,86 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &1510889268279029016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8431793784240067069} + - component: {fileID: 6497207360957518235} + - component: {fileID: 2736045024447834383} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8431793784240067069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510889268279029016} + 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: 424908658516270379} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6497207360957518235 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510889268279029016} + m_CullTransparentMesh: 0 +--- !u!114 &2736045024447834383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1510889268279029016} + 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.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u53D6 \u6D88" + LanguageIndex: 10407 --- !u!1 &1529907690386763765 GameObject: m_ObjectHideFlags: 0 @@ -7232,6 +7625,86 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: 200000 +--- !u!1 &1828069589053703228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6362333835603005773} + - component: {fileID: 8682678567531668848} + - component: {fileID: 51657070935422519} + m_Layer: 5 + m_Name: TitleText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6362333835603005773 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828069589053703228} + 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: 1557565913901413994} + 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: 305.83} + m_SizeDelta: {x: 384.31, y: 64.41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8682678567531668848 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828069589053703228} + m_CullTransparentMesh: 0 +--- !u!114 &51657070935422519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1828069589053703228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, 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: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u8BBE \u7F6E" + LanguageIndex: 11266 --- !u!1 &1852619322439489073 GameObject: m_ObjectHideFlags: 0 @@ -16043,6 +16516,7 @@ RectTransform: - {fileID: 2914639370473405139} - {fileID: 1862710656635992255} - {fileID: 2758163025445982036} + - {fileID: 1557565913901413994} m_Father: {fileID: 4982919456788885506} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16266,6 +16740,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4426633055309504765 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 35085352120810994} + - component: {fileID: 6063848363079037380} + - component: {fileID: 44617895338175281} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &35085352120810994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4426633055309504765} + 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: 6296532974758491347} + 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.00000047684, y: 0.00000095367} + m_SizeDelta: {x: 157.13, y: 65.07} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6063848363079037380 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4426633055309504765} + m_CullTransparentMesh: 0 +--- !u!114 &44617895338175281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4426633055309504765} + 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.09019608, g: 0.13725491, b: 0.16470589, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 45 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 4 + m_MaxSize: 50 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\u4F7F \u7528" + LanguageIndex: 11274 --- !u!1 &4502575453775152244 GameObject: m_ObjectHideFlags: 0 @@ -22249,6 +22803,54 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u524D\u5F80\u6FC0\u6D3B" +--- !u!1 &6625910927854669952 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1557565913901413994} + - component: {fileID: 61111843578818670} + m_Layer: 5 + m_Name: GeneralPopup_YiJingBaoKuConfirm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1557565913901413994 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6625910927854669952} + 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: 6362333835603005773} + - {fileID: 5782088423025344887} + - {fileID: 424908658516270379} + - {fileID: 6296532974758491347} + m_Father: {fileID: 2925180131101153177} + m_RootOrder: 30 + 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 &61111843578818670 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6625910927854669952} + m_CullTransparentMesh: 0 --- !u!1 &6665746340220441834 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 6ce5c96d66..a1a690c5e0 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -525,6 +525,7 @@ UpViewRechargeType = { PuTiZi = 1203,--菩提子 XianLingCao = 1202,--仙灵草 YHMF= 21,--妖魂魔符 + DingKunShenChu = 1004,-- 定卦神锄 } SHOP_PAGE = { @@ -1881,6 +1882,7 @@ GENERAL_POPUP_TYPE={ PokemonRestore = 27,--灵兽还原 PokemonCompound = 28,--灵兽合成 SheJiCheckGuild = 29, --社稷大典检查是否加入公会 + YiJingBaoKuConfirm = 31,--易经宝库奖励确认 --大号通用弹窗 YiJingBaoKu = 30,--易经宝库 diff --git a/Assets/ManagedResources/~Lua/Data/UIData.lua b/Assets/ManagedResources/~Lua/Data/UIData.lua index 0d4358d0f3..d08b97e95f 100644 --- a/Assets/ManagedResources/~Lua/Data/UIData.lua +++ b/Assets/ManagedResources/~Lua/Data/UIData.lua @@ -354,7 +354,7 @@ UIName = { PokemonSkillInfoPopup=353,--灵兽当前技能详情 PokemonSingleResultPanel=354,--灵兽 GeneralRewardPopup = 355,--通用奖励领取弹窗 - GeneralRewardPopup = 357,--通用奖励界面 + GeneralBigPopup = 357,--通用大弹窗界面 } SubUIConfig = { diff --git a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua index 27371cc5a8..f6fc0129a6 100644 --- a/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/ActivityProto_pb.lua @@ -15,6 +15,7 @@ GETSHEJIAWARDRESPONSE = protobuf.Descriptor(); GETSHEJIAWARDRESPONSE_DROP_FIELD = protobuf.FieldDescriptor(); SELETSUBREWARDPOOLREQUEST = protobuf.Descriptor(); SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD = protobuf.FieldDescriptor(); +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD = protobuf.FieldDescriptor(); SELETSUBREWARDPOOLRESPONSE = protobuf.Descriptor(); COMMITSHEJIACTIVITYITEMREQUEST_ITEMID_FIELD.name = "itemId" @@ -107,11 +108,21 @@ SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD.default_value = 0 SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD.type = 5 SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD.cpp_type = 1 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.name = "activityId" +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.full_name = ".com.ljsd.jieling.protocols.SeletSubRewardPoolRequest.activityId" +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.number = 2 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.index = 1 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.label = 1 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.has_default_value = false +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.default_value = 0 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.type = 5 +SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD.cpp_type = 1 + SELETSUBREWARDPOOLREQUEST.name = "SeletSubRewardPoolRequest" SELETSUBREWARDPOOLREQUEST.full_name = ".com.ljsd.jieling.protocols.SeletSubRewardPoolRequest" SELETSUBREWARDPOOLREQUEST.nested_types = {} SELETSUBREWARDPOOLREQUEST.enum_types = {} -SELETSUBREWARDPOOLREQUEST.fields = {SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD} +SELETSUBREWARDPOOLREQUEST.fields = {SELETSUBREWARDPOOLREQUEST_SELECTID_FIELD, SELETSUBREWARDPOOLREQUEST_ACTIVITYID_FIELD} SELETSUBREWARDPOOLREQUEST.is_extendable = false SELETSUBREWARDPOOLREQUEST.extensions = {} SELETSUBREWARDPOOLRESPONSE.name = "SeletSubRewardPoolResponse" diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua index d95ca2370f..c430f8799e 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityManager.lua @@ -73,11 +73,14 @@ function this.GetBaoKuData() local v = ActInfo.mission[i] if v.missionId < 100 then local data = {} + data.Id = v.missionId data.rewardId = v.progress data.reward = {} if v.progress ~= 0 then data.reward = RewardAllConfig[v.progress].Reward + data.configId = RewardAllConfig[v.progress].Id end + LogGreen("missionId:"..v.missionId.." v.progress:"..v.progress.." ") table.insert(finalCardDatas,data) end end @@ -96,6 +99,7 @@ function this.GetBaoKuData() local data = {} data.rewardId = v.missionId-1000 data.progress = v.progress + data.configId = RewardAllConfig[data.rewardId].Id table.insert(allData,data) end end @@ -126,6 +130,7 @@ function this.GetBaoKuData() actData.curFinalPool = curFinalPool actData.selectId = ActInfo.value actData.endTime = ActInfo.endTime + LogPink("ActInfo.endTime:"..ActInfo.endTime) actData.initCardDatas = initCardDatas actData.finalCardDatas = finalCardDatas @@ -134,4 +139,13 @@ function this.GetBaoKuData() return actData end +-- function this.GetLeftRewardData() +-- local finalRewardData = {} +-- local actData = this.GetBaoKuData() +-- local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",actData.curFinalPool) +-- local index = 1 +-- for i = 1, #RewardConfig do +-- end +-- end + return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index 30f22f7207..8515eb5898 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -4,9 +4,12 @@ local _itemsList = {} local _itemsPosList={} local itemViewList = {} -local ActInfo = {} +local ActData = {} local sortingOrder = 0 local parent +local finalReward = nil + +local BlessingConfig = ConfigManager.GetConfig(ConfigName.BlessingRewardPoolNew) function YiJingBaoKu:ctor(mainPanel, gameObject) self.mainPanel = mainPanel @@ -21,6 +24,7 @@ function YiJingBaoKu:InitComponent(gameObject) this.itemFinal = Util.GetGameObject(gameObject, "top/reward/icon") this.addBtn = Util.GetGameObject(gameObject, "top/reward/add") this.refrashBtn = Util.GetGameObject(gameObject, "top/reward/refrash") + this.tip = Util.GetGameObject(gameObject, "top/reward/tips/Text"):GetComponent("Text") --leftUp this.leftTime = Util.GetGameObject(gameObject, "leftUp/time"):GetComponent("Text") --rightUp @@ -37,20 +41,21 @@ end --绑定事件(用于子类重写) function YiJingBaoKu:BindEvent() Util.AddClick(this.addBtn,function() - LogYellow("选择最终奖励") - UIManager.OpenPanel(UIName.GeneralRewardPopup) - -- NetManager.SelectFinalRewardRequest(61,function () - -- LogYellow("选择完了") - -- end) + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.YiJingBaoKu,ActData,function() + YiJingBaoKu:SetFinalReward() + YiJingBaoKu:FrontToBack() + end) end) Util.AddClick(this.refrashBtn,function() - LogYellow("更换最终奖励") - YiJingBaoKu:FrontToBack()--测试用 + UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.YiJingBaoKu,ActData,function() + YiJingBaoKu:SetFinalReward() + end) end) Util.AddClick(this.helpBtn,function() LogYellow("帮助按钮") + YiJingBaoKu:FrontToBack()--测试用 end) Util.AddClick(this.rewardPre,function() @@ -60,12 +65,10 @@ end --添加事件监听(用于子类重写) function YiJingBaoKu:AddListener() - end --移除事件监听(用于子类重写) function YiJingBaoKu:RemoveListener() - end --界面打开时调用(用于子类重写) function YiJingBaoKu:OnOpen() @@ -82,27 +85,89 @@ function YiJingBaoKu:OnShow(_sortingOrder,_parent) end + +--刷新 function YiJingBaoKu:Refresh() - ActInfo = DynamicActivityManager.GetBaoKuData() - if ActInfo.selectId == 0 then--如果没有选择了最终奖励 + LogRed("zheliyouyicishuaxin ") + ActData = DynamicActivityManager.GetBaoKuData() + if ActData.selectId == 0 then--如果没有选择了最终奖励 YiJingBaoKu:ResetCardToFront()--把卡片全部翻到正面 - YiJingBaoKu:InitSetAllCard() - YiJingBaoKu:AddBackToFrontClick()--增加背面的带点击事件 + YiJingBaoKu:InitSetAllCard()--显示所有奖励 else--选择了最终奖励 YiJingBaoKu:ResetCardToBack()--把卡片全部翻到背面 + YiJingBaoKu:SetFinalReward()--设置最终奖励 YiJingBaoKu:SetCardData()--把抽取过的卡翻过来 - YiJingBaoKu:AddBackToFrontClick()--增加背面的带点击事件 end + -- YiJingBaoKu:TimeCountDown()--时间 + YiJingBaoKu:AddBackToFrontClick()--增加背面的带点击事件 + + this.refrashBtn:SetActive(ActData.selectId ~= 0) + this.name.text = "第"..NumToSimplenessFont[ActData.curLevel].."层" end + +function YiJingBaoKu:SetCardData() + for i = 1, #ActData.finalCardDatas do + local v = ActData.finalCardDatas[i] + if v.rewardId ~= 0 then + local item = _itemsList[i] + local cFront = Util.GetGameObject(item, "front") + local cBack = Util.GetGameObject(item, "back") + if not itemViewList[i] then + itemViewList[i] = SubUIManager.Open(SubUIConfig.ItemView,cFront.transform) + end + itemViewList[i]:OnOpen(false, v.reward, 1.1, false, false, false, sortingOrder) + itemViewList[i].transform.localPosition = Vector2.New(-73.5,78.5) + cFront:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 0, 0)) + cBack:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 90, 0)) + + end + end +end + +function YiJingBaoKu:SetFinalReward() + ActData = DynamicActivityManager.GetBaoKuData() + if not finalReward then + finalReward = SubUIManager.Open(SubUIConfig.ItemView,this.addBtn.transform) + end + finalReward:OnOpen(false, BlessingConfig[ActData.selectId].Reward, 1.1, false, false, false, sortingOrder) + finalReward.transform.localPosition = Vector2.New(-73.5,78.5) +end + --初始化给所有坑赋值 function YiJingBaoKu:InitSetAllCard() for i = 1, #_itemsList do - if ActInfo.initCardDatas[i].reward then - YiJingBaoKu:SetSingleCardData(i,_itemsList[i],ActInfo.initCardDatas[i].reward) + if ActData.initCardDatas[i].reward then + YiJingBaoKu:SetSingleCardData(i,_itemsList[i],ActData.initCardDatas[i].reward) end end end + +----单个的卡增加点击 +function YiJingBaoKu:AddBackToFrontClick() + for index, value in ipairs(_itemsList) do + local cFront = Util.GetGameObject(value, "front") + local cBack = Util.GetGameObject(value, "back") + Util.AddOnceClick(cBack,function() + --请求奖励 + LogYellow("请求的MissionId:"..ActData.finalCardDatas[index].Id) + NetManager.GetActivityRewardRequest(ActData.finalCardDatas[index].Id,ActData.activityId,function (drop) + YiJingBaoKu:SetSingleCardData(index,value,{drop.itemlist[1].itemId,drop.itemlist[1].itemNum}) + local thread=coroutine.start(function() + cBack.transform:DORotate(Vector3.New(0, 90, 0), 0.3) + coroutine.wait(0.3) + cFront.transform:DORotate(Vector3.New(0, 0, 0), 0.3) + coroutine.wait(0.2) + UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function () + if drop.itemlist[1].itemId == BlessingConfig[ActData.selectId].Reward[1] then + YiJingBaoKu:Refresh() + end + end) + end) + end) + end) + end +end --单个翻卡赋值 function YiJingBaoKu:SetSingleCardData(index,item,reward) local root = Util.GetGameObject(item,"front") @@ -113,27 +178,7 @@ function YiJingBaoKu:SetSingleCardData(index,item,reward) itemViewList[index].transform.localPosition = Vector2.New(-73.5,78.5) end -function YiJingBaoKu:AddBackToFrontClick() - for index, value in ipairs(_itemsList) do--单个的 背->正 - local cFront = Util.GetGameObject(value, "front") - local cBack = Util.GetGameObject(value, "back") - Util.AddOnceClick(cBack,function() - - - --请求奖励 - LogYellow("请求奖励!") - YiJingBaoKu:SetSingleCardData(index,value,{16,22})--点击后请求数据,然后播动画 - - local thread=coroutine.start(function() - cBack.transform:DORotate(Vector3.New(0, 90, 0), 0.3) - coroutine.wait(0.3) - cFront.transform:DORotate(Vector3.New(0, 0, 0), 0.3) - coroutine.wait(0.2) - end) - end) - end -end - +--所有奖励翻面 function YiJingBaoKu:FrontToBack() local thread=coroutine.start(function() for index, value in ipairs(_itemsList) do @@ -155,7 +200,7 @@ function YiJingBaoKu:FrontToBack() end end) end - +--把所有卡置为正面 function YiJingBaoKu:ResetCardToFront() for index, value in ipairs(_itemsList) do local cFront = Util.GetGameObject(value, "front") @@ -166,7 +211,7 @@ function YiJingBaoKu:ResetCardToFront() cBack:GetComponent("RectTransform").rotation = Quaternion.Euler(Vector3.New(0, 90, 0)) end end - +--把所有卡置为背面 function YiJingBaoKu:ResetCardToBack() for index, value in ipairs(_itemsList) do local cFront = Util.GetGameObject(value, "front") @@ -178,6 +223,27 @@ function YiJingBaoKu:ResetCardToBack() end end +--时间 +function YiJingBaoKu:TimeCountDown() + local time = ActData.endTime - GetTimeStamp() + this.leftTime.text = Language[10028]..TimeToFelaxible(time) + if this.timer1 then + this.timer1:Stop() + this.timer1 = nil + end + this.timer1 = Timer.New(function() + this.leftTime.text = Language[10028]..TimeToFelaxible(time) + + if time < 1 then + this.timer1:Stop() + this.timer1 = nil + YiJingBaoKu:ClosePanel() + end + time = time -1 + end, 1, -1, true) + this.timer1:Start() +end + function YiJingBaoKu:OnClose() end @@ -187,10 +253,14 @@ function YiJingBaoKu:OnDestroy() _itemsList = {} _itemsPosList={} itemViewList = {} + finalReward = nil end function YiJingBaoKu:OnHide() - + if this.timer1 then + this.timer1:Stop() + this.timer1 = nil + end end diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua similarity index 77% rename from Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua rename to Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua index ee66b1208d..02af1e801e 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua @@ -1,13 +1,13 @@ ----- 中号通用弹窗 ----- require("Base/BasePanel") -GeneralRewardPopup = Inherit(BasePanel) -local this = GeneralRewardPopup +GeneralBigPopup = Inherit(BasePanel) +local this = GeneralBigPopup local sorting = 0 --子模块脚本 local contentScripts = { --易经宝库 - [1] = {view = require("Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu"), panelName = "GeneralRewardPopup_YiJingBaoKu",type=GENERAL_POPUP_TYPE.YiJingBaoKu}, + [1] = {view = require("Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu"), panelName = "GeneralBigPopup_YiJingBaoKu",type=GENERAL_POPUP_TYPE.YiJingBaoKu}, } --子模块预设 local contentPrefabs={} @@ -17,7 +17,7 @@ local popupType local index=0 --初始化组件(用于子类重写) -function GeneralRewardPopup:InitComponent() +function GeneralBigPopup:InitComponent() this.contents=Util.GetGameObject(this.gameObject,"Contents") this.backBtn=Util.GetGameObject(this.contents,"BG/BackBtn") this.BG=Util.GetGameObject(this.contents,"BG") @@ -34,7 +34,7 @@ function GeneralRewardPopup:InitComponent() end --绑定事件(用于子类重写) -function GeneralRewardPopup:BindEvent() +function GeneralBigPopup:BindEvent() for i = 1, #contentScripts do contentScripts[i].view:BindEvent() end @@ -45,23 +45,23 @@ function GeneralRewardPopup:BindEvent() end) end -function GeneralRewardPopup:AddListener() +function GeneralBigPopup:AddListener() for i = 1, #contentScripts do contentScripts[i].view:AddListener() end end -function GeneralRewardPopup:RemoveListener() +function GeneralBigPopup:RemoveListener() for i = 1, #contentScripts do contentScripts[i].view:RemoveListener() end end -function GeneralRewardPopup:OnSortingOrderChange() +function GeneralBigPopup:OnSortingOrderChange() this.sortingOrder = self.sortingOrder end local onOpenArgs--临时接的参数 需要onshow刷新的调用 -function GeneralRewardPopup:OnOpen(popupType,...) +function GeneralBigPopup:OnOpen(popupType,...) onOpenArgs = ... --根据传入类型打开对应面板 LogGreen(Language[11561]..popupType) @@ -81,19 +81,19 @@ function GeneralRewardPopup:OnOpen(popupType,...) contentScripts[index].view:OnShow(this,...)--1、传入自己 2、传入不定参 end -function GeneralRewardPopup:OnShow() +function GeneralBigPopup:OnShow() end -function GeneralRewardPopup:OnClose() +function GeneralBigPopup:OnClose() for i = 1, #contentScripts do contentScripts[i].view:OnClose() end end -function GeneralRewardPopup:OnDestroy() +function GeneralBigPopup:OnDestroy() for i = 1, #contentScripts do contentScripts[i].view:OnDestroy() end end -return RewardSelectPopup \ No newline at end of file +return GeneralBigPopup \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua.meta similarity index 74% rename from Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua.meta rename to Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua.meta index 9f4abd1894..66cd8d2645 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua.meta +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f570f0276bb1619459df5a50959cf7c9 +guid: 718272f399b22684fba6e8a863e3307a DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua new file mode 100644 index 0000000000..9e45728b6d --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua @@ -0,0 +1,126 @@ +----- 易经宝库弹窗 ----- +local this = {} +--传入父脚本模块 +local parent +--传入特效层级 +local sortingOrder=0 +local curId = nil--当前已选择的物品的Id +local ActData = {} +local itemList = {}--克隆预制体列表 +local goList = {}--勾选按钮列表 +local itemIconList={}--ItemView的List +local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig) +local _args +local func + +function this:InitComponent(gameObject) + this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") + this.itemPre = Util.GetGameObject(gameObject, "itemPre") + this.ConfirmBtn = Util.GetGameObject(gameObject, "ConfirmBtn") + this.Scroll = Util.GetGameObject(gameObject, "Scroll") + + local rootHight = this.Scroll.transform.rect.height + local width = this.Scroll.transform.rect.width + this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.Scroll.transform, + this.itemPre, nil, Vector2.New(width, rootHight), 1, 2, Vector2.New(0, 0)) + this.ScrollView.moveTween.MomentumAmount = 1 + this.ScrollView.moveTween.Strength = 2 +end + +function this:BindEvent() + Util.AddClick(this.ConfirmBtn,function() + if curId then + -- NetManager.SelectFinalRewardRequest(curId,ActData.activityId,function () + -- if func then + -- func() + -- end + -- parent:ClosePanel() + -- end) + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.YiJingBaoKuConfirm,curId,function() + -- parent:ClosePanel() + NetManager.SelectFinalRewardRequest(curId,ActData.activityId,function () + if func then + func() + end + parent:ClosePanel() + end) + end) + else + PopupTipPanel.ShowTip(Language[11796]) + end + end) +end + +function this:AddListener() +end + +function this:RemoveListener() +end + +function this:OnShow(_parent,...) + + itemList={} + parent=_parent + sortingOrder = _parent.sortingOrder + --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 + _args = {...} + ActData = _args[1] + func = _args[2] + this.titleText.text = "选择最终奖励" + curId = ActData.selectId or nil + local RewardConfig = ConfigManager.GetAllConfigsDataByKey(ConfigName.BlessingRewardPoolNew,"PoolId",ActData.curFinalPool) + this.ScrollView:SetData(RewardConfig, function(index, go) + this:SetSingleData(index,go, RewardConfig[index]) + end) + +end + +function this:SetSingleData(index,item,data) + itemList[index] = item + local icon = Util.GetGameObject(item,"icon") + local name = Util.GetGameObject(item,"name"):GetComponent("Text") + local tip = Util.GetGameObject(item,"text"):GetComponent("Text") + local select = Util.GetGameObject(item,"select") + local go = Util.GetGameObject(item,"select/Go") + + goList[index] = go + + item:SetActive(true) + if not itemIconList[item] then + local view = SubUIManager.Open(SubUIConfig.ItemView, icon.transform) + itemIconList[item] = view + end + itemIconList[item]:OnOpen(false,data.Reward,0.9,false) + name.text = itemConfig[data.Reward[1]].Name + + + --判断是否选了该物品 + if curId == data.Id then + go:SetActive(true) + else + go:SetActive(false) + end + --选择一个物品 + Util.AddOnceClick(select,function() + if go.gameObject.activeSelf then + go:SetActive(false) + curId = nil + else + for index, value in ipairs(goList) do + goList[index]:SetActive(false) + end + go:SetActive(true) + curId = data.Id + end + end) +end + +function this:OnClose() + +end + +function this:OnDestroy() + itemIconList={} +end + +return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua.meta b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua.meta similarity index 74% rename from Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua.meta rename to Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua.meta index 50d27c08dc..aa0d25a74f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralRewardPopup.lua.meta +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_YiJingBaoKu.lua.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 81a066fd0892dd34fafa15155140ac96 +guid: 31783af3dae31ab42a76647db034937d DefaultImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 20dff2ff48..c184229d1c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -4716,9 +4716,11 @@ function this.GetSheJiRewardRequest(id,func) end --易经宝库选择最终奖励 -function this.SelectFinalRewardRequest(id,func) +function this.SelectFinalRewardRequest(id,activityId,func) local data = ActivityProto_pb.SeletSubRewardPoolRequest() + LogPink("selectId:"..id.." activityId:"..activityId) data.selectId = id + data.activityId = activityId local msg = data:SerializeToString() Network:SendMessageWithCallBack(MessageTypeProto_pb.SeletSubRewardPoolRequest, MessageTypeProto_pb.SeletSubRewardPoolResponse, msg, function(buffer) local data = buffer:DataByte() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua index 66b82d7a5f..478a1b424c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua @@ -59,6 +59,8 @@ local contentScripts = { [24] = {view = require("Modules/Popup/View/GeneralPopup_XiaoYaoYouItemExchange"), panelName = "GeneralPopup_XiaoYaoYouItemExchange",type=GENERAL_POPUP_TYPE.XiaoYaoYouItemExchange}, --社稷大典检查是否加入工会 [29] = {view = require("Modules/Popup/View/GeneralPopup_SheJiCheckGuild"), panelName = "GeneralPopup_SheJiCheckGuild",type=GENERAL_POPUP_TYPE.SheJiCheckGuild}, + --YiJingBaoKuConfirm + [30] = {view = require("Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm"), panelName = "GeneralPopup_YiJingBaoKuConfirm",type=GENERAL_POPUP_TYPE.YiJingBaoKuConfirm}, } --子模块预设 local contentPrefabs={} diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua similarity index 50% rename from Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua rename to Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua index 9826ebae5c..b016ca9c82 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralRewardPopup_YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua @@ -1,17 +1,32 @@ ------ 易经宝库弹窗 ----- +----- YiJingBaoKuConfirm二次确认弹窗 ----- local this = {} --传入父脚本模块 local parent --传入特效层级 local sortingOrder=0 +local selectId = nil +local func + function this:InitComponent(gameObject) this.titleText=Util.GetGameObject(gameObject,"TitleText"):GetComponent("Text") this.root = Util.GetGameObject(gameObject, "Root") + this.confirm = Util.GetGameObject(gameObject, "ConfirmBtn") + this.cancel = Util.GetGameObject(gameObject, "CancelBtn") + this.btn=Util.GetGameObject(this.root,"Btn1") + this.rootText=Util.GetGameObject(this.root,"Text"):GetComponent("Text") end function this:BindEvent() - + Util.AddClick(this.confirm,function() + parent:ClosePanel() + if func then + func() + end + end) + Util.AddClick(this.cancel,function() + parent:ClosePanel() + end) end function this:AddListener() @@ -25,9 +40,10 @@ function this:OnShow(_parent,...) sortingOrder = _parent.sortingOrder --不定参中包含的不定参 _args[1]为面板类型 _args[2]之后(包括)为打开面板后传入的不定参 local _args = {...} - - this.titleText.text=Language[11649] - + func = _args[2] + selectId = _args[1] + this.titleText.text=Language[11351] + LogPink("selectId:"..selectId) end function this:OnClose() diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua.meta b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua.meta new file mode 100644 index 0000000000..0e907a6814 --- /dev/null +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_YiJingBaoKuConfirm.lua.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: add35a11ba7de044ab0cecb0b3e09f50 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index 6e81bdef2d..5768fca4ae 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -48,6 +48,7 @@ local _ShowPlusType = { UpViewRechargeType.XianLingCao, UpViewRechargeType.PuTiZi, UpViewRechargeType.YHMF, + UpViewRechargeType.DingKunShenChu, } -- 判断是否显示加号 @@ -302,7 +303,8 @@ function UpView:RechargeType(_type) _type == UpViewRechargeType.EliteCarbonTicket or _type == UpViewRechargeType.LightRing or _type == UpViewRechargeType.AdventureAlianInvasionTicket or - _type == UpViewRechargeType.MonsterCampTicket + _type == UpViewRechargeType.MonsterCampTicket or + _type==UpViewRechargeType.DingKunShenChu then --功能快捷购买 UIManager.OpenPanel(UIName.QuickPurchasePanel, { type = _type })