diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index 6d58b4cd84..dd9290f2bf 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -1377,7 +1377,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3936541427962700361} m_CullTransparentMesh: 0 ---- !u!1 &4054625950403222042 +--- !u!1 &4031580934650510954 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1385,78 +1385,61 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7628357631826422610} - - component: {fileID: 8005750817597667712} - - component: {fileID: 5231808003860926995} - m_Layer: 0 - m_Name: Text + - component: {fileID: 7057920615600060315} + - component: {fileID: 8840884454377980200} + m_Layer: 5 + m_Name: Grid m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7628357631826422610 +--- !u!224 &7057920615600060315 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054625950403222042} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_GameObject: {fileID: 4031580934650510954} + 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_Children: + - {fileID: 9208220117220525560} + - {fileID: 4268726969999273938} + - {fileID: 6447800873277570760} m_Father: {fileID: 6875560361487186785} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - 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_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -20, y: -85.3} + m_SizeDelta: {x: 271, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8005750817597667712 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054625950403222042} - m_CullTransparentMesh: 0 ---- !u!114 &5231808003860926995 +--- !u!114 &8840884454377980200 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4054625950403222042} + m_GameObject: {fileID: 4031580934650510954} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Script: {fileID: -2095666955, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 90 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 0 - m_MaxSize: 90 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: sdfa - LanguageIndex: 0 + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_StartCorner: 0 + m_StartAxis: 0 + m_CellSize: {x: 271, y: 37} + m_Spacing: {x: 0, y: 0} + m_Constraint: 1 + m_ConstraintCount: 1 --- !u!1 &4677113146130960420 GameObject: m_ObjectHideFlags: 0 @@ -1531,6 +1514,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4810925280592913835 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6120839156560082947} + - component: {fileID: 6500783828367067171} + - component: {fileID: 6589849618880701085} + m_Layer: 5 + m_Name: Name + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6120839156560082947 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4810925280592913835} + 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: 6875560361487186785} + 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: -7.1, y: 4.2} + m_SizeDelta: {x: 135, y: 39} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6500783828367067171 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4810925280592913835} + m_CullTransparentMesh: 0 +--- !u!114 &6589849618880701085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4810925280592913835} + 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: c532be07d2cb2824bb6506de15cd9405, 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 &4893321370657134528 GameObject: m_ObjectHideFlags: 0 @@ -2017,6 +2074,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5530371159453671424 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6981839850660148456} + - component: {fileID: 7157460571225524541} + - component: {fileID: 8842398910222601663} + m_Layer: 5 + m_Name: Lock + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6981839850660148456 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5530371159453671424} + 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: 6875560361487186785} + 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: -127.2, y: 2.4} + m_SizeDelta: {x: 65, y: 65} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7157460571225524541 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5530371159453671424} + m_CullTransparentMesh: 0 +--- !u!114 &8842398910222601663 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5530371159453671424} + 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: 7b0528d4bfc775b409624efa721e2ed9, 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 &5669951066384980921 GameObject: m_ObjectHideFlags: 0 @@ -2109,7 +2240,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6875560361487186785 RectTransform: m_ObjectHideFlags: 0 @@ -2121,14 +2252,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 7628357631826422610} + - {fileID: 6981839850660148456} + - {fileID: 6120839156560082947} + - {fileID: 7057920615600060315} m_Father: {fileID: 6278899851612589502} 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: 80, y: 15} - m_SizeDelta: {x: 300, y: 300} + m_AnchoredPosition: {x: -786, y: 173} + m_SizeDelta: {x: 325, y: 87} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1102756234027167001 CanvasRenderer: @@ -2152,14 +2285,14 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 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: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: 4821f897b6fb6dc42b69932fb799ad06, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2505,6 +2638,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &6447574204538961600 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9208220117220525560} + - component: {fileID: 5074906141544346636} + - component: {fileID: 4975636913914345717} + m_Layer: 5 + m_Name: time + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9208220117220525560 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6447574204538961600} + 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: 7057920615600060315} + m_RootOrder: 0 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5074906141544346636 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6447574204538961600} + m_CullTransparentMesh: 0 +--- !u!114 &4975636913914345717 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6447574204538961600} + 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: cfcb8277b2996d343bc48fe240aae3db, 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 &6631527501883811766 GameObject: m_ObjectHideFlags: 0 @@ -2653,6 +2860,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7703640978867281762 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4268726969999273938} + - component: {fileID: 3282577278308170168} + - component: {fileID: 6502355164220924984} + m_Layer: 5 + m_Name: freetimes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4268726969999273938 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7703640978867281762} + 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: 7057920615600060315} + m_RootOrder: 1 + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3282577278308170168 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7703640978867281762} + m_CullTransparentMesh: 0 +--- !u!114 &6502355164220924984 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7703640978867281762} + 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: cfcb8277b2996d343bc48fe240aae3db, 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 &8415105165734988754 GameObject: m_ObjectHideFlags: 0 @@ -2864,6 +3145,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &8896427205265497543 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6447800873277570760} + - component: {fileID: 3619866950882426101} + - component: {fileID: 2124547930648202127} + m_Layer: 5 + m_Name: buytimes + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6447800873277570760 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8896427205265497543} + 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: 7057920615600060315} + 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: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3619866950882426101 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8896427205265497543} + m_CullTransparentMesh: 0 +--- !u!114 &2124547930648202127 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8896427205265497543} + 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: cfcb8277b2996d343bc48fe240aae3db, 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 &8975184642546558864 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 7d9815d3fa..6d9e65a5a8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -6,13 +6,15 @@ local carbonData = { [FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN] = { id = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN, --日常 objName = "daily", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_05", + btnPos = Vector2(124,47), redPointType = RedPointType.HeroExplore, }, [FUNCTION_OPEN_TYPE.MONSTER_COMING] = { id = FUNCTION_OPEN_TYPE.MONSTER_COMING, --心魔 objName = "monster", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_04", + btnPos = Vector2(-39,-110), redPointType = RedPointType.EpicExplore, --次数特权 Privileges ={ @@ -29,31 +31,37 @@ local carbonData = { [FUNCTION_OPEN_TYPE.EXPEDITION] = { id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫 objName = "expedition", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_03", + btnPos = Vector2(39,-67), redPointType = RedPointType.OrdinaryExplore, + canPress = true, }, [FUNCTION_OPEN_TYPE.ENDLESS] = { id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽 objName = "endless", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_06", + btnPos = Vector2(302,63), redPointType = RedPointType.EndLess, }, [FUNCTION_OPEN_TYPE.TRIAL] = { id = FUNCTION_OPEN_TYPE.TRIAL, --森罗 objName = "trial", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_01", + btnPos = Vector2(-189,21), redPointType = RedPointType.Trial, }, [FUNCTION_OPEN_TYPE.PEOPLE_MIRROR] = { id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕 objName = "xuanyuan", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_02", + btnPos = Vector2(-4,-86), redPointType = RedPointType.People_Mirror, }, [FUNCTION_OPEN_TYPE.FIGHTLEVEL] = { id = FUNCTION_OPEN_TYPE.FIGHTLEVEL, --山河社稷图 objName = "fightlevel", - btnPos = Vector2(0,0), + nameImg = "f_fuben_fubenming_07", + btnPos = Vector2(5,-224), redPointType = RedPointType.FightLevel, }, } @@ -108,12 +116,33 @@ function CarbonsPanel:ShowMap() go = newObject(self.btnPre) go.transform:SetParent(selfObj.transform) go.transform.localScale = Vector3.one - go.transform.localPosition = Vector3.zero + go.transform.localPosition = value.btnPos self.btnList[key] = go end go:SetActive(true) - Util.GetGameObject(go,"Text"):GetComponent("Text").text = systemConfig[key].Name + local nameImg = Util.GetGameObject(go,"Name"):GetComponent("Image") + local lock = Util.GetGameObject(go,"Lock") + local time = Util.GetGameObject(go,"Grid/time") + local freetimes = Util.GetGameObject(go,"Grid/freetimes") + local buytimes = Util.GetGameObject(go,"Grid/buytimes") + time:SetActive(false) + freetimes:SetActive(false) + buytimes:SetActive(false) + nameImg.sprite = self.spLoader:LoadSprite(value.nameImg) + + if ActTimeCtrlManager.SingleFuncState(value.id) then + lock:SetActive(false) + if value.time then + time:SetActive(true) + end + if value.Privileges then + freetimes:SetActive(true) + buytimes:SetActive(true) + end + else + lock:SetActive(true) + end Util.AddOnceClick(selfObj,function () self:BtnClick(key) end) @@ -133,19 +162,13 @@ function CarbonsPanel:BtnClick(id) if ActTimeCtrlManager.SingleFuncState(id) then if #ExpeditionManager.nodeInfo <= 0 then if ExpeditionManager.expeditionLeve == -1 then - NetManager.GetExpeditionRequest( - 2, - function() - JumpManager.GoJump(64001) - end - ) + NetManager.GetExpeditionRequest(2,function() + JumpManager.GoJump(64001) + end) else - NetManager.GetExpeditionRequest( - ExpeditionManager.expeditionLeve, - function() - JumpManager.GoJump(64001) - end - ) + NetManager.GetExpeditionRequest(ExpeditionManager.expeditionLeve,function() + JumpManager.GoJump(64001) + end) end else JumpManager.GoJump(64001) @@ -172,7 +195,6 @@ function CarbonsPanel:BtnClick(id) end elseif id == FUNCTION_OPEN_TYPE.TRIAL then--森罗在此!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --LogGreen("点击进入森罗时候的层数"..MapTrialManager.curTowerLevel) - if ActTimeCtrlManager.SingleFuncState(id) then CarbonManager.difficulty = CARBON_TYPE.TRIAL CarbonManager.carbonType = CARBON_TYPE.TRIAL @@ -187,7 +209,6 @@ function CarbonsPanel:BtnClick(id) MapManager.isTimeOut = false SwitchPanel.OpenPanel(UIName.MapPanel) end) - LogBlue("嘤嘤嘤") else if not ActTimeCtrlManager.IsQualifiled(id) then local config = ConfigManager.GetConfigData(ConfigName.GlobalSystemConfig,FUNCTION_OPEN_TYPE.TRIAL) @@ -195,7 +216,6 @@ function CarbonsPanel:BtnClick(id) else PopupTipPanel.ShowTip(Language[10280]) end - end elseif id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then if ActTimeCtrlManager.IsQualifiled(id) then @@ -217,6 +237,12 @@ function CarbonsPanel:BtnClick(id) else PopupTipPanel.ShowTip(Language[10281]) end + elseif id == FUNCTION_OPEN_TYPE.FIGHTLEVEL then + if ActTimeCtrlManager.SingleFuncState(id) then + UIManager.OpenPanel(UIName.FightLevelChapterPanel) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.FIGHTLEVEL)) + end end end