puxuan/c1_unity
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of git.juzugame.com:b6-client/b6-unity into dev

Browse Source
This commit is contained in:
chenxi 2023-04-23 19:15:05 +08:00
commit 543febea21
5 changed files with 102 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Assets/lua/app/global/global_const.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/module/battle/battle_const.lua.bytes
View File

Binary file not shown.

BIN
Assets/lua/app/ui/battle/cell/grid_cell.lua.bytes
View File

Binary file not shown.

16
Assets/prefabs/effects/battle/sfx_piece_qizi_b06.prefab
View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 253647245}
- component: {fileID: 253647247}
- component: {fileID: 253647246}
m_Layer: 0
m_Layer: 5
m_Name: qizi02
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -107,7 +107,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@ -4872,7 +4872,7 @@ GameObject:
m_Component:
- component: {fileID: 4882306215676873866}
- component: {fileID: 3075847309624194556}
m_Layer: 0
m_Layer: 5
m_Name: sfx_piece_qizi_b06
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -4923,7 +4923,7 @@ GameObject:
- component: {fileID: 3459475216840467098}
- component: {fileID: 7986297365552728468}
- component: {fileID: 3241808288950177665}
m_Layer: 0
m_Layer: 5
m_Name: Particle System (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -5019,7 +5019,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@ -9736,7 +9736,7 @@ GameObject:
- component: {fileID: 2916876266786442857}
- component: {fileID: 1412855663418918468}
- component: {fileID: 9143418962815720233}
m_Layer: 0
m_Layer: 5
m_Name: qizi01 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
@ -9832,7 +9832,7 @@ ParticleSystem:
m_RotationOrder: 4
moveWithTransform: 0
moveWithCustomTransform: {fileID: 0}
scalingMode: 1
scalingMode: 0
randomSeed: 0
InitialModule:
serializedVersion: 3
@ -14598,7 +14598,7 @@ GameObject:
- component: {fileID: 3719391094081315090}
- component: {fileID: 9200850387441384058}
- component: {fileID: 4986285900632434578}
m_Layer: 0
m_Layer: 5
m_Name: sfx_piece_qizi_b06
m_TagString: Untagged
m_Icon: {fileID: 0}

104
Assets/prefabs/ui/battle/cell/grid_cell.prefab
View File

@ -32,6 +32,7 @@ RectTransform:
- {fileID: 4158070930525317561}
- {fileID: 3555702982026378675}
- {fileID: 394181014123432448}
- {fileID: 5458009916644433484}
m_Father: {fileID: 7856954192772629694}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -672,6 +673,10 @@ MonoBehaviour:
hashName: 739436680
objectType: 2
gameObject: {fileID: 5443376147976274462}
- name: grid_cell.touch_node.ani_node.effect_node.sfx_piece_qizi_b06
hashName: 739436681
objectType: 2
gameObject: {fileID: 381705730393413202}
--- !u!1 &5199997431598361344
GameObject:
m_ObjectHideFlags: 0
@ -961,6 +966,85 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1001 &612437577000850118
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 9006972138829277768}
m_Modifications:
- target: {fileID: 951323769793152148, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_Name
value: sfx_piece_qizi_b06
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalScale.x
value: 38
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalScale.y
value: 38
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalScale.z
value: 38
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
--- !u!1 &381705730393413202 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 951323769793152148, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
m_PrefabInstance: {fileID: 612437577000850118}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5458009916644433484 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4882306215676873866, guid: bfb240a92c5c8754a9d7ad859b2df21d, type: 3}
m_PrefabInstance: {fileID: 612437577000850118}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5096111228827059850
PrefabInstance:
m_ObjectHideFlags: 0
@ -1245,6 +1329,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3}
--- !u!1 &4651815979856621902 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 629707219938332612, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3}
m_PrefabInstance: {fileID: 5202707181962182282}
m_PrefabAsset: {fileID: 0}
--- !u!4 &1043772657509923152 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5066412340583221210, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3}
@ -1255,11 +1344,6 @@ ParticleSystem:
m_CorrespondingSourceObject: {fileID: 8800332881566183722, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3}
m_PrefabInstance: {fileID: 5202707181962182282}
m_PrefabAsset: {fileID: 0}
--- !u!1 &4651815979856621902 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 629707219938332612, guid: 3c3bf6b969471544f9e5c76403daca6b, type: 3}
m_PrefabInstance: {fileID: 5202707181962182282}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6176853476701503700
PrefabInstance:
m_ObjectHideFlags: 0
@ -1349,11 +1433,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3}
--- !u!1 &8594775965272695207 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2521541586979578227, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3}
m_PrefabInstance: {fileID: 6176853476701503700}
m_PrefabAsset: {fileID: 0}
--- !u!4 &4158070930525317561 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7785871606843763053, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3}
@ -1364,6 +1443,11 @@ ParticleSystem:
m_CorrespondingSourceObject: {fileID: 5792310778419191709, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3}
m_PrefabInstance: {fileID: 6176853476701503700}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8594775965272695207 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2521541586979578227, guid: 1fb21935d1a40f545b7078f8001e2678, type: 3}
m_PrefabInstance: {fileID: 6176853476701503700}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7628150637597597641
PrefabInstance:
m_ObjectHideFlags: 0