From 6950b52db9004e8777a4b61171fbf36ff694c749 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 7 Jul 2021 17:05:32 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=96=B0=E5=89=AF=E6=9C=AC=E3=80=91?= =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/NewCarbon/CarbonsPanel.prefab | 516 +++++++++++++++++- .../Modules/Carbon/NewCarbon/CarbonsPanel.lua | 140 +++-- .../Modules/Carbon/XuanYuanMirrorManager.lua | 4 + 3 files changed, 599 insertions(+), 61 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index dd9290f2bf..857aaeddca 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -1075,6 +1075,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1711225751475238281} m_CullTransparentMesh: 0 +--- !u!1 &2927630752871897046 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 23647679668048922} + - component: {fileID: 6495588927036638659} + - component: {fileID: 7644034011772049843} + m_Layer: 5 + m_Name: openlevel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &23647679668048922 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2927630752871897046} + 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: 3554872375462713039} + m_Father: {fileID: 7057920615600060315} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 135.5, y: -18.5} + m_SizeDelta: {x: 271, y: 37} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6495588927036638659 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2927630752871897046} + m_CullTransparentMesh: 0 +--- !u!114 &7644034011772049843 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2927630752871897046} + 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 &3405237349591711058 GameObject: m_ObjectHideFlags: 0 @@ -1152,6 +1227,86 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3438950333982016773 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2315429408670704543} + - component: {fileID: 7876039346552175887} + - component: {fileID: 3520002886689833446} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2315429408670704543 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3438950333982016773} + 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: 4268726969999273938} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7876039346552175887 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3438950333982016773} + m_CullTransparentMesh: 0 +--- !u!114 &3520002886689833446 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3438950333982016773} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.90588236, g: 0.7372549, b: 0.5019608, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u514D\u8D39\u6311\u6218\u6B21\u6570:10" + LanguageIndex: 0 --- !u!1 &3618207285468359019 GameObject: m_ObjectHideFlags: 0 @@ -1405,6 +1560,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 23647679668048922} - {fileID: 9208220117220525560} - {fileID: 4268726969999273938} - {fileID: 6447800873277570760} @@ -1662,6 +1818,86 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4937694557783567083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6603191248186052750} + - component: {fileID: 707705469750731587} + - component: {fileID: 5227876431490760981} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6603191248186052750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4937694557783567083} + 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: 6447800873277570760} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &707705469750731587 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4937694557783567083} + m_CullTransparentMesh: 0 +--- !u!114 &5227876431490760981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4937694557783567083} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.90588236, g: 0.7372549, b: 0.5019608, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u5269\u4F59\u8D2D\u4E70\u6B21\u6570:6" + LanguageIndex: 0 --- !u!1 &4971870567736764109 GameObject: m_ObjectHideFlags: 0 @@ -1926,6 +2162,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &5296025940834438091 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3739790612487049372} + - component: {fileID: 6697413273450810149} + - component: {fileID: 5106738677037964018} + m_Layer: 5 + m_Name: redPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &3739790612487049372 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296025940834438091} + 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: 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: 100, y: 20} + m_SizeDelta: {x: 30, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6697413273450810149 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296025940834438091} + m_CullTransparentMesh: 0 +--- !u!114 &5106738677037964018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5296025940834438091} + 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: f9ea4c4aff328ff4abcc21aae0a4fa10, 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 &5507092864030733154 GameObject: m_ObjectHideFlags: 0 @@ -2255,6 +2565,7 @@ RectTransform: - {fileID: 6981839850660148456} - {fileID: 6120839156560082947} - {fileID: 7057920615600060315} + - {fileID: 3739790612487049372} m_Father: {fileID: 6278899851612589502} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2655,7 +2966,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &9208220117220525560 RectTransform: m_ObjectHideFlags: 0 @@ -2666,14 +2977,15 @@ RectTransform: 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: 3903507150968756116} m_Father: {fileID: 7057920615600060315} - m_RootOrder: 0 + 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 135.5, y: -55.5} + m_SizeDelta: {x: 271, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5074906141544346636 CanvasRenderer: @@ -2877,7 +3189,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &4268726969999273938 RectTransform: m_ObjectHideFlags: 0 @@ -2888,14 +3200,15 @@ RectTransform: 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: 2315429408670704543} m_Father: {fileID: 7057920615600060315} - m_RootOrder: 1 + 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 135.5, y: -92.5} + m_SizeDelta: {x: 271, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3282577278308170168 CanvasRenderer: @@ -2934,6 +3247,166 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7977732792688270228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3903507150968756116} + - component: {fileID: 3247609795179039275} + - component: {fileID: 2637767931674760389} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3903507150968756116 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7977732792688270228} + 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: 9208220117220525560} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3247609795179039275 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7977732792688270228} + m_CullTransparentMesh: 0 +--- !u!114 &2637767931674760389 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7977732792688270228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.90588236, g: 0.7372549, b: 0.5019608, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "\u91CD\u7F6E\u65F6\u95F4:11\u65F623\u5206" + LanguageIndex: 0 +--- !u!1 &8055115746436551152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3554872375462713039} + - component: {fileID: 7642331267739844972} + - component: {fileID: 1098196189500790555} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3554872375462713039 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8055115746436551152} + 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: 23647679668048922} + m_RootOrder: 0 + 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_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7642331267739844972 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8055115746436551152} + m_CullTransparentMesh: 0 +--- !u!114 &1098196189500790555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8055115746436551152} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ebfe0e44da74fbd44b1b744995de2324, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.90588236, g: 0.7372549, b: 0.5019608, 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: 12800000, guid: 4b73e9e4512d17e4daeea351e090d33c, type: 3} + m_FontSize: 25 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 1 + m_VerticalOverflow: 1 + m_LineSpacing: 1 + m_Text: "45\u7EA7\u5F00\u542F" + LanguageIndex: 0 --- !u!1 &8415105165734988754 GameObject: m_ObjectHideFlags: 0 @@ -3162,7 +3635,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6447800873277570760 RectTransform: m_ObjectHideFlags: 0 @@ -3173,14 +3646,15 @@ RectTransform: 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: 6603191248186052750} m_Father: {fileID: 7057920615600060315} - m_RootOrder: 2 + m_RootOrder: 3 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 135.5, y: -129.5} + m_SizeDelta: {x: 271, y: 37} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3619866950882426101 CanvasRenderer: diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index 6d9e65a5a8..619e8086d6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -16,17 +16,6 @@ local carbonData = { nameImg = "f_fuben_fubenming_04", btnPos = Vector2(-39,-110), redPointType = RedPointType.EpicExplore, - --次数特权 - Privileges ={ - [1] = { - id = PRIVILEGE_TYPE.MONSTERCAMP_BATTLENUM, - string = "免费挑战次数:%s" - }, - [2] = { - id = PRIVILEGE_TYPE.MONSTERCAMP_BUY_BATTLENUM, - string = "剩余购买次数:%s" - }, - }, }, [FUNCTION_OPEN_TYPE.EXPEDITION] = { id = FUNCTION_OPEN_TYPE.EXPEDITION, --大闹天宫 @@ -34,7 +23,6 @@ local carbonData = { nameImg = "f_fuben_fubenming_03", btnPos = Vector2(39,-67), redPointType = RedPointType.OrdinaryExplore, - canPress = true, }, [FUNCTION_OPEN_TYPE.ENDLESS] = { id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽 @@ -54,7 +42,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.PEOPLE_MIRROR, --轩辕 objName = "xuanyuan", nameImg = "f_fuben_fubenming_02", - btnPos = Vector2(-4,-86), + btnPos = Vector2(-4,-60), redPointType = RedPointType.People_Mirror, }, [FUNCTION_OPEN_TYPE.FIGHTLEVEL] = { @@ -79,6 +67,7 @@ function CarbonsPanel:InitComponent() self.map = Util.GetGameObject(self.gameObject,"Map") self.btnPre = Util.GetGameObject(self.gameObject,"btnPre") self.btnList = {} + self.timeList = {} end --绑定事件(用于子类重写) @@ -106,6 +95,7 @@ function CarbonsPanel:OnShow(...) -- 刷新一次编队战斗力 FormationManager.RefreshMainFormationPower() self:ShowMap() + self:SetTime() end function CarbonsPanel:ShowMap() @@ -122,33 +112,97 @@ function CarbonsPanel:ShowMap() go:SetActive(true) 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") + local redPoint = Util.GetGameObject(go,"redPoint") - time:SetActive(false) - freetimes:SetActive(false) - buytimes:SetActive(false) + lock:SetActive(true) nameImg.sprite = self.spLoader:LoadSprite(value.nameImg) if ActTimeCtrlManager.SingleFuncState(value.id) then + BindRedPointObject(value.redPointType,redPoint) 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 + self:TipShow(go,value) Util.AddOnceClick(selfObj,function () self:BtnClick(key) end) end end +--时间/剩余次数显示 +function CarbonsPanel:TipShow(_go,_value) + local openLevel = Util.GetGameObject(_go,"Grid/openlevel") + local time = Util.GetGameObject(_go,"Grid/time") + local freetimes = Util.GetGameObject(_go,"Grid/freetimes") + local buytimes = Util.GetGameObject(_go,"Grid/buytimes") + + local openLevelText = Util.GetGameObject(openLevel,"Text"):GetComponent("Text") + local timeText = Util.GetGameObject(time,"Text"):GetComponent("Text") + local freetimesText = Util.GetGameObject(freetimes,"Text"):GetComponent("Text") + local buytimesText = Util.GetGameObject(buytimes,"Text"):GetComponent("Text") + openLevel:SetActive(false) + time:SetActive(false) + freetimes:SetActive(false) + buytimes:SetActive(false) + + if ActTimeCtrlManager.SingleFuncState(_value.id) then + --免费次数 + if _value.id == FUNCTION_OPEN_TYPE.MONSTER_COMING then + freetimes:SetActive(true) + buytimes:SetActive(true) + freetimesText.text = string.format("免费挑战次数:%s",MonsterCampManager.GetCanBattleCount()) + buytimesText.text = string.format("剩余购买次数:%s",MonsterCampManager.GetCanBuyBattleCount()) + elseif _value.id == FUNCTION_OPEN_TYPE.PEOPLE_MIRROR then + freetimes:SetActive(true) + buytimes:SetActive(true) + local free,buy = XuanYuanMirrorManager.RetrunFreeAndBuyTimes() + freetimesText.text = string.format("免费挑战次数:%s",free) + buytimesText.text = string.format("剩余购买次数:%s",buy) + end + --刷新时间 + if _value.id == FUNCTION_OPEN_TYPE.EXPEDITION then--大闹天宫 + time:SetActive(true) + local expeditionData = systemConfig[JumpType.Expedition] + self.timeList[_value.id] = {} + self.timeList[_value.id].Text = timeText + self.timeList[_value.id].time = ExpeditionManager.startTime + tonumber(expeditionData.SeasonEnd) - GetTimeStamp() + expeditionData.SeasonInterval * 60 + elseif _value.id == FUNCTION_OPEN_TYPE.ENDLESS then--无尽副本 + time:SetActive(true) + self.timeList[_value.id] = {} + self.timeList[_value.id].Text = timeText + self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.ENDLESS).endTime - GetTimeStamp() + elseif _value.id == FUNCTION_OPEN_TYPE.TRIAL then--森罗幻境 + time:SetActive(true) + self.timeList[_value.id] = {} + self.timeList[_value.id].Text = timeText + self.timeList[_value.id].time = ActTimeCtrlManager.GetSerDataByTypeId(FUNCTION_OPEN_TYPE.TRIAL).endTime - GetTimeStamp() + end + if self.timeList[_value.id] then + timeText.text = string.format("重置时间:%s",TimeToFelaxible(self.timeList[_value.id].time)) + end + else + openLevel:SetActive(true) + openLevelText.text = string.format("%s级开启",systemConfig[_value.id].OpenRules[2]) + end +end + +function CarbonsPanel:SetTime() + if self.timer then + self.timer:Stop() + self.timer = nil + end + self.timer = Timer.New(function () + for key, item in pairs(self.timeList) do + item.Text.text = string.format("重置时间:%s",TimeToFelaxible(item.time)) + item.time = item.time - 1 + if item.time <= 0 then + self:OnShow() + end + end + end, 1, -1, true) + self.timer:Start() +end + +--点击 function CarbonsPanel:BtnClick(id) if id == FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN then if ActTimeCtrlManager.SingleFuncState(id) == false then --如果未解锁 @@ -183,16 +237,16 @@ function CarbonsPanel:BtnClick(id) PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(FUNCTION_OPEN_TYPE.EXPEDITION)) end end - elseif id == FUNCTION_OPEN_TYPE.CARDELAY then - if ActTimeCtrlManager.IsQualifiled(id) then - if PlayerManager.familyId == 0 then - PopupTipPanel.ShowTip(Language[10278]) - return - end - UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) - else - PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) - end + -- elseif id == FUNCTION_OPEN_TYPE.CARDELAY then + -- if ActTimeCtrlManager.IsQualifiled(id) then + -- if PlayerManager.familyId == 0 then + -- PopupTipPanel.ShowTip(Language[10278]) + -- return + -- end + -- UIManager.OpenPanel(UIName.GuildCarDelayMainPanel) + -- else + -- PopupTipPanel.ShowTip(ActTimeCtrlManager.GetFuncTip(id)) + -- end elseif id == FUNCTION_OPEN_TYPE.TRIAL then--森罗在此!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! --LogGreen("点击进入森罗时候的层数"..MapTrialManager.curTowerLevel) if ActTimeCtrlManager.SingleFuncState(id) then @@ -244,7 +298,6 @@ function CarbonsPanel:BtnClick(id) PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.FIGHTLEVEL)) end end - end function CarbonsPanel:OnSortingOrderChange() @@ -258,7 +311,14 @@ end --界面关闭时调用(用于子类重写) function CarbonsPanel:OnClose() - + for key, value in pairs(carbonData) do + local redPoint = Util.GetGameObject(self.btnList[key],"redPoint") + ClearRedPointObject(value.redPointType,redPoint) + end + if self.timer then + self.timer:Stop() + self.timer = nil + end end --界面销毁时调用(用于子类重写) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua index 34111f77c0..e863d906b9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorManager.lua @@ -169,6 +169,10 @@ function this.GetTimeTip() return str end +function this.RetrunFreeAndBuyTimes() + return PrivilegeManager.GetPrivilegeRemainValue(this.freeTimeId),PrivilegeManager.GetPrivilegeRemainValue(this.buyTimeId) +end + function this.GetBuyTimesTip() local config = raceTowerConfig[1].Privilege local rechargeCommodityConfig=ConfigManager.GetConfigData(ConfigName.RechargeCommodityConfig,4003)