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 60b93ab28..00cbb0743 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/prefabs/ui/battle/cell/grid_cell.prefab b/Assets/prefabs/ui/battle/cell/grid_cell.prefab index bd6288efb..aaf1a3730 100644 --- a/Assets/prefabs/ui/battle/cell/grid_cell.prefab +++ b/Assets/prefabs/ui/battle/cell/grid_cell.prefab @@ -34,6 +34,11 @@ RectTransform: - {fileID: 8445615531812991975} - {fileID: 8285381720672735071} - {fileID: 5458009916644433484} + - {fileID: 250625015214245452} + - {fileID: 6640279981642983585} + - {fileID: 9075258723002122443} + - {fileID: 4978993888045926940} + - {fileID: 8815792460244346038} m_Father: {fileID: 7856954192772629694} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -711,6 +716,26 @@ MonoBehaviour: hashName: 208618565 objectType: 6 gameObject: {fileID: 3606736100141043585} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06_1 + hashName: 1929049595 + objectType: 2 + gameObject: {fileID: 5586942183050448466} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06_2 + hashName: 1929049596 + objectType: 2 + gameObject: {fileID: 1357179124963451071} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06_3 + hashName: 1929049597 + objectType: 2 + gameObject: {fileID: 3675891632831236309} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06_4 + hashName: 1929049598 + objectType: 2 + gameObject: {fileID: 858596263327924738} + - name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06_5 + hashName: 1929049599 + objectType: 2 + gameObject: {fileID: 3793531478103321768} --- !u!1 &5199997431598361344 GameObject: m_ObjectHideFlags: 0 @@ -1086,6 +1111,89 @@ Transform: m_CorrespondingSourceObject: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3} m_PrefabInstance: {fileID: 612437577000850118} m_PrefabAsset: {fileID: 0} +--- !u!1001 &785861254359563119 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5147402121725228349, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b06_1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} +--- !u!4 &250625015214245452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 692875644223372579, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + m_PrefabInstance: {fileID: 785861254359563119} + m_PrefabAsset: {fileID: 0} +--- !u!1 &5586942183050448466 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5147402121725228349, guid: d3b5ffee5116a2049994ec2ac03150d2, type: 3} + m_PrefabInstance: {fileID: 785861254359563119} + m_PrefabAsset: {fileID: 0} --- !u!1001 &825200554372911444 PrefabInstance: m_ObjectHideFlags: 0 @@ -1620,3 +1728,335 @@ Transform: m_CorrespondingSourceObject: {fileID: 4557714372984383278, guid: be341d479bda82c419bde28ada791bf0, type: 3} m_PrefabInstance: {fileID: 5365084061810365641} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7319749256931709274 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5850648624966696434, guid: 521ba051b34ae4245a50c26823646279, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b06_5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 521ba051b34ae4245a50c26823646279, type: 3} +--- !u!1 &3793531478103321768 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5850648624966696434, guid: 521ba051b34ae4245a50c26823646279, type: 3} + m_PrefabInstance: {fileID: 7319749256931709274} + m_PrefabAsset: {fileID: 0} +--- !u!4 &8815792460244346038 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2288679229886723564, guid: 521ba051b34ae4245a50c26823646279, type: 3} + m_PrefabInstance: {fileID: 7319749256931709274} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7913853138415002712 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7366199862938150490, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b06_4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} +--- !u!1 &858596263327924738 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7366199862938150490, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + m_PrefabInstance: {fileID: 7913853138415002712} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4978993888045926940 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2939539871368719940, guid: c5d0ca13d05750c43b68544dd4c6c219, type: 3} + m_PrefabInstance: {fileID: 7913853138415002712} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &8318632036140792196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_RootOrder + value: 7 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7035780379862538555, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b06_2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 371a976576f24804fbe0473dadb86f43, type: 3} +--- !u!1 &1357179124963451071 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7035780379862538555, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + m_PrefabInstance: {fileID: 8318632036140792196} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6640279981642983585 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3411112458900508965, guid: 371a976576f24804fbe0473dadb86f43, type: 3} + m_PrefabInstance: {fileID: 8318632036140792196} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9118815707669386607 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 9006972138829277768} + m_Modifications: + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalScale.x + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalScale.y + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalScale.z + value: 38 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5588942279577329082, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + propertyPath: m_Name + value: sfx_piece_qizi_b06_3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} +--- !u!1 &3675891632831236309 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5588942279577329082, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + m_PrefabInstance: {fileID: 9118815707669386607} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9075258723002122443 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 251428808730367396, guid: bb14d5ab4b09ce646826e80de55dca09, type: 3} + m_PrefabInstance: {fileID: 9118815707669386607} + m_PrefabAsset: {fileID: 0}