From 8e7afd757dcb523d381891824f6d09cf196999e5 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 3 Dec 2021 13:21:15 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=BF=9E=E8=B4=AD=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E3=80=91=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/TailsmanSoulView/page17.prefab | 572 +++++++++++++----- .../UI/YuJianXing/YuJianXingPanel.prefab | 434 +++++++++++++ .../~Lua/Common/GlobalDefine.lua | 3 +- .../ManagedResources/~Lua/Data/ConfigData.lua | 12 + .../ContinuePackage/ContinuePackagePanel.lua | 1 - .../Incarnation/IncarnationLottery.lua | 20 +- .../NewActivity/CommonActPageManager.lua | 9 +- .../~Lua/Modules/Player/JumpManager.lua | 10 +- .../Modules/YuJianXing/YuJianXingPanel.lua | 9 + 9 files changed, 915 insertions(+), 155 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page17.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page17.prefab index 7a7893f4ca..d9fca5b238 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page17.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page17.prefab @@ -356,7 +356,7 @@ RectTransform: m_Children: - {fileID: 3650931296287365445} - {fileID: 208247563920512486} - - {fileID: 1478133659566952327} + - {fileID: 8194293037922997897} - {fileID: 2052763838201650754} - {fileID: 3088456174784992059} m_Father: {fileID: 9092643564979373074} @@ -755,6 +755,100 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "17:20:01\u540E\u5237\u65B0" LanguageIndex: 0 +--- !u!1 &1006606800426293481 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2709474512189780291} + - component: {fileID: 8053323340417043049} + - component: {fileID: 900058358508212075} + - component: {fileID: 432983168161692046} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2709474512189780291 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006606800426293481} + 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: 8194293037922997897} + 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: 3.6} + m_SizeDelta: {x: 120, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8053323340417043049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006606800426293481} + m_CullTransparentMesh: 0 +--- !u!114 &900058358508212075 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006606800426293481} + 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: f9195d99260587f49a39e815c6ba7bf6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!95 &432983168161692046 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006606800426293481} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5d9ac99b75d220c43ba06f575523555c, 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 &1032188267913767035 GameObject: m_ObjectHideFlags: 0 @@ -5224,6 +5318,146 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &5372917173411655172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8194293037922997897} + - component: {fileID: 540226444025591795} + - component: {fileID: 6936580327703364241} + - component: {fileID: 653706827631871323} + - component: {fileID: 4945036392171917846} + m_Layer: 5 + m_Name: gift + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8194293037922997897 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372917173411655172} + 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: 2709474512189780291} + - {fileID: 4551506676177150231} + - {fileID: 5237016229843866931} + m_Father: {fileID: 7581135397323237180} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -98, y: -537} + m_SizeDelta: {x: 127, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &540226444025591795 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372917173411655172} + m_CullTransparentMesh: 0 +--- !u!114 &6936580327703364241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372917173411655172} + 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: de99e18ee6101e146b6d63540708cc25, 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 &653706827631871323 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372917173411655172} + 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: 6936580327703364241} + 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 &4945036392171917846 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5372917173411655172} + 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 &5418109465743750851 GameObject: m_ObjectHideFlags: 0 @@ -5436,143 +5670,6 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 ---- !u!1 &5951264760532382814 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1478133659566952327} - - component: {fileID: 3921455369004149686} - - component: {fileID: 3392146986436220068} - - component: {fileID: 5802194934209519600} - - component: {fileID: 1592715990141813970} - m_Layer: 5 - m_Name: gift - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1478133659566952327 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5951264760532382814} - 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: 7581135397323237180} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -98, y: -537} - m_SizeDelta: {x: 127, y: 126} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3921455369004149686 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5951264760532382814} - m_CullTransparentMesh: 0 ---- !u!114 &3392146986436220068 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5951264760532382814} - 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: c442deb28ec49054c81a10ef86ac1a6e, 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 &5802194934209519600 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5951264760532382814} - 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: 3392146986436220068} - 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 &1592715990141813970 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5951264760532382814} - 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 &6022136044167938765 GameObject: m_ObjectHideFlags: 0 @@ -6278,6 +6375,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6750534749219147999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4551506676177150231} + - component: {fileID: 3053920817503386870} + - component: {fileID: 8442146170366903197} + m_Layer: 5 + m_Name: Img2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4551506676177150231 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750534749219147999} + 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: 8194293037922997897} + 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: -38.8} + m_SizeDelta: {x: 117, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3053920817503386870 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750534749219147999} + m_CullTransparentMesh: 0 +--- !u!114 &8442146170366903197 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6750534749219147999} + 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: 27d3e3bfba04a224c9694ce5e6e9c79f, 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 &6797111253333999040 GameObject: m_ObjectHideFlags: 0 @@ -8037,3 +8208,128 @@ RectTransform: m_AnchoredPosition: {x: -283.00003, y: -84.599945} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &5710229562015433156 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8194293037922997897} + m_Modifications: + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} +--- !u!224 &5237016229843866931 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + m_PrefabInstance: {fileID: 5710229562015433156} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab index 09bc684249..7270a4f3ff 100644 --- a/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/YuJianXing/YuJianXingPanel.prefab @@ -1402,6 +1402,100 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u7ED3\u7B97\u4E2D..." +--- !u!1 &4708228479955925223 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5759901945086065388} + - component: {fileID: 4010778926204752252} + - component: {fileID: 4906111251262924932} + - component: {fileID: 465042832482422077} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5759901945086065388 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4708228479955925223} + 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: 3517775001732346273} + 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: 3.6} + m_SizeDelta: {x: 120, y: 101} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4010778926204752252 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4708228479955925223} + m_CullTransparentMesh: 0 +--- !u!114 &4906111251262924932 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4708228479955925223} + 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: f9195d99260587f49a39e815c6ba7bf6, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!95 &465042832482422077 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4708228479955925223} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5d9ac99b75d220c43ba06f575523555c, 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 &5099154384626080439 GameObject: m_ObjectHideFlags: 0 @@ -1947,6 +2041,146 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6767055720010317139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3517775001732346273} + - component: {fileID: 8409407199220489066} + - component: {fileID: 5541631625022027998} + - component: {fileID: 8131624351463615801} + - component: {fileID: 5060287581761806823} + m_Layer: 5 + m_Name: btnGift + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3517775001732346273 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767055720010317139} + 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: 5759901945086065388} + - {fileID: 4549244193039062657} + - {fileID: 890012991218615477} + m_Father: {fileID: 7925044777977901434} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -524.5, y: -96.9} + m_SizeDelta: {x: 127, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8409407199220489066 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767055720010317139} + m_CullTransparentMesh: 0 +--- !u!114 &5541631625022027998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767055720010317139} + 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: de99e18ee6101e146b6d63540708cc25, 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 &8131624351463615801 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767055720010317139} + 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: 5541631625022027998} + 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 &5060287581761806823 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6767055720010317139} + 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 &7115340748528272079 GameObject: m_ObjectHideFlags: 0 @@ -2955,6 +3189,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8612932943980972125 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4549244193039062657} + - component: {fileID: 6311660134854939644} + - component: {fileID: 1676021174618181143} + m_Layer: 5 + m_Name: Img2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4549244193039062657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8612932943980972125} + 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: 3517775001732346273} + 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: -38.8} + m_SizeDelta: {x: 117, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6311660134854939644 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8612932943980972125} + m_CullTransparentMesh: 0 +--- !u!114 &1676021174618181143 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8612932943980972125} + 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: 27d3e3bfba04a224c9694ce5e6e9c79f, 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 &8896780380840302078 GameObject: m_ObjectHideFlags: 0 @@ -2987,6 +3295,7 @@ RectTransform: - {fileID: 1337108380664959713} - {fileID: 6196910809028164819} - {fileID: 7440755721006350612} + - {fileID: 3517775001732346273} m_Father: {fileID: 9162634963590580069} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3156,3 +3465,128 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &849675176806207554 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 3517775001732346273} + m_Modifications: + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} +--- !u!224 &890012991218615477 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + m_PrefabInstance: {fileID: 849675176806207554} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index c50e9c9bc1..bd7a4940d3 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1171,7 +1171,8 @@ JumpType = { JiTianHaoLi = 20014, --积天豪礼 honglushop = 20274, - fangcunxunbaoShop = 20275, + fangcunxunbaoShop = 20275,--方寸寻宝 + ContinuePackage = 20280,--连购礼包 } NPCPosType={ diff --git a/Assets/ManagedResources/~Lua/Data/ConfigData.lua b/Assets/ManagedResources/~Lua/Data/ConfigData.lua index 9eab451af7..4517cce0d1 100644 --- a/Assets/ManagedResources/~Lua/Data/ConfigData.lua +++ b/Assets/ManagedResources/~Lua/Data/ConfigData.lua @@ -342,6 +342,18 @@ function ConfigManager.TryGetAllConfigsDataByKey(cfgType, key, value) end return expectList end + +---获取某个key值为value的所有条目 +function ConfigManager.TryGetAllConfigsDataByDoubleKey(cfgType, key1, value1, key2, value2) + local expectList = {} + for _, configInfo in ConfigPairs(ConfigManager.GetConfig(cfgType)) do + if configInfo[key1] == value1 and configInfo[key2] == value2 then + table.insert(expectList, configInfo) + end + end + return expectList +end + ---获取某个key值为value的所有条目 function ConfigManager.GetAllConfigsDataByKey(cfgType, key, value) local expectList = {} diff --git a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua index 2408fb6095..07ca99ccf8 100644 --- a/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ContinuePackage/ContinuePackagePanel.lua @@ -191,7 +191,6 @@ function ContinuePackagePanel:ShowSingleHero(go,data,index) end) end) end - PopupTipPanel.ShowTip("购买") elseif data.state == 3 then PopupTipPanel.ShowTip("请先购买上一礼包,即可解锁此礼包") elseif data.state == 2 then diff --git a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationLottery.lua b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationLottery.lua index 6b39975ecd..3c2cc078c1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationLottery.lua +++ b/Assets/ManagedResources/~Lua/Modules/Incarnation/IncarnationLottery.lua @@ -28,6 +28,7 @@ function IncarnationLottery:InitComponent() self.btnReward = Util.GetGameObject(self.rightUp,"reward") self.btnStore = Util.GetGameObject(self.rightUp,"store") self.btnGift = Util.GetGameObject(self.rightUp,"gift") + self.btnGiftEffect = Util.GetGameObject(self.btnGift,"Fx_Circle 1") self.btns = {} for i = 1 , 2 do self.btns[i] = {} @@ -63,23 +64,20 @@ end --绑定事件(用于子类重写) function IncarnationLottery:BindEvent() - Util.AddOnceClick(self.btnHelp, function() - UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) + Util.AddOnceClick(self.btnHelp, function() + UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) end) Util.AddOnceClick(self.btnReward, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.Incarnation,PRE_REWARD_POOL_TYPE.Incarnation) end) - Util.AddOnceClick(self.btnStore, function() + Util.AddOnceClick(self.btnStore, function() JumpManager.GoJump(40049) end) Util.AddOnceClick(self.btnGift,function () - if not self.actData then - return - end - UIManager.OpenPanel(UIName.ContinueGiftPanel, self.actData.activityId) + JumpManager.GoJump(40050,nil,self.actId) end) end @@ -102,12 +100,14 @@ end function IncarnationLottery:OnSortingOrderChange(_sortingOrder) sortingOrder = _sortingOrder or 0 + Util.SetParticleSortLayer(self.btnGiftEffect, sortingOrder+1) end -- 打开,重新打开时回调 function IncarnationLottery:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder + Util.SetParticleSortLayer(self.btnGiftEffect, sortingOrder+1) self.actId = self.actConfig.ActId self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType if self.actConfig.IfBack == 1 then @@ -151,9 +151,9 @@ function IncarnationLottery:contentShow() end function IncarnationLottery:refreshMagicNum() - self.actData = ActivityGiftManager.GetActivityTypeInfo(self.actType) - local isActive = CommonActPageManager.HasContinueGift(self.actData.activityId) - self.btnGift:SetActive(isActive) + -- self.actData = ActivityGiftManager.GetActivityTypeInfo(self.actType) + self.actData = CommonActPageManager.GetData(self.actType) + CommonActPageManager.ShowIcon(self.btnGift,self.actData.activityId) --local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",self.singleRecruit.MergePool) --self.updateTimesTip.text = string.format("召唤%s次必得红色碎片","ff850c",d[1].Count - self.actData.value) diff --git a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua index 2d2c8bb469..1da2d1a5c8 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewActivity/CommonActPageManager.lua @@ -312,7 +312,11 @@ local TypeUpdateFunc = { end, [ActivityTypeDef.ContinuePackage] = function ()--连购礼包 local curData = dataList[ActivityTypeDef.ContinuePackage] - local configData = ConfigManager.GetAllConfigsDataByDoubleKey(ConfigName.ThemeActivityShop,"ActivityId",curData.activityId,"LinkActivityId",this.args[1]) + local configData = ConfigManager.TryGetAllConfigsDataByDoubleKey(ConfigName.ThemeActivityShop,"ActivityId",curData.activityId,"LinkActivityId",this.args[1]) + if #configData <= 0 then + curData = {} + return + end local rechargeConfig = ConfigManager.GetConfig(ConfigName.RechargeCommodityConfig) local goodsConfig = ConfigManager.GetConfig(ConfigName.GoodsConfig) local tempDataList = {} @@ -691,7 +695,7 @@ end -- 判断是否显示连购礼包入口 function this.ShowIcon(Obj,linkActId) if linkActId and Obj then - local actData = this.GetData(ActivityTypeDef.ContinuePackage) + local actData = this.GetData(ActivityTypeDef.ContinuePackage,linkActId) if actData then for index, value in ipairs(actData.rewards) do if #value > 0 then @@ -702,6 +706,7 @@ function this.ShowIcon(Obj,linkActId) end end Obj:SetActive(false) + return end return CommonActPageManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 28dc949278..b429ded654 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -849,6 +849,9 @@ local jumpDic = { [JumpType.fangcunxunbaoShop] = function(data) this.JumpActivity(JumpType.fangcunxunbaoShop, data[1]) end, + [JumpType.ContinuePackage] = function(data,args) + UIManager.OpenPanel(UIName.ContinuePackagePanel,args[1]) + end, } function this.JumpActivity(data,skipfactor) @@ -905,7 +908,8 @@ function this.GoJumpWithoutTip(_jumpId) end end -function this.GoJump(_jumpId,fun) +function this.GoJump(_jumpId,fun,...) + local args = {...} Log("jumpId:"..tostring(_jumpId)) this.isOpen = true this.jumpId = _jumpId @@ -921,10 +925,10 @@ function this.GoJump(_jumpId,fun) this.isOpen = false end else - jumpDic[jumpSData.Type](jumpSData.Skipfactor) + jumpDic[jumpSData.Type](jumpSData.Skipfactor,args) end else - jumpDic[jumpSData.Type](jumpSData.Skipfactor) + jumpDic[jumpSData.Type](jumpSData.Skipfactor,args) end end if fun then diff --git a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua index fe9e6e3808..238e043269 100644 --- a/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/YuJianXing/YuJianXingPanel.lua @@ -15,6 +15,8 @@ function YuJianXingPanel:InitComponent() self.redPoint = Util.GetGameObject(self.btnRecord, "redPoint") self.btnRank = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnRank") self.btnStore = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnStore") + self.btnGift = Util.GetGameObject(self.gameObject, "Bgs/Down/btns/btnGift") + self.btnGiftEffect = Util.GetGameObject(self.btnGift,"Fx_Circle 1") --Text self.curActTime = Util.GetGameObject(self.gameObject, "Bgs/Up/Board/time1"):GetComponent("Text") self.nextRoundTime = Util.GetGameObject(self.gameObject, "Bgs/Up/Board/time2"):GetComponent("Text") @@ -45,6 +47,10 @@ function YuJianXingPanel:BindEvent() end) end) + Util.AddOnceClick(self.btnGift, function() + JumpManager.GoJump(40050,nil,ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing)) + end) + Util.AddOnceClick(self.helpBtn,function () UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.YuJianXing,self.helpPosition.x,self.helpPosition.y) end) @@ -99,6 +105,7 @@ function YuJianXingPanel:RemoveListener() end function YuJianXingPanel:OnSortingOrderChange() + Util.SetParticleSortLayer(self.btnGiftEffect, self.sortingOrder+1) end --界面打开时调用(用于子类重写) @@ -109,6 +116,7 @@ end -- 打开,重新打开时回调 function YuJianXingPanel:OnShow() self.UpView:OnOpen({ showType = UpViewOpenType.ShowLeft, panelType = PanelType.YuJianXing }) + Util.SetParticleSortLayer(self.btnGiftEffect, self.sortingOrder+1) self:MakeRequest(function () if YuJianXingManager.curState == 2 then YuJianXingManager.InWaiting = true @@ -121,6 +129,7 @@ end function YuJianXingPanel:MakeRequest(func) local id = ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YuJianXing) + CommonActPageManager.ShowIcon(self.btnGift,id) if id then NetManager.RidingSwardActivityRequest(id,function () if func then