From 8b7b5c8fa94fb1f03b33651d3db94e09d1268628 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 20 Dec 2021 14:05:42 +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=97=A0=E7=A4=BC=E5=8C=85=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/TailsmanSoulView/page16.prefab | 570 +----------------- .../DynamicActivity/XiangYaoDuoBao.lua | 1 + .../Modules/DynamicActivity/YiJingBaoKu.lua | 2 +- .../TailsManSoul/TailsmanSoulChipLottery.lua | 26 +- 4 files changed, 14 insertions(+), 585 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab index 4dee68ad86..f06f699069 100644 --- a/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab +++ b/Assets/ManagedResources/Prefabs/UI/TailsmanSoulView/page16.prefab @@ -5052,9 +5052,7 @@ RectTransform: m_Children: - {fileID: 3650931296287365445} - {fileID: 208247563920512486} - - {fileID: 1478133659566952327} - {fileID: 6979685406578874528} - - {fileID: 6680226171587101182} - {fileID: 2043961333174016206} - {fileID: 2052763838201650754} - {fileID: 3088456174784992059} @@ -14961,80 +14959,6 @@ ParticleSystemRenderer: m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} m_MaskInteraction: 0 ---- !u!1 &1163096677516369895 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 299595285830895849} - - component: {fileID: 968871098129697423} - - component: {fileID: 2469121043055395424} - m_Layer: 5 - m_Name: Img2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &299595285830895849 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163096677516369895} - 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: 6680226171587101182} - 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 &968871098129697423 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163096677516369895} - m_CullTransparentMesh: 0 ---- !u!114 &2469121043055395424 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163096677516369895} - 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 &1166631468014762931 GameObject: m_ObjectHideFlags: 0 @@ -15493,7 +15417,7 @@ RectTransform: - {fileID: 1971531226912261817} - {fileID: 2634665790303701291} m_Father: {fileID: 7581135397323237180} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -29986,7 +29910,7 @@ RectTransform: - {fileID: 1808235633478006095} - {fileID: 184284645826008713} m_Father: {fileID: 7581135397323237180} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -35312,7 +35236,7 @@ RectTransform: - {fileID: 4452344794313098835} - {fileID: 8329855622185798631} m_Father: {fileID: 7581135397323237180} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} @@ -40891,100 +40815,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &5121633682624462941 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 9171893541478643663} - - component: {fileID: 1428778453636457313} - - component: {fileID: 5233655276826746282} - - component: {fileID: 8588285587988790546} - m_Layer: 5 - m_Name: Img - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &9171893541478643663 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5121633682624462941} - 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: 6680226171587101182} - 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 &1428778453636457313 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5121633682624462941} - m_CullTransparentMesh: 0 ---- !u!114 &5233655276826746282 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5121633682624462941} - 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 &8588285587988790546 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5121633682624462941} - 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 &5197284246680073614 GameObject: m_ObjectHideFlags: 0 @@ -46064,143 +45894,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: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 89.8, y: -532.4} - 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 &5953094711370695296 GameObject: m_ObjectHideFlags: 0 @@ -61239,7 +60932,7 @@ RectTransform: - {fileID: 5439423017807525752} - {fileID: 2092466590503268333} m_Father: {fileID: 7581135397323237180} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -76402,126 +76095,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &8745388661372296966 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6680226171587101182} - - component: {fileID: 6852460667181259617} - - component: {fileID: 4256345495411969344} - - component: {fileID: 6231140805489773553} - m_Layer: 5 - m_Name: zqbgold - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6680226171587101182 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8745388661372296966} - 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: 9171893541478643663} - - {fileID: 299595285830895849} - - {fileID: 4738047345300084531} - m_Father: {fileID: 7581135397323237180} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -97.5, y: -386.5} - m_SizeDelta: {x: 129, y: 126} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6852460667181259617 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8745388661372296966} - m_CullTransparentMesh: 0 ---- !u!114 &4256345495411969344 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8745388661372296966} - 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 &6231140805489773553 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8745388661372296966} - 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: 4256345495411969344} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &8901245275490365540 GameObject: m_ObjectHideFlags: 0 @@ -81586,6 +81159,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 6979685406578874528} m_Modifications: + - target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + propertyPath: m_Name + value: Fx_Circle 1 + objectReference: {fileID: 0} - target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} propertyPath: m_LocalPosition.x @@ -81691,11 +81269,6 @@ PrefabInstance: 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 &184284645826008713 stripped @@ -81704,128 +81277,3 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 368702410255057534} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5067602908007744452 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 6680226171587101182} - 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 &4738047345300084531 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, - type: 3} - m_PrefabInstance: {fileID: 5067602908007744452} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index 426c1d01aa..9f8cf1f4f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -149,6 +149,7 @@ function XiangYaoDuoBao:Refresh() self:refreshBtnShow()--刷新按钮显示 self:TimeCountDown()--时间 self:SetData()--加载界面数据立绘+进度条 + CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,activityId) end function XiangYaoDuoBao:SetData() diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua index a6f18df890..fa530123e2 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua @@ -116,7 +116,6 @@ function YiJingBaoKu:OnShow(_sortingOrder) local image = Util.GetGameObject(self.effect, "UI_Effect_YJBK_Zao/GameObject/Image (2)"):GetComponent("Canvas") image.sortingOrder = _sortingOrder + 1 sortingOrder = _sortingOrder - self:Refresh() end @@ -130,6 +129,7 @@ end --刷新 function YiJingBaoKu:Refresh() self.ActData = DynamicActivityManager.GetBaoKuData() + CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,self.ActData.activityId) if self.ActData.selectId == 0 then--如果没有选择了最终奖励 self:ResetCardToFront()--把卡片全部翻到正面 diff --git a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua index fe07d7f961..c0f126e25b 100644 --- a/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua +++ b/Assets/ManagedResources/~Lua/Modules/TailsManSoul/TailsmanSoulChipLottery.lua @@ -27,16 +27,11 @@ function TailsmanSoulChipLottery:InitComponent() self.rightUp = Util.GetGameObject(self.gameObject,"rightUp") self.btnReward = Util.GetGameObject(self.rightUp,"reward") self.btnStore = Util.GetGameObject(self.rightUp,"store") - self.btnGift = Util.GetGameObject(self.rightUp,"gift") self.zhenqibaogeBtn = Util.GetGameObject(self.rightUp,"zqbg") self.zqbgEffect = Util.GetGameObject(self.zhenqibaogeBtn,"Fx_Circle 1") self.btn_soul = Util.GetGameObject(self.rightUp, "btn_hero") self.upSoulImg= Util.GetGameObject(self.btn_soul, "Icon"):GetComponent("Image") - self.zqbgOldBtn = Util.GetGameObject(self.rightUp,"zqbgold") - self.zqbgOldEffect = Util.GetGameObject(self.zqbgOldBtn,"Fx_Circle 1") - Util.GetGameObject(self.btn_soul,"InfoImg"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tdhl_genghuansuipian") - self.btns = {} for i = 1 , 2 do self.btns[i] = {} @@ -68,9 +63,6 @@ function TailsmanSoulChipLottery:BindEvent() Util.AddOnceClick(self.zhenqibaogeBtn, function() JumpManager.GoJump(40050,nil,self.actId) end) - Util.AddOnceClick(self.zqbgOldBtn, function() - JumpManager.GoJump(40011) - end) Util.AddOnceClick(self.btnHelp, function() UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y) end) @@ -86,13 +78,6 @@ function TailsmanSoulChipLottery:BindEvent() Util.AddOnceClick(self.btn_soul, function() UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.chooseTailsManSoul) end) - - Util.AddOnceClick(self.btnGift,function () - if not self.actData then - return - end - UIManager.OpenPanel(UIName.ContinueGiftPanel, self.actData.activityId) - end) end --添加事件监听(用于子类重写) @@ -123,7 +108,6 @@ end function TailsmanSoulChipLottery:OnSortingOrderChange(_sortingOrder) sortingOrder = _sortingOrder or 0 Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1) - Util.SetParticleSortLayer(self.zqbgOldEffect, sortingOrder+1) for i = 1, 5 do if self.icons[i] and self.icons[i].effect then Util.SetParticleSortLayer(self.icons[i].effect.gameObject, sortingOrder+1) @@ -136,7 +120,6 @@ function TailsmanSoulChipLottery:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1) - Util.SetParticleSortLayer(self.zqbgOldEffect, 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 @@ -155,8 +138,7 @@ function TailsmanSoulChipLottery:OnShow(_sortingOrder) self.singleRecruit = array[1] self.tenRecruit = array[2] self.freeTimesId=self.singleRecruit.FreeTimes - self.maxtimesId=self.singleRecruit.MaxTimes - CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,self.actId) + self.maxtimesId=self.singleRecruit.MaxTimes self:refreshMagicNum() self:refreshBtnShow()--刷新按钮显示 self:contentShow() @@ -194,10 +176,8 @@ function TailsmanSoulChipLottery:IconsPlayAnim() end function TailsmanSoulChipLottery:refreshMagicNum() - self.actData = ActivityGiftManager.GetActivityTypeInfo(self.actType) - - local isActive = CommonActPageManager.HasContinueGift(self.actData.activityId) - self.btnGift:SetActive(isActive) + self.actData = ActivityGiftManager.GetActivityTypeInfo(self.actType) + CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,self.actId) local d = ConfigManager.GetAllConfigsDataByKey(ConfigName.LotterySpecialConfig,"Type",self.singleRecruit.MergePool) self.updateTimesTip.text = string.format("召唤%s次必得红色碎片","ff850c",d[1].Count - self.actData.value)