diff --git a/Assets/lua/app/module/formation/formation_manager.lua.bytes b/Assets/lua/app/module/formation/formation_manager.lua.bytes index 8a035e76a..ee0c214d4 100644 Binary files a/Assets/lua/app/module/formation/formation_manager.lua.bytes and b/Assets/lua/app/module/formation/formation_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/company/company_comp.lua.bytes b/Assets/lua/app/ui/company/company_comp.lua.bytes index dec8bbe2b..549970737 100644 Binary files a/Assets/lua/app/ui/company/company_comp.lua.bytes and b/Assets/lua/app/ui/company/company_comp.lua.bytes differ diff --git a/Assets/prefabs/ui/company/company_comp.prefab b/Assets/prefabs/ui/company/company_comp.prefab index 42ae897c0..4d78a9790 100644 --- a/Assets/prefabs/ui/company/company_comp.prefab +++ b/Assets/prefabs/ui/company/company_comp.prefab @@ -31,6 +31,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 518189435595440470} + - {fileID: 3748356801568085408} - {fileID: 8781750618573105550} - {fileID: 3709384738731649921} - {fileID: 210727915012937842} @@ -258,7 +259,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -404,7 +405,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -851,7 +852,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -924,7 +925,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5232304874814648913} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} @@ -1210,6 +1211,128 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 2085965106981912127} m_PrefabAsset: {fileID: 0} +--- !u!1001 &2086232538065829438 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5232304874814648913} + m_Modifications: + - target: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Name + value: ui_spine_obj + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 8c24ea04d5e35e748b3b2201a804d6af, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingAnimation + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} +--- !u!224 &3748356801568085408 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 2086232538065829438} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2538947509396611601 PrefabInstance: m_ObjectHideFlags: 0