diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 6a514c2a5..3e76d7bf1 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/module_unlock_ui.lua.bytes b/Assets/lua/app/ui/main_city/module_unlock_ui.lua.bytes index 0e848b9ff..f83490b3f 100644 Binary files a/Assets/lua/app/ui/main_city/module_unlock_ui.lua.bytes and b/Assets/lua/app/ui/main_city/module_unlock_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index 3c6b02bc5..49b1da8d9 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -1887,7 +1887,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.x - value: -10 + value: 0 objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_AnchoredPosition.y diff --git a/Assets/prefabs/ui/main_city/module_unlock_ui.prefab b/Assets/prefabs/ui/main_city/module_unlock_ui.prefab index 070ef21a5..d59792fec 100644 --- a/Assets/prefabs/ui/main_city/module_unlock_ui.prefab +++ b/Assets/prefabs/ui/main_city/module_unlock_ui.prefab @@ -27,6 +27,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7306928625681032290} m_Father: {fileID: 4165930251451731960} @@ -74,14 +75,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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 6763476499546778771} 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: 10, y: 2.5} - m_SizeDelta: {x: -30, y: -5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -10, y: -10} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3341004600281694955 CanvasRenderer: @@ -220,6 +222,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7870804908802134986} m_RootOrder: 2 @@ -356,6 +359,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 6763476499546778771} - {fileID: 8498021877501455119} @@ -460,6 +464,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 569071118488430186} m_Father: {fileID: 4165930251451731960} @@ -549,6 +554,7 @@ 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_ConstrainProportionsScale: 0 m_Children: - {fileID: 7870804908802134986} - {fileID: 5241113350200150230} @@ -677,6 +683,7 @@ 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_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7870804908802134986} m_RootOrder: 1 @@ -794,10 +801,18 @@ PrefabInstance: propertyPath: m_Name value: spine_circle 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: 4625b9fa08643e94a9bac693177a6078, type: 2} + objectReference: {fileID: 11400000, guid: a797adb6e542cd6478ae21dbb9699338, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -884,16 +899,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &3798302052587626636 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 3391950476437818868} - m_PrefabAsset: {fileID: 0} --- !u!224 &569071118488430186 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 3391950476437818868} m_PrefabAsset: {fileID: 0} +--- !u!1 &3798302052587626636 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3391950476437818868} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5274226098185200644 PrefabInstance: m_ObjectHideFlags: 0 @@ -905,10 +920,18 @@ PrefabInstance: propertyPath: m_Name value: spine_star 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: 42da5c492090e394e889dc6cf80adbad, type: 2} + objectReference: {fileID: 11400000, guid: 97b85670ac5bf6f45848c62a5acbaf9d, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -995,16 +1018,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!224 &7045546709728399258 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 5274226098185200644} - m_PrefabAsset: {fileID: 0} --- !u!1 &5950723892866189692 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 5274226098185200644} m_PrefabAsset: {fileID: 0} +--- !u!224 &7045546709728399258 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 5274226098185200644} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5589093621845266428 PrefabInstance: m_ObjectHideFlags: 0 @@ -1016,10 +1039,18 @@ PrefabInstance: propertyPath: m_Name value: spine_circle 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: 4625b9fa08643e94a9bac693177a6078, type: 2} + objectReference: {fileID: 11400000, guid: a797adb6e542cd6478ae21dbb9699338, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -1122,10 +1153,26 @@ PrefabInstance: propertyPath: m_Name value: spine_title objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: referenceSize.y + value: 60 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: c4480146ab28a1942950f421dce90e96, type: 2} + objectReference: {fileID: 11400000, guid: df2fa4af6afe7854f85b143b3ee0623c, type: 2} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: rectTransformSize.x + value: 400 + objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: rectTransformSize.y + value: 60 + objectReference: {fileID: 0} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5