diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 1e1f3a6570..5d58d916ec 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -1043,7 +1043,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: 257, y: -288} + m_AnchoredPosition: {x: 349, y: -288} m_SizeDelta: {x: 400, y: 306.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &659684666666108438 @@ -1559,6 +1559,7 @@ RectTransform: - {fileID: 8890830334262707862} - {fileID: 758519615073335968} - {fileID: 6724564084982409929} + - {fileID: 7865517985651843510} m_Father: {fileID: 6278899851612589502} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2096,6 +2097,80 @@ MonoBehaviour: m_Spacing: {x: 0, y: 0} m_Constraint: 1 m_ConstraintCount: 1 +--- !u!1 &4556186459229662030 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8307501727941202048} + - component: {fileID: 1272800943186780822} + - component: {fileID: 8818128375717897173} + m_Layer: 5 + m_Name: ImgBg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8307501727941202048 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4556186459229662030} + 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: 5960856628897331893} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 846, y: 447} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1272800943186780822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4556186459229662030} + m_CullTransparentMesh: 0 +--- !u!114 &8818128375717897173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4556186459229662030} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 7429d662a4bbee149bbb0219b7b99490, 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 &4582282613875976734 GameObject: m_ObjectHideFlags: 0 @@ -2478,8 +2553,8 @@ 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: 178, y: -610} - m_SizeDelta: {x: 609, y: 300} + m_AnchoredPosition: {x: 252.75, y: -610} + m_SizeDelta: {x: 553.5, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7977807575607661485 CanvasRenderer: @@ -3602,6 +3677,209 @@ RectTransform: m_AnchoredPosition: {x: 21, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &6066317331888079353 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 372733677956028341} + - component: {fileID: 971585795214671805} + - component: {fileID: 8387721924435674336} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &372733677956028341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6066317331888079353} + 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: 5960856628897331893} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 57, y: -54} + m_SizeDelta: {x: 305, y: 423} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &971585795214671805 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6066317331888079353} + m_CullTransparentMesh: 0 +--- !u!114 &8387721924435674336 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6066317331888079353} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: 19196943e264bb6458a7a80aaf57dfb1, 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 &6256760106389750144 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7865517985651843510} + - component: {fileID: 3479389227561992153} + - component: {fileID: 3613564363922675335} + - component: {fileID: 5088142664685879350} + - component: {fileID: 182904466992192348} + m_Layer: 5 + m_Name: lingmai + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7865517985651843510 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6256760106389750144} + 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: 5960856628897331893} + m_Father: {fileID: 2111641511848696073} + m_RootOrder: 13 + 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: -285, y: -610} + m_SizeDelta: {x: 509, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3479389227561992153 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6256760106389750144} + m_CullTransparentMesh: 0 +--- !u!114 &3613564363922675335 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6256760106389750144} + 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: 182904466992192348} + 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 &5088142664685879350 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6256760106389750144} + 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!114 &182904466992192348 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6256760106389750144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e459a084d8e15a240b58db751097122b, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null --- !u!1 &6288326278471681729 GameObject: m_ObjectHideFlags: 0 @@ -4010,6 +4288,45 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7345097925175359006 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5960856628897331893} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5960856628897331893 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7345097925175359006} + 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: 7022369635417861879} + - {fileID: 5163254069503112887} + - {fileID: 8307501727941202048} + - {fileID: 372733677956028341} + m_Father: {fileID: 7865517985651843510} + 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: 21, y: -55} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &7365034574822972270 GameObject: m_ObjectHideFlags: 0 @@ -4582,7 +4899,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: -421, y: -317} + m_AnchoredPosition: {x: -357.1, y: -274.4} m_SizeDelta: {x: 400, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8356356596520800600 @@ -5355,6 +5672,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 35560109656276688} m_PrefabAsset: {fileID: 0} +--- !u!1001 &210391925426998179 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5960856628897331893} + m_Modifications: + - target: {fileID: 7178458175106835795, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_Name + value: Fx_SenLuoHuanJjing + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 59 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -54 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c1341787bb680534d92884d1358bc4e0, type: 3} +--- !u!224 &7022369635417861879 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7178458175106835796, guid: c1341787bb680534d92884d1358bc4e0, + type: 3} + m_PrefabInstance: {fileID: 210391925426998179} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1129047560315073780 PrefabInstance: m_ObjectHideFlags: 0 @@ -6240,6 +6682,131 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2849699497339680333} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3950550933189229641 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5960856628897331893} + m_Modifications: + - target: {fileID: 8175367155131763455, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_Name + value: Fx_SenLuoHuanJjing_S + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9d0416f0fe8e98e42b70235059e824df, type: 3} +--- !u!224 &5163254069503112887 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175367155131763454, guid: 9d0416f0fe8e98e42b70235059e824df, + type: 3} + m_PrefabInstance: {fileID: 3950550933189229641} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4226810177912975627 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab index ee0e1da766..14999af167 100644 --- a/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/LingMaiMiJin/LingMaiMiJingPanel.prefab @@ -234,8 +234,8 @@ 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: -161, y: 139} - m_SizeDelta: {x: 290, y: 202} + m_AnchoredPosition: {x: -139, y: 113} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5027627145611970981 CanvasRenderer: @@ -258,14 +258,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} + m_Sprite: {fileID: 21300000, guid: 4806006ab59d7a74aa51fd8ceb74dfff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -684,7 +684,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: 181, y: -12.2} + m_AnchoredPosition: {x: 0, y: 99} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &9131820120401433183 @@ -702,20 +702,20 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 905302843237486652} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0.5019608} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: 461e6af409ec67d45ba908596f22e977, type: 3} + m_Sprite: {fileID: 21300000, guid: 39dfc4f843ff40b4299f34fb6d4f9077, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -741,7 +741,7 @@ MonoBehaviour: m_Right: 20 m_Top: 25 m_Bottom: 10 - m_ChildAlignment: 1 + m_ChildAlignment: 4 m_Spacing: 0 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 @@ -1011,7 +1011,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: 201, y: -45} + m_AnchoredPosition: {x: 0, y: 99} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &6422955667469112430 @@ -1029,7 +1029,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1054422444745560903} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -1366,8 +1366,8 @@ 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: -283, y: 582} - m_SizeDelta: {x: 290, y: 202} + m_AnchoredPosition: {x: -236, y: 545} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6585439458256033418 CanvasRenderer: @@ -1390,14 +1390,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} + m_Sprite: {fileID: 21300000, guid: 4806006ab59d7a74aa51fd8ceb74dfff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1570,8 +1570,8 @@ 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: 163.3, y: 483.9} - m_SizeDelta: {x: 290, y: 202} + m_AnchoredPosition: {x: 292, y: 372} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &811088692841982413 CanvasRenderer: @@ -1594,14 +1594,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} 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: 077dcb9d692767b4dbbc78782f96ad54, type: 3} + m_Sprite: {fileID: 21300000, guid: 4806006ab59d7a74aa51fd8ceb74dfff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2234,7 +2234,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 141, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &7472609110656960119 @@ -2669,7 +2669,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: 219, y: -40} + m_AnchoredPosition: {x: 0, y: 99} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1996197586481913167 @@ -2687,7 +2687,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2915685494303262992} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -3355,8 +3355,8 @@ 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: 112, y: -203} - m_SizeDelta: {x: 290, y: 202} + m_AnchoredPosition: {x: 266, y: -185} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7671832281805411885 CanvasRenderer: @@ -3379,14 +3379,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} 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: 077dcb9d692767b4dbbc78782f96ad54, type: 3} + m_Sprite: {fileID: 21300000, guid: 4806006ab59d7a74aa51fd8ceb74dfff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4055,7 +4055,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: 5, y: -130} + m_AnchoredPosition: {x: 0, y: -108} m_SizeDelta: {x: 368, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6257866669496133843 @@ -4130,7 +4130,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 81.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &950733798129608270 @@ -5023,7 +5023,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, y: -115} + m_AnchoredPosition: {x: 0, y: -108} m_SizeDelta: {x: 368, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6159980532375073267 @@ -5177,7 +5177,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 81.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5181275318856399589 @@ -5274,7 +5274,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: 5, y: -135} + m_AnchoredPosition: {x: 0, y: -108} m_SizeDelta: {x: 368, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1497227739352431627 @@ -5675,7 +5675,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} + m_SizeDelta: {x: 366, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719078331411497301 CanvasRenderer: @@ -5705,7 +5705,7 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: cac8341c350d75a488404cfc7c83b38c, type: 3} + m_Sprite: {fileID: 21300000, guid: 2db47a12b018aa44fbd2e19dcadbcc5c, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6080,7 +6080,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 81.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6029438456723130591 @@ -6505,7 +6505,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 81.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3527678746426474027 @@ -6953,8 +6953,8 @@ 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: -132, y: -514} - m_SizeDelta: {x: 290, y: 202} + m_AnchoredPosition: {x: -276, y: -295} + m_SizeDelta: {x: 200, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6406424020756372936 CanvasRenderer: @@ -6977,14 +6977,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.5019608} 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: 4c6fe8d96a97af042b05c0ad043f8b03, type: 3} + m_Sprite: {fileID: 21300000, guid: 4806006ab59d7a74aa51fd8ceb74dfff, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7173,7 +7173,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: 222, y: -25} + m_AnchoredPosition: {x: 0, y: 99} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2075144295551142544 @@ -7191,7 +7191,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6452090309314078361} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: @@ -8110,7 +8110,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 81.5, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7262669673688354068 @@ -8972,7 +8972,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: 5, y: -107} + m_AnchoredPosition: {x: 0, y: -108} m_SizeDelta: {x: 368, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4263884961077352602 @@ -9278,7 +9278,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: 5, y: -107} + m_AnchoredPosition: {x: 0, y: -108} m_SizeDelta: {x: 368, y: 58} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5601443883004916442 @@ -9989,7 +9989,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: 181, y: -12.2} + m_AnchoredPosition: {x: 0, y: 99} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &2403647327048276113 @@ -10007,7 +10007,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8645211949365279577} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 0f1d43b53c..bc4f99a5b0 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -72,7 +72,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN, --日常 objName = "daily", nameImg = "f_fuben_fubenming_05", - btnPos = Vector2(124, -49), + btnPos = Vector2(0, -16), redPointType = RedPointType.HeroExplore, effect1 = "Fx_RiChangFuBen", effect2 = "Fx_RiChangFuBen_S", @@ -86,15 +86,15 @@ local carbonData = { -- effect1 = "Fx_SenLuoHuanJjing", -- effect2 = "Fx_SenLuoHuanJjing_S", -- }, - -- [FUNCTION_OPEN_TYPE.LINGMAIMIJING] = { - -- id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境 - -- objName = "trial", - -- nameImg = "f_fuben_fubenming_09", - -- btnPos = Vector2(-156,-12), - -- redPointType = RedPointType.LingMaiMiJing, - -- effect1 = "Fx_SenLuoHuanJjing", - -- effect2 = "Fx_SenLuoHuanJjing_S", - -- }, + [FUNCTION_OPEN_TYPE.LINGMAIMIJING] = { + id = FUNCTION_OPEN_TYPE.LINGMAIMIJING, --灵脉秘境 + objName = "lingmai", + nameImg = "f_fuben_fubenming_09", + btnPos = Vector2(-17,28), + redPointType = RedPointType.LingMaiMiJing, + effect1 = "Fx_SenLuoHuanJjing", + effect2 = "Fx_SenLuoHuanJjing_S", + }, [FUNCTION_OPEN_TYPE.GodsWayTower_1] = { id = FUNCTION_OPEN_TYPE.GodsWayTower_1, --多队塔 objName = "other", @@ -108,7 +108,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.Number_Game, --数字游戏 objName = "trial", nameImg = "f_fuben_fubenming_08", - btnPos = Vector2(-20, 70), + btnPos = Vector2(52, 70), redPointType = RedPointType.numberGame, effect1 = "Fx_SenLuoHuanJjing", effect2 = "Fx_SenLuoHuanJjing_S",