From 3f042895f63862a621b3b14812ce85ac85fac43c Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Mon, 15 Jul 2024 14:36:21 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E8=AF=95=E7=82=BC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CarDelay/GuildCarDelayMainPanel.prefab | 258 ++++++++++++++++-- 1 file changed, 236 insertions(+), 22 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab index ef8b225e81..71c6f1a8fd 100644 --- a/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Guild/CarDelay/GuildCarDelayMainPanel.prefab @@ -702,6 +702,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1914701816704577387} - {fileID: 3684034593863546720} m_Father: {fileID: 6644219483140430604} m_RootOrder: 7 @@ -709,7 +710,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 89, y: -280} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1875942570317279625 CanvasRenderer: @@ -739,7 +740,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: 384d5ca6e3d45ce41b20c213155ef132, type: 3} + m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -801,13 +802,14 @@ GameObject: - component: {fileID: 5289277818595638466} - component: {fileID: 1754108968931128750} - component: {fileID: 3157474377391495751} + - component: {fileID: 7605300444894434825} m_Layer: 5 m_Name: timeNum m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &5289277818595638466 RectTransform: m_ObjectHideFlags: 0 @@ -871,6 +873,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u95F4\u9694\u65F6\u95F4\uFF1A" LanguageIndex: 0 +--- !u!114 &7605300444894434825 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1456883155326229963} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &1464166319839730171 GameObject: m_ObjectHideFlags: 0 @@ -1309,11 +1326,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3700405974883273176} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -51.1} + m_AnchoredPosition: {x: 0, y: -66.6} m_SizeDelta: {x: 160, y: 101.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4145484585749365325 @@ -1671,6 +1688,7 @@ GameObject: - component: {fileID: 2030770693468687629} - component: {fileID: 4188976732141891790} - component: {fileID: 5682208654075672011} + - component: {fileID: 7130114974408477833} m_Layer: 5 m_Name: timeNum m_TagString: Untagged @@ -1695,7 +1713,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: -42, y: 69} + m_AnchoredPosition: {x: -25.5, y: 70.6} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4188976732141891790 @@ -1741,6 +1759,21 @@ MonoBehaviour: m_LineSpacing: 1 m_Text: "\u95F4\u9694\u65F6\u95F4\uFF1A" LanguageIndex: 0 +--- !u!114 &7130114974408477833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3082592238848229847} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &3084066146311336470 GameObject: m_ObjectHideFlags: 0 @@ -1969,6 +2002,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &3149347382522000730 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6575261367868995470} + - component: {fileID: 8629724560129500676} + - component: {fileID: 4092597914668439246} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6575261367868995470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3149347382522000730} + 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: 8673813077271240747} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 5.7} + m_SizeDelta: {x: 186, y: 156} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8629724560129500676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3149347382522000730} + m_CullTransparentMesh: 0 +--- !u!114 &4092597914668439246 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3149347382522000730} + 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: 8071635aaa09c5c4db90595e22a959d8, 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 &3384590086907468339 GameObject: m_ObjectHideFlags: 0 @@ -2499,12 +2606,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8673813077271240747} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0.40625003} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 5, y: -51.1} - m_SizeDelta: {x: 170, y: 101.7} + m_AnchoredPosition: {x: 5, y: -62.3} + m_SizeDelta: {x: 170, y: 86.7} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6237267162134739867 CanvasRenderer: @@ -2730,6 +2837,7 @@ GameObject: - component: {fileID: 394692999223109087} - component: {fileID: 441108315031332109} - component: {fileID: 8716446625043189088} + - component: {fileID: 2573187433026482253} m_Layer: 5 m_Name: num m_TagString: Untagged @@ -2777,7 +2885,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9882353, g: 0.9607843, b: 0.827451, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -2785,7 +2893,7 @@ MonoBehaviour: 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_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 @@ -2798,6 +2906,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 3:21 +--- !u!114 &2573187433026482253 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5143528300827283777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5294268228838436859 GameObject: m_ObjectHideFlags: 0 @@ -3043,6 +3166,7 @@ GameObject: - component: {fileID: 6120031733158163214} - component: {fileID: 4129961899513844255} - component: {fileID: 3570958308487521775} + - component: {fileID: 8030205945941236367} m_Layer: 5 m_Name: num m_TagString: Untagged @@ -3111,6 +3235,21 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 3:21 +--- !u!114 &8030205945941236367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5586077373823546604} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5} + m_EffectDistance: {x: 1, y: -1} + m_UseGraphicAlpha: 1 --- !u!1 &5706168419438690815 GameObject: m_ObjectHideFlags: 0 @@ -3141,6 +3280,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 100} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 6575261367868995470} - {fileID: 6674498300103096360} m_Father: {fileID: 6644219483140430604} m_RootOrder: 6 @@ -3148,7 +3288,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 90, y: -451} - m_SizeDelta: {x: 180, y: 174} + m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8795566283381337003 CanvasRenderer: @@ -3178,7 +3318,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: 8071635aaa09c5c4db90595e22a959d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 007ce76cef3dec944b160050bce344a5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3475,7 +3615,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9843138, g: 0.97647065, b: 0.9686275, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4524,7 +4664,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.9803922, g: 0.9725491, b: 0.96470594, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -4951,8 +5091,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 13, y: 3} - m_SizeDelta: {x: -663, y: 82.82} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -800, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402890559883257 CanvasRenderer: @@ -4982,7 +5122,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5275,8 +5415,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 14, y: 2} - m_SizeDelta: {x: -663, y: 82.82} + m_AnchoredPosition: {x: 0, y: 2} + m_SizeDelta: {x: -800, y: 82.82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7092402891292911296 CanvasRenderer: @@ -5306,7 +5446,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: 6ff20609e8c68014394e6b730e1c7948, type: 3} + m_Sprite: {fileID: 21300000, guid: e0d70e0322fd03b4bbf550d673a7cc5d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -6780,3 +6920,77 @@ RectTransform: m_AnchoredPosition: {x: 0.00024414062, y: -56.25} m_SizeDelta: {x: 0, y: 82.1} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &9143567032077589131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1914701816704577387} + - component: {fileID: 4472031071358729368} + - component: {fileID: 4709091239880810815} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1914701816704577387 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143567032077589131} + 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: 3700405974883273176} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 6.5} + m_SizeDelta: {x: 165, y: 167} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4472031071358729368 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143567032077589131} + m_CullTransparentMesh: 0 +--- !u!114 &4709091239880810815 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9143567032077589131} + 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: 384d5ca6e3d45ce41b20c213155ef132, 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