From e1ae3e3bf3dee3883d027a53290c8de9a322d481 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 29 Jul 2021 10:09:02 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=89=AF=E6=9C=AC=E7=95=8C=E9=9D=A2?= =?UTF-8?q?=E3=80=91=E6=8C=89=E4=B8=8B=E5=8C=BA=E5=9F=9F=E5=A4=A7=E5=B0=8F?= =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/Carbon/NewCarbon/CarbonsPanel.prefab | 174 +++++++++++++++--- .../Modules/Carbon/NewCarbon/CarbonsPanel.lua | 6 +- 2 files changed, 153 insertions(+), 27 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab index a5bcb33b98..6663b9231d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Carbon/NewCarbon/CarbonsPanel.prefab @@ -59,7 +59,7 @@ 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: [] @@ -133,7 +133,7 @@ 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: [] @@ -206,6 +206,7 @@ GameObject: - component: {fileID: 6785359075464710787} - component: {fileID: 757476603103128718} - component: {fileID: 1952886349706415243} + - component: {fileID: 7180480316198442812} m_Layer: 5 m_Name: expedition m_TagString: Untagged @@ -231,7 +232,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -240.7, y: 766.4} - m_SizeDelta: {x: 578, y: 355} + m_SizeDelta: {x: 350, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6785359075464710787 CanvasRenderer: @@ -302,6 +303,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7180480316198442812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 161000721848713139} + 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 &188154192024860404 GameObject: m_ObjectHideFlags: 0 @@ -314,6 +335,7 @@ GameObject: - component: {fileID: 2919010425323436214} - component: {fileID: 3814754084496594939} - component: {fileID: 552503115513005383} + - component: {fileID: 2616828843611983892} m_Layer: 5 m_Name: monster m_TagString: Untagged @@ -410,6 +432,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &2616828843611983892 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188154192024860404} + 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 &189011128176918932 GameObject: m_ObjectHideFlags: 0 @@ -469,7 +511,7 @@ 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: [] @@ -543,7 +585,7 @@ 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: [] @@ -617,7 +659,7 @@ 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: [] @@ -644,6 +686,7 @@ GameObject: - component: {fileID: 286824041071461211} - component: {fileID: 6495072266360337350} - component: {fileID: 1254603313305757730} + - component: {fileID: 6346546485856201853} m_Layer: 5 m_Name: xuanyuan m_TagString: Untagged @@ -669,7 +712,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 156, y: 656} - m_SizeDelta: {x: 336, y: 494} + m_SizeDelta: {x: 336, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &286824041071461211 CanvasRenderer: @@ -740,6 +783,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &6346546485856201853 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 648739050029695343} + 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 &1087866233463156302 GameObject: m_ObjectHideFlags: 0 @@ -778,7 +841,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: -295.9, y: -40.9} - m_SizeDelta: {x: 400, y: 550} + m_SizeDelta: {x: 250, y: 400} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4208572497002420159 CanvasRenderer: @@ -955,6 +1018,7 @@ GameObject: - component: {fileID: 659684666666108438} - component: {fileID: 1725124879206285056} - component: {fileID: 150071370334723519} + - component: {fileID: 5446762531847647535} m_Layer: 5 m_Name: daily m_TagString: Untagged @@ -979,8 +1043,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: 75.4, y: -393.1} - m_SizeDelta: {x: 553, y: 515} + m_AnchoredPosition: {x: 75.4, y: -288.90005} + m_SizeDelta: {x: 400, y: 306.6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &659684666666108438 CanvasRenderer: @@ -1051,6 +1115,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5446762531847647535 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1118594555143834046} + 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 &1160815677557083361 GameObject: m_ObjectHideFlags: 0 @@ -1718,7 +1802,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: 0} + m_AnchoredPosition: {x: -189, y: -69} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3921825046780773120 @@ -2251,6 +2335,7 @@ GameObject: - component: {fileID: 7977807575607661485} - component: {fileID: 3377588569313464140} - component: {fileID: 4336897700436041572} + - component: {fileID: 5036688087282659812} m_Layer: 5 m_Name: trial m_TagString: Untagged @@ -2275,8 +2360,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: 67.9, y: -665.7} - m_SizeDelta: {x: 846, y: 447} + m_AnchoredPosition: {x: 47.4, y: -610.9} + m_SizeDelta: {x: 609, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7977807575607661485 CanvasRenderer: @@ -2347,6 +2432,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &5036688087282659812 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4971870567736764109} + 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 &5263321936350624843 GameObject: m_ObjectHideFlags: 0 @@ -2805,7 +2910,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: 0} + m_AnchoredPosition: {x: 21, y: -55} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5669951066384980921 @@ -2867,7 +2972,7 @@ 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: [] @@ -3041,7 +3146,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: 0} + m_AnchoredPosition: {x: 0, y: -105} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5728866794207624804 @@ -3177,7 +3282,7 @@ 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: [] @@ -3325,7 +3430,7 @@ 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: [] @@ -3659,7 +3764,7 @@ 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: [] @@ -4120,7 +4225,7 @@ 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: [] @@ -4221,6 +4326,7 @@ GameObject: - component: {fileID: 8356356596520800600} - component: {fileID: 3777690562007407132} - component: {fileID: 2068090007307217179} + - component: {fileID: 4497440218633784089} m_Layer: 5 m_Name: endless m_TagString: Untagged @@ -4245,8 +4351,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: -65.5, y: -23.7} - m_SizeDelta: {x: 917, y: 742} + m_AnchoredPosition: {x: 123.54999, y: 45.35} + m_SizeDelta: {x: 400, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8356356596520800600 CanvasRenderer: @@ -4317,6 +4423,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &4497440218633784089 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8544136516826615978} + 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 &8896427205265497543 GameObject: m_ObjectHideFlags: 0 @@ -4525,7 +4651,7 @@ 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: [] @@ -4707,7 +4833,7 @@ 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: [] diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua index cda5313d09..814dcb4b36 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/NewCarbon/CarbonsPanel.lua @@ -42,7 +42,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.ENDLESS, --无尽 objName = "endless", nameImg = "f_fuben_fubenming_06", - btnPos = Vector2(302,63), + btnPos = Vector2(86,-9), redPointType = RedPointType.EndLess, effect1 = "Fx_WuJinFuBen", effect2 = "Fx_WuJinFuBen_S", @@ -60,7 +60,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.DAILYCHALLENGE_COIN, --日常 objName = "daily", nameImg = "f_fuben_fubenming_05", - btnPos = Vector2(124,47), + btnPos = Vector2(124,-49), redPointType = RedPointType.HeroExplore, effect1 = "Fx_RiChangFuBen", effect2 = "Fx_RiChangFuBen_S", @@ -69,7 +69,7 @@ local carbonData = { id = FUNCTION_OPEN_TYPE.TRIAL, --森罗 objName = "trial", nameImg = "f_fuben_fubenming_01", - btnPos = Vector2(-189,21), + btnPos = Vector2(-156,-12), redPointType = RedPointType.Trial, effect1 = "Fx_SenLuoHuanJjing", effect2 = "Fx_SenLuoHuanJjing_S",