diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab index 550693cf67..cb52c919b0 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab @@ -899,6 +899,126 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u6B21\u6570\u5956\u52B1" LanguageIndex: 0 +--- !u!1 &812246306070046039 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8978702084547345762} + - component: {fileID: 2526194457101698642} + - component: {fileID: 6603425501561067898} + - component: {fileID: 924750001766232548} + m_Layer: 5 + m_Name: zqbg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8978702084547345762 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812246306070046039} + 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: 5265573775636137444} + - {fileID: 8308647722300006668} + - {fileID: 2530924170807661759} + m_Father: {fileID: 6660719932777511018} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 129, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2526194457101698642 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812246306070046039} + m_CullTransparentMesh: 0 +--- !u!114 &6603425501561067898 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812246306070046039} + 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 &924750001766232548 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812246306070046039} + 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: 6603425501561067898} + 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 &992364346240308313 GameObject: m_ObjectHideFlags: 0 @@ -4057,6 +4177,80 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: 300 LanguageIndex: 0 +--- !u!1 &4994635361674487497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8308647722300006668} + - component: {fileID: 5948712678924891679} + - component: {fileID: 8113808504200499782} + m_Layer: 5 + m_Name: Img2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8308647722300006668 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4994635361674487497} + 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: 8978702084547345762} + 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 &5948712678924891679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4994635361674487497} + m_CullTransparentMesh: 0 +--- !u!114 &8113808504200499782 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4994635361674487497} + 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 &5011476922747518519 GameObject: m_ObjectHideFlags: 0 @@ -5145,6 +5339,100 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "5\u884CUP" LanguageIndex: 0 +--- !u!1 &6497121221650001189 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5265573775636137444} + - component: {fileID: 7642072187576049867} + - component: {fileID: 1839133550273758281} + - component: {fileID: 6649437280487498242} + m_Layer: 5 + m_Name: Img + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5265573775636137444 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6497121221650001189} + 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: 8978702084547345762} + 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 &7642072187576049867 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6497121221650001189} + m_CullTransparentMesh: 0 +--- !u!114 &1839133550273758281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6497121221650001189} + 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 &6649437280487498242 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6497121221650001189} + 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 &6516699229884086123 GameObject: m_ObjectHideFlags: 0 @@ -6318,6 +6606,7 @@ RectTransform: m_Children: - {fileID: 8713749479389260931} - {fileID: 8706985993115206498} + - {fileID: 8978702084547345762} m_Father: {fileID: 2132785343472515193} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -7634,6 +7923,131 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "5\u884CUP" LanguageIndex: 0 +--- !u!1001 &2633751549278486600 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8978702084547345762} + 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 + 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} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3} +--- !u!224 &2530924170807661759 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418, + type: 3} + m_PrefabInstance: {fileID: 2633751549278486600} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4060605295314555060 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index da520ce398..426c1d01aa 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -43,7 +43,10 @@ function XiangYaoDuoBao:InitComponent() self.helpPosition=self.helpBtn:GetComponent("RectTransform").localPosition self.detailBtn = Util.GetGameObject(self.gameObject,"rightUp/detailBtn") self.xianshishangshiBtn = Util.GetGameObject(self.gameObject,"rightUp/xianshishangshiBtn") - self.xxssEffect = Util.GetGameObject(self.xianshishangshiBtn,"Fx_Circle 1") + self.xianshishangshiBtn:SetActive(false) + -- self.xxssEffect = Util.GetGameObject(self.xianshishangshiBtn,"Fx_Circle 1") + self.zhenqibaogeBtn = Util.GetGameObject(self.gameObject,"rightUp/zqbg") + self.zqbgEffect = Util.GetGameObject(self.zhenqibaogeBtn,"Fx_Circle 1") self.btn = Util.GetGameObject(self.gameObject,"Btn") self.upper=Util.GetGameObject(self.gameObject,"time/times"):GetComponent("Text") ---召唤上限 @@ -69,8 +72,11 @@ function XiangYaoDuoBao:InitComponent() end function XiangYaoDuoBao:BindEvent() - Util.AddOnceClick(self.xianshishangshiBtn, function() - JumpManager.GoJump(40014) + -- Util.AddOnceClick(self.xianshishangshiBtn, function() + -- JumpManager.GoJump(40014) + -- end) + Util.AddOnceClick(self.zhenqibaogeBtn, function() + JumpManager.GoJump(40050,nil,self.actId) end) Util.AddOnceClick(self.helpBtn, function() UIManager.OpenPanel(UIName.HelpPopup,HELP_TYPE.XiangYaoDuoBao,self.helpPosition.x,self.helpPosition.y) @@ -105,7 +111,8 @@ function XiangYaoDuoBao:OnShow(_sortingOrder) self.sortingOrder = _sortingOrder Util.SetParticleSortLayer(self.effect1,self.sortingOrder + 1) Util.AddParticleSortLayer(self.effect2,self.sortingOrder + 1) - Util.SetParticleSortLayer(self.xxssEffect, self.sortingOrder + 1) + -- Util.SetParticleSortLayer(self.xxssEffect, self.sortingOrder + 1) + Util.SetParticleSortLayer(self.zqbgEffect, self.sortingOrder + 1) self.gameObject:SetActive(true) self.actId = self.actConfig.ActId