From 0b5c697dbb98ee0bfa6a7aa9623022d2742c14e1 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Thu, 10 Oct 2024 14:00:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8D=A1=E9=A1=B5=E9=9D=A2=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/DynamicActicity/TimeLimitUpHero.prefab | 20 +- .../UI/GeneralPanel/GeneralBigPopup.prefab | 94 +++--- .../UI/Recruit/RecruitEquipPanelNew.prefab | 174 +++++++++- .../UI/Recruit/RecruitMainPanel.prefab | 301 +++++++++++++++--- .../Prefabs/UI/Recruit/RecruitPanelNew.prefab | 14 +- .../UpGradePackage/UpGradePackagePanel.prefab | 262 ++++++++------- 6 files changed, 615 insertions(+), 250 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index d904606556..6cf6759aee 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -383,7 +383,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 966, y: -100} + m_AnchoredPosition: {x: 966, y: -236} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3803326489293840791 @@ -624,7 +624,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 966, y: -673.09} + m_AnchoredPosition: {x: 966, y: -610} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &988307759817543788 @@ -841,7 +841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 966, y: -291.03003} + m_AnchoredPosition: {x: 966, y: -417} m_SizeDelta: {x: 140, y: 160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4300029144163247428 @@ -10217,8 +10217,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -243, y: -158} - m_SizeDelta: {x: 71.599976, y: 69.92993} + m_AnchoredPosition: {x: -289.7, y: -99.9} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7359118887627014995 CanvasRenderer: @@ -10248,7 +10248,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -16463,15 +16463,15 @@ RectTransform: m_GameObject: {fileID: 8327315105478471619} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.68, y: 0.68, z: 1} + m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 1820718257822173687} 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: 589, y: -838} - m_SizeDelta: {x: 3839.9998, y: 2160} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 117, y: -909.9} + m_SizeDelta: {x: 2760, y: 2160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8480489074927530339 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab index a52e50392b..8c2de1d3c8 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab @@ -364,10 +364,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 595, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &103057047 CanvasRenderer: @@ -2992,7 +2992,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1006421095 RectTransform: m_ObjectHideFlags: 0 @@ -8146,9 +8146,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 458.52002, y: -74} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8534846200040473326 @@ -9171,10 +9171,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 75, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4333355844115441707 CanvasRenderer: @@ -11665,7 +11665,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: -410} - m_SizeDelta: {x: 800, y: 90} + m_SizeDelta: {x: 0, y: 90} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5992374240210674179 CanvasRenderer: @@ -14157,7 +14157,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -444.63525, y: 82} - m_SizeDelta: {x: 0, y: 164} + m_SizeDelta: {x: 1021.02, y: 164} m_Pivot: {x: 0, y: 0.5} --- !u!114 &4745920919532241360 MonoBehaviour: @@ -14733,9 +14733,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 782.52, y: -74} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5088452318213877806 @@ -16468,9 +16468,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 620.52, y: -74} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8124929215582228228 @@ -21191,9 +21191,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 944.52, y: -74} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &820671683722164319 @@ -21309,10 +21309,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 465, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1573551743946025575 CanvasRenderer: @@ -25822,10 +25822,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 335, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4934918169303577311 CanvasRenderer: @@ -27058,9 +27058,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 134.51001, y: -74} m_SizeDelta: {x: 153.02, y: 64.52} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8132826141603541157 @@ -27439,10 +27439,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 205, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5684472203954849967 CanvasRenderer: @@ -29041,10 +29041,10 @@ RectTransform: m_Father: {fileID: 6511771316027140810} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 725, y: -45} - m_SizeDelta: {x: 150, y: 150} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6724403881698098274 CanvasRenderer: @@ -33266,9 +33266,9 @@ RectTransform: m_Father: {fileID: 8479989555407586267} 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 296.52002, y: -74} m_SizeDelta: {x: 153, y: 64.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2809588181979660699 @@ -35820,7 +35820,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &3828362588263756447 RectTransform: m_ObjectHideFlags: 0 @@ -44563,7 +44563,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: 8f20c7f83b837d64aa1eb6fd54fce9f1, type: 3} + m_Sprite: {fileID: 21300000, guid: d70552afebae9734d8cdfc55cb7d6435, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab index 5c8fd9c0a5..3f109a1058 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitEquipPanelNew.prefab @@ -140,6 +140,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 224548315728257952} + - {fileID: 1000461364720709120} - {fileID: 7041744091984222116} - {fileID: 3486540690740851400} m_Father: {fileID: 224104263369352388} @@ -20279,7 +20280,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114040022} - m_RootOrder: 2 + 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} @@ -20455,15 +20456,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.4117647, g: 0.84313726, 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: b204bd77afb57e14e830d912e88eb357, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 9717828f6bab66149bd19fd7c4199c3d, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -21243,7 +21244,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: 266.85, y: -434} + m_AnchoredPosition: {x: 266.85, y: -472} m_SizeDelta: {x: 388.5, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6521175734626083417 @@ -36807,7 +36808,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2114040022} - m_RootOrder: 1 + 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} @@ -44017,6 +44018,80 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &4214141788545672831 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2964229123557174412} + - component: {fileID: 2413922019723486215} + - component: {fileID: 2628869031026154555} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2964229123557174412 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4214141788545672831} + m_LocalRotation: {x: 0, y: 0, z: 1, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1000461364720709120} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 150, y: 0} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2413922019723486215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4214141788545672831} + m_CullTransparentMesh: 0 +--- !u!114 &2628869031026154555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4214141788545672831} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &4216472338511830873 GameObject: m_ObjectHideFlags: 0 @@ -59889,7 +59964,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: -459} + m_AnchoredPosition: {x: 0, y: -452} m_SizeDelta: {x: 1082, y: 312} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5417627610121447029 @@ -60714,7 +60789,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 @@ -85372,6 +85447,81 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &7252455485238889055 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1000461364720709120} + - component: {fileID: 3814266820929254918} + - component: {fileID: 7144111895349565344} + m_Layer: 5 + m_Name: UPBG + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1000461364720709120 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252455485238889055} + 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: 2964229123557174412} + m_Father: {fileID: 2114040022} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -50} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3814266820929254918 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252455485238889055} + m_CullTransparentMesh: 0 +--- !u!114 &7144111895349565344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7252455485238889055} + 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: af926bea5e282854f98cce4d8f6c5121, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!1 &7314735026540836441 GameObject: m_ObjectHideFlags: 0 @@ -86086,7 +86236,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: -264.5, y: -438} + m_AnchoredPosition: {x: -264.5, y: -476} m_SizeDelta: {x: 384, y: 112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9214746310570209805 @@ -91600,8 +91750,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 406, y: 839} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: 250, y: 860} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &10828005597466579 CanvasRenderer: @@ -91631,7 +91781,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab index ad0669070b..7dc33f5306 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitMainPanel.prefab @@ -27,14 +27,14 @@ RectTransform: m_GameObject: {fileID: 779243401} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.35, y: 0.35, z: 1} + m_LocalScale: {x: 0.15, y: 0.15, z: 1} m_Children: [] m_Father: {fileID: 4134749787074312446} 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: 194.4, y: 12} + m_AnchoredPosition: {x: -103.4, y: 12} m_SizeDelta: {x: 718, y: 1112} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &779243404 @@ -65,7 +65,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: a7da6cea95ba402439054a9a694a5d77, type: 3} + m_Sprite: {fileID: 21300000, guid: ddaaaa488f2db274d9f9693552f76762, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -110,7 +110,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: -1482.3, y: 18.849976} - m_SizeDelta: {x: 524.35, y: 317.85} + m_SizeDelta: {x: 340, y: 200} m_Pivot: {x: 0.5, y: 0} --- !u!222 &909235708 CanvasRenderer: @@ -133,7 +133,7 @@ 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.59607846} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: @@ -375,8 +375,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -107.10004, y: 158.60004} - m_SizeDelta: {x: 214.4, y: 235.5} + m_AnchoredPosition: {x: -158, y: 158.60004} + m_SizeDelta: {x: 316.1, y: 235.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1852298991012399287 CanvasRenderer: @@ -482,8 +482,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: -14, y: -62} - m_SizeDelta: {x: 480.3, y: 100} + m_AnchoredPosition: {x: -13.847, y: -57.13} + m_SizeDelta: {x: 312.3, y: 54.19} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1979830588446784777 CanvasRenderer: @@ -520,7 +520,7 @@ MonoBehaviour: m_BestFit: 1 m_MinSize: 8 m_MaxSize: 80 - m_Alignment: 3 + m_Alignment: 5 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -562,8 +562,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: 0.0012409, y: -2.899994} - m_SizeDelta: {x: 541, y: 319} + m_AnchoredPosition: {x: 0, y: -2.899994} + m_SizeDelta: {x: 340, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7022388076889857708 CanvasRenderer: @@ -638,7 +638,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 410.9} + m_SizeDelta: {x: 0, y: 250} m_Pivot: {x: 0, y: 0} --- !u!114 &4401188943909670150 MonoBehaviour: @@ -680,6 +680,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &2307528787257669520 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3676666144256376742} + - component: {fileID: 5906634793309699860} + - component: {fileID: 4866392788707116973} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3676666144256376742 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307528787257669520} + 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: 6860962394609556031} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -250, y: 0} + m_SizeDelta: {x: 500, y: 260} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5906634793309699860 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307528787257669520} + m_CullTransparentMesh: 0 +--- !u!114 &4866392788707116973 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2307528787257669520} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &2678878454726419445 GameObject: m_ObjectHideFlags: 0 @@ -714,8 +788,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: 227.3, y: 136.9} - m_SizeDelta: {x: 26, y: 26} + m_AnchoredPosition: {x: 147.2, y: 94} + m_SizeDelta: {x: 30, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1473326464953147949 CanvasRenderer: @@ -821,7 +895,7 @@ MonoBehaviour: Version=1.0.0.0, Culture=neutral, PublicKeyToken=null m_FontData: m_Font: {fileID: 12800000, guid: be22547d075a3fa439f78ce38cdb4beb, type: 3} - m_FontSize: 36 + m_FontSize: 30 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -942,8 +1016,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: -40, y: 12} - m_SizeDelta: {x: 435.4, y: 53.4} + m_AnchoredPosition: {x: 18.73, y: 12} + m_SizeDelta: {x: 242.76, y: 53.4} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1761920585522180178 CanvasRenderer: @@ -1016,8 +1090,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: 0, y: 0} - m_SizeDelta: {x: 560, y: 222} + m_AnchoredPosition: {x: -0.01, y: 0.62999725} + m_SizeDelta: {x: 335.1, y: 223.27} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2472714987594485574 CanvasRenderer: @@ -1041,14 +1115,88 @@ MonoBehaviour: 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: 595923f9a7d98db47b4e9bbc4d23e1d7, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!1 &5904022348359049190 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3846597541093301582} + - component: {fileID: 8497523423667151484} + - component: {fileID: 650507753071871641} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3846597541093301582 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5904022348359049190} + 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: 6860962394609556031} + 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: 208.1} + m_SizeDelta: {x: 200, y: -97.1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8497523423667151484 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5904022348359049190} + m_CullTransparentMesh: 0 +--- !u!114 &650507753071871641 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5904022348359049190} + 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: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: c1a76ef8930a77445bdd499c3f3330d8, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1074,7 +1222,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6860202946281388347 RectTransform: m_ObjectHideFlags: 0 @@ -1250,7 +1398,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &6860962394609556031 RectTransform: m_ObjectHideFlags: 0 @@ -1261,14 +1409,17 @@ 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: 4736422082656146083} + - {fileID: 3676666144256376742} + - {fileID: 3846597541093301582} m_Father: {fileID: 8396209728857207438} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0.024902344, y: 5.9000244} - m_SizeDelta: {x: 0.099975586, y: 156} + m_AnchoredPosition: {x: 0, y: 130} + m_SizeDelta: {x: 0, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6863121340433113483 CanvasRenderer: @@ -1291,15 +1442,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.18039216, g: 0.18039216, b: 0.18039216, 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: fefc7ad231e7d6c44885c22982f15ec5, type: 3} - m_Type: 0 + m_Sprite: {fileID: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1673,8 +1824,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 40, y: 106} - m_SizeDelta: {x: 79, y: 175} + m_AnchoredPosition: {x: 48.6, y: 106} + m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4851780475586518862 CanvasRenderer: @@ -1704,7 +1855,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: 8561d25febfc8bc428011c49f29d126b, type: 3} + m_Sprite: {fileID: 21300000, guid: 0efe29bd0476d5d4e8c274f2030570ec, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1809,8 +1960,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 99, y: 158.60004} - m_SizeDelta: {x: 198.2, y: 235.5} + m_AnchoredPosition: {x: 154.2, y: 158.60004} + m_SizeDelta: {x: 308.4, y: 235.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6243142082612930318 CanvasRenderer: @@ -1882,6 +2033,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &8122504569386723150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4736422082656146083} + - component: {fileID: 2950070522495967685} + - component: {fileID: 841267194416816082} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4736422082656146083 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8122504569386723150} + m_LocalRotation: {x: 0, y: -1, z: 0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6860962394609556031} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 180, y: 0, z: 180} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 250, y: 0} + m_SizeDelta: {x: 500, y: 260} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2950070522495967685 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8122504569386723150} + m_CullTransparentMesh: 0 +--- !u!114 &841267194416816082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8122504569386723150} + 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: fbba7bf478bcbfa4e89527b0910764ef, 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 &8452005726723476382 GameObject: m_ObjectHideFlags: 0 @@ -1925,8 +2150,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -0.024902344, y: 900.3} - m_SizeDelta: {x: -0.1, y: 1800.4} + m_AnchoredPosition: {x: 0, y: 130} + m_SizeDelta: {x: 0, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4755473649158108574 CanvasRenderer: @@ -1974,7 +2199,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: -933.99994, y: 13} - m_SizeDelta: {x: 541, y: 319} + m_SizeDelta: {x: 340, y: 200} m_Pivot: {x: 0.5, y: 0} --- !u!222 &8189676088079493369 CanvasRenderer: diff --git a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab index dd5eefdf67..1623d00316 100644 --- a/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Recruit/RecruitPanelNew.prefab @@ -616,15 +616,15 @@ RectTransform: m_GameObject: {fileID: 1190103957847382} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.68, y: 0.68, z: 1} + m_LocalScale: {x: 0.75, y: 0.75, z: 1} m_Children: [] m_Father: {fileID: 2114040022} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -26, y: 123} - m_SizeDelta: {x: 2759.9998, y: 240} + m_AnchoredPosition: {x: -21, y: -911} + m_SizeDelta: {x: 2759.9998, y: 2160} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &222544982504122848 CanvasRenderer: @@ -11926,8 +11926,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 406, y: 839} - m_SizeDelta: {x: 45, y: 45} + m_AnchoredPosition: {x: 250, y: 860} + m_SizeDelta: {x: 88, y: 72} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5406922750988588122 CanvasRenderer: @@ -11957,7 +11957,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: 47b0d71d3c8ef79468a5fb4d8ec5f365, type: 3} + m_Sprite: {fileID: 21300000, guid: d7183aaa8ad92e2488276d26fc370192, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab index fbac37ad14..b6c7356c9d 100644 --- a/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/UpGradePackage/UpGradePackagePanel.prefab @@ -44095,7 +44095,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 6350453982824743016} + - {fileID: 1062381782954341938} m_Father: {fileID: 6176893569939801487} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -50116,6 +50116,131 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1001 &2832396708506588295 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8679419316812699543} + m_Modifications: + - target: {fileID: 4682328372867350305, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_Name + value: 10056_show (1) + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 87 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -246 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9e43e1a9e87c806479579f995ca56562, type: 3} +--- !u!224 &1062381782954341938 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3022169710500487861, guid: 9e43e1a9e87c806479579f995ca56562, + type: 3} + m_PrefabInstance: {fileID: 2832396708506588295} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4536874399602717747 PrefabInstance: m_ObjectHideFlags: 0 @@ -50241,138 +50366,3 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 4536874399602717747} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5210825358877511064 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8679419316812699543} - m_Modifications: - - target: {fileID: 1184950613713489391, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_Name - value: live2d_dasiqizhanshi - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 47 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -573 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalScale.x - value: 0.4 - objectReference: {fileID: 0} - - target: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - propertyPath: m_LocalScale.y - value: 0.4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2a57102e2365d7d49ade0d49e2e043c5, type: 3} ---- !u!224 &6350453982824743016 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 1184950613713489392, guid: 2a57102e2365d7d49ade0d49e2e043c5, - type: 3} - m_PrefabInstance: {fileID: 5210825358877511064} - m_PrefabAsset: {fileID: 0}