diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 9d53760443..52b3bd2141 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -498,7 +498,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1320216020089741451} - m_RootOrder: 1 + 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} @@ -978,8 +978,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6666055027610274605} - {fileID: 518717631425148289} - {fileID: 7095406767899085140} + - {fileID: 5567165469245951261} m_Father: {fileID: 5024159848178497836} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1748,8 +1750,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 2035921928259712513} - {fileID: 2902414629844362828} - {fileID: 4390350997579688959} + - {fileID: 5567165470588319420} m_Father: {fileID: 5024159848178497836} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1825,7 +1829,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7274962235404067332} - m_RootOrder: 0 + 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} @@ -2127,7 +2131,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7274962235404067332} - m_RootOrder: 1 + 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} @@ -2668,7 +2672,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -86, y: -102.1} + m_AnchoredPosition: {x: -85.3, y: -489.3} m_SizeDelta: {x: 71.599976, y: 69.92993} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3090562463138462632 @@ -2997,6 +3001,123 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -980, y: -1820} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &4582898436022796360 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2035921928259712513} + - component: {fileID: 1079745892164801020} + - component: {fileID: 1882254647880829149} + - component: {fileID: 155689772417102841} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2035921928259712513 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4582898436022796360} + 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: 1417633079396663705} + 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: 1.4, y: 25.5} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1079745892164801020 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4582898436022796360} + m_CullTransparentMesh: 0 +--- !u!114 &1882254647880829149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4582898436022796360} + 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: f0de54808b5704c45bc7571f0b2fcab6, 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 &155689772417102841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4582898436022796360} + 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: 1 + 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: 1882254647880829149} + 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 &4976851984101063978 GameObject: m_ObjectHideFlags: 0 @@ -3185,7 +3306,7 @@ RectTransform: 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.00000008940697, y: 41.47004} + m_AnchoredPosition: {x: 0.00000008940697, y: 41.469997} m_SizeDelta: {x: 191.08, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &8570320678613256167 @@ -3304,6 +3425,123 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u6D3B\u52A8\u5269\u4F59\u65F6\u95F4\uFF1A29\u592912\u5C0F\u65F6" +--- !u!1 &5148792898794895009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 301871741126196063} + - component: {fileID: 3450574792007991326} + - component: {fileID: 5408773392925154371} + - component: {fileID: 2577457839845238560} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &301871741126196063 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5148792898794895009} + 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: 1320216020089741451} + 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: 2.1999996, y: 23.3} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3450574792007991326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5148792898794895009} + m_CullTransparentMesh: 0 +--- !u!114 &5408773392925154371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5148792898794895009} + 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: f0de54808b5704c45bc7571f0b2fcab6, 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 &2577457839845238560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5148792898794895009} + 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: 1 + 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: 5408773392925154371} + 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 &5197284246680073614 GameObject: m_ObjectHideFlags: 0 @@ -3334,7 +3572,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1417633079396663705} - m_RootOrder: 0 + 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} @@ -3378,6 +3616,123 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5441056767837282323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6666055027610274605} + - component: {fileID: 7680204380971764168} + - component: {fileID: 2512989282999724709} + - component: {fileID: 7499666850877598977} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6666055027610274605 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5441056767837282323} + 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: 7274962235404067332} + 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.80001, y: 25.899994} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7680204380971764168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5441056767837282323} + m_CullTransparentMesh: 0 +--- !u!114 &2512989282999724709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5441056767837282323} + 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: f0de54808b5704c45bc7571f0b2fcab6, 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 &7499666850877598977 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5441056767837282323} + 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: 1 + 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: 2512989282999724709} + 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 &5901938496498147793 GameObject: m_ObjectHideFlags: 0 @@ -3576,8 +3931,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 301871741126196063} - {fileID: 3179657111082087181} - {fileID: 8129614822888532135} + - {fileID: 5567165471147825875} m_Father: {fileID: 5024159848178497836} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3846,7 +4203,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1320216020089741451} - m_RootOrder: 0 + 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} @@ -3921,7 +4278,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1417633079396663705} - m_RootOrder: 1 + 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} @@ -4888,6 +5245,396 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &42650847 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1320216020089741451} + m_Modifications: + - target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_Yuan + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.y + value: 25 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} +--- !u!4 &5567165471147825875 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + m_PrefabInstance: {fileID: 42650847} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &589324464 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1417633079396663705} + m_Modifications: + - target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_Yuan + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.x + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.y + value: 27 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 5614088600851413706, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} +--- !u!4 &5567165470588319420 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + m_PrefabInstance: {fileID: 589324464} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &1931811601 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7274962235404067332} + m_Modifications: + - target: {fileID: 8304511335248722024, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_Name + value: UI_Effect_jinkuang_Yuan + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.7 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.y + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 9170982118121311611, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4845414808902005792, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6445306947412453930, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 15143366a3b308741b7041f2c67dbe3c, type: 3} +--- !u!4 &5567165469245951261 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5567165471173432844, guid: 15143366a3b308741b7041f2c67dbe3c, + type: 3} + m_PrefabInstance: {fileID: 1931811601} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3198894279874837131 PrefabInstance: m_ObjectHideFlags: 0 @@ -4955,6 +5702,51 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2626320712165749272, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3294680590706720276, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3998340285825059207, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3690961072069993780, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 980007553895565058, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8947801747202444709, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5564580217224360019, guid: 385d5e664702ab74aa985d27de27bb19, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 385d5e664702ab74aa985d27de27bb19, type: 3} --- !u!4 &582742966390753427 stripped diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua index f303a96591..6de0a6a360 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua @@ -50,6 +50,10 @@ function QianKunBox:InitComponent() self.icons[i].go = Util.GetGameObject(self.center,"icons/icon"..i) self.icons[i].icon = Util.GetGameObject(self.icons[i].go,"icon"):GetComponent("Image") self.icons[i].kuang = Util.GetGameObject(self.icons[i].go,"kuang"):GetComponent("Image") + if i<4 then + self.icons[i].effect=Util.GetGameObject(self.icons[i].go,"UI_Effect_jinkuang_Yuan") + self.icons[i].add=Util.GetGameObject(self.icons[i].go,"Image") + end end self.btnTime = Util.GetGameObject(self.gameObject,"di1/time"):GetComponent("Text") self.btnTimes= Util.GetGameObject(self.gameObject,"di2/scroll/grid/time"):GetComponent("Text") @@ -115,6 +119,7 @@ end function QianKunBox:OnShow(_sortingOrder) self.gameObject:SetActive(true) sortingOrder = _sortingOrder + Util.SetParticleSortLayer(self.effect, 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 @@ -242,6 +247,11 @@ function QianKunBox:contentShow() self.icons[i].icon.gameObject:SetActive(false) self.icons[i].kuang.gameObject:SetActive(false) end + Util.SetParticleSortLayer(self.icons[i].effect, sortingOrder+1) + Util.AddOnceClick(self.icons[i].add.gameObject,function () + local data=RecruitManager.GetWishEquipData() + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChooseUpSoul,self.actId,wishSoulData) + end) end num=4 end @@ -250,6 +260,11 @@ function QianKunBox:contentShow() self.icons[i].icon.sprite = self.spLoader:LoadSprite(artConfig[itemConfig[iconsData[i].Reward[1]].ResourceID].Name) if i<4 then table.insert(wishSoulData,iconsData[i].Reward[1]) + Util.SetParticleSortLayer(self.icons[i].effect, sortingOrder+1) + Util.AddOnceClick(self.icons[i].add.gameObject,function () + local data=RecruitManager.GetWishEquipData() + UIManager.OpenPanel(UIName.GeneralPopup,GENERAL_POPUP_TYPE.ChooseUpSoul,self.actId,wishSoulData) + end) end self.icons[i].kuang.sprite = self.spLoader:LoadSprite(SoulPrintSpriteByQuantity[itemConfig[iconsData[i].Reward[1]].Quantity].circle) --点击能查看魂印信息 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua index 3dcde5bd34..a55a799790 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_RecrutDetail.lua @@ -19,6 +19,7 @@ function this:InitComponent(gameObject) this.time=Util.GetGameObject(gameObject,"tip"):GetComponent("Text") this.grid = Util.GetGameObject(gameObject,"panel/rate/grid") this.pre = Util.GetGameObject(gameObject,"panel/rate/rateprefab") + this.secondTitle=Util.GetGameObject(gameObject,"panel/Image1/Text"):GetComponent("Text") this.ratePreList = {} for i = 1,this.grid.transform.childCount do this.ratePreList[i] = {} @@ -74,6 +75,7 @@ function this:OnShow(_parent,...) local UpItemList = {} local itemList = {} --限时英雄up + this.secondTitle.text="本期UP内容" if activityType == ActivityTypeDef.LimitUpHero then local heroConfig=ConfigManager.TryGetConfigData(ConfigName.HeroConfig,heroID) local wishUpConfig=ConfigManager.TryGetConfigDataByKey(ConfigName.WishActivityUp,"ActivityId",activityId) @@ -100,6 +102,7 @@ function this:OnShow(_parent,...) local dic={} --乾坤宝盒特殊处理 if activityType == ActivityTypeDef.QianKunBox then + this.secondTitle.text="心愿神印" local souls=RecruitManager.GetWishEquipData() local newList={} for i = 1, #souls do diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua index 1956b7a007..c0a6067273 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ChooseUpSoul.lua @@ -36,6 +36,10 @@ end function this:BindEvent() Util.AddClick(this.confirmBtn,function() + if #this.currHeroIds<=0 then + PopupTipPanel.ShowTip("请至少选择一枚心愿神印") + return + end NetManager.BeautyBagWishEquipRequest(this.currHeroIds,function() Game.GlobalEvent:DispatchEvent(GameEvent.Activity.TimeLimitUpHeroChange,this.currHeroIds[1]) parent:ClosePanel() @@ -105,14 +109,10 @@ function this.SingleHeroDataShow(go,_heroData) selectObj.gameObject:SetActive(isHave) Util.AddOnceClick(cardclickBtn, function() if #this.currHeroIds==3 and not isHave then - PopupTipPanel.ShowTip("Up魂印最多3个") + PopupTipPanel.ShowTip("只可选择3枚心愿魂印") return end if isHave then - if #this.currHeroIds==1 then - PopupTipPanel.ShowTip("至少选择一个Up魂印") - return - end table.removebyvalue(this.currHeroIds,heroData.Id) isHave=false else diff --git a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua index b7625f2c7d..ec029357a1 100644 --- a/Assets/ManagedResources/~Lua/View/ShopViewNew.lua +++ b/Assets/ManagedResources/~Lua/View/ShopViewNew.lua @@ -156,6 +156,11 @@ function ShopViewNew:OnShow(_sortingOrder) end end self.ShopType = self.actConfig.ShopData[1][1] + if self.ShopType == SHOP_TYPE.QIANKUNBOX_SHOP then + self.parent.tabbox.gameObject:SetActive(false) + else + self.parent.tabbox.gameObject:SetActive(true) + end self:ShowShop() end @@ -581,6 +586,7 @@ function ShopViewNew:OnClose() self._TimeCounter:Stop() self._TimeCounter = nil end + self.parent.tabbox.gameObject:SetActive(true) end --界面销毁时调用(用于子类重写)