diff --git a/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes b/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes index e3f10f8b1..8934e9448 100644 Binary files a/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes and b/Assets/lua/app/bf/unity/ui_spine_object.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes index 457cc677e..81fff021a 100644 Binary files a/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes and b/Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes differ diff --git a/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes b/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes index a830fe021..6d5804224 100644 Binary files a/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes and b/Assets/lua/app/userdata/battle/battle_grid_entity.lua.bytes differ diff --git a/Assets/prefabs/ui/battle/cell/grid_cell.prefab b/Assets/prefabs/ui/battle/cell/grid_cell.prefab index 245cbfa66..58c1b7bd4 100644 --- a/Assets/prefabs/ui/battle/cell/grid_cell.prefab +++ b/Assets/prefabs/ui/battle/cell/grid_cell.prefab @@ -697,6 +697,10 @@ MonoBehaviour: hashName: 739436681 objectType: 2 gameObject: {fileID: 381705730393413202} + - name: grid_cell.touch_node.ani_node.up_bg.ui_spine_obj + hashName: 208618565 + objectType: 6 + gameObject: {fileID: 3606736100141043585} --- !u!1 &5199997431598361344 GameObject: m_ObjectHideFlags: 0 @@ -725,7 +729,8 @@ 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: 98599679373904231} m_Father: {fileID: 7856954192772629694} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1065,6 +1070,117 @@ Transform: m_CorrespondingSourceObject: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3} m_PrefabInstance: {fileID: 612437577000850118} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3002023211998667513 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2711150934767594651} + 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: skeletonDataAsset + value: + objectReference: {fileID: 11400000, guid: 5db6ac4e2946d7b4dab81fcf173a9f48, type: 2} + - 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: 0 + 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 &98599679373904231 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3002023211998667513} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3606736100141043585 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 3002023211998667513} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5096111228827059850 PrefabInstance: m_ObjectHideFlags: 0 @@ -1557,6 +1673,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} +--- !u!198 &952218896639052611 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 7271717578638709898, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} + m_PrefabInstance: {fileID: 7628150637597597641} + m_PrefabAsset: {fileID: 0} --- !u!1 &9199390910335989165 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1618604107703265892, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} @@ -1567,8 +1688,3 @@ Transform: m_CorrespondingSourceObject: {fileID: 6378442407063986810, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} m_PrefabInstance: {fileID: 7628150637597597641} m_PrefabAsset: {fileID: 0} ---- !u!198 &952218896639052611 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 7271717578638709898, guid: f5793a1ea1a58204395efcae34b3b79e, type: 3} - m_PrefabInstance: {fileID: 7628150637597597641} - m_PrefabAsset: {fileID: 0}