解锁和放置

master
humingxing 2 weeks ago
parent 779c41d0fd
commit e62449c94a
  1. 10
      assets/bundles/battleGame/prefab/textGrid.prefab
  2. 490
      assets/bundles/battleGame/prefab/格子锁.prefab
  3. 13
      assets/bundles/battleGame/prefab/格子锁.prefab.meta
  4. 410
      assets/bundles/first/config/Hero.json
  5. 346
      assets/bundles/first/config/Rank.json
  6. 50
      assets/bundles/first/config/Skill.json
  7. 42
      assets/bundles/first/config/Text.json
  8. 2
      assets/bundles/rank/spine/获得新武器光晕效果.json.meta
  9. 65
      assets/mx/module/merge/core/MergeSession.ts
  10. 1
      assets/mx/module/merge/index.ts
  11. 26
      assets/mx/module/merge/rules/MapPlaceRules.ts
  12. BIN
      assets/res/battleGame/texture/ui/图层 5898.png
  13. 134
      assets/res/battleGame/texture/ui/图层 5898.png.meta
  14. BIN
      assets/res/battleGame/texture/ui/锁定.png
  15. 134
      assets/res/battleGame/texture/ui/锁定.png.meta
  16. 2
      assets/res/battleGameWeapon/spine/武器.meta
  17. 2
      assets/res/battleGameWeapon/spine/武器/大宝剑.meta
  18. 1
      assets/res/battleGameWeapon/spine/武器/大宝剑/.WeDrive
  19. 55
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas
  20. 12
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.atlas.meta
  21. 1
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json
  22. 13
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.json.meta
  23. BIN
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png
  24. 134
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑类武器+专属技能.png.meta
  25. 41
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas
  26. 12
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.atlas.meta
  27. 1
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json
  28. 13
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.json.meta
  29. BIN
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png
  30. 134
      assets/res/battleGameWeapon/spine/武器/大宝剑/剑阵.png.meta
  31. 2
      assets/res/battleGameWeapon/spine/武器/弓箭.meta
  32. 1
      assets/res/battleGameWeapon/spine/武器/弓箭/.WeDrive
  33. 125
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas
  34. 12
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.atlas.meta
  35. 1
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json
  36. 13
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.json.meta
  37. BIN
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png
  38. 134
      assets/res/battleGameWeapon/spine/武器/弓箭/弓类武器+专属技能.png.meta
  39. 2
      assets/res/battleGameWeapon/spine/武器/木棍.meta
  40. 1
      assets/res/battleGameWeapon/spine/武器/木棍/.WeDrive
  41. 153
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas
  42. 12
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.atlas.meta
  43. 1
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json
  44. 13
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.json.meta
  45. BIN
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png
  46. 134
      assets/res/battleGameWeapon/spine/武器/木棍/棍类武器+专属技能.png.meta
  47. 9
      assets/res/battleGameWeapon/spine/武器/法杖.meta
  48. 1
      assets/res/battleGameWeapon/spine/武器/法杖/.WeDrive
  49. 167
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas
  50. 12
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.atlas.meta
  51. 1
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json
  52. 13
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.json.meta
  53. BIN
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png
  54. 134
      assets/res/battleGameWeapon/spine/武器/法杖/法杖武器+专属技能.png.meta
  55. BIN
      assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png
  56. 134
      assets/res/battleGameWeapon/spine/武器/法杖/飞行水弹.png.meta
  57. 9
      assets/res/battleGameWeapon/spine/武器/长枪.meta
  58. 1
      assets/res/battleGameWeapon/spine/武器/长枪/.WeDrive
  59. 167
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas
  60. 12
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.atlas.meta
  61. 1
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json
  62. 13
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.json.meta
  63. BIN
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png
  64. 134
      assets/res/battleGameWeapon/spine/武器/长枪/枪类武器+专属技能.png.meta
  65. 9
      assets/res/spine/likeRole/数字.meta
  66. 0
      assets/res/spine/likeRole/数字/数字1.atlas
  67. 0
      assets/res/spine/likeRole/数字/数字1.atlas.meta
  68. 0
      assets/res/spine/likeRole/数字/数字1.json
  69. 0
      assets/res/spine/likeRole/数字/数字1.json.meta
  70. 0
      assets/res/spine/likeRole/数字/数字1.png
  71. 0
      assets/res/spine/likeRole/数字/数字1.png.meta
  72. 0
      assets/res/spine/likeRole/数字/数字1024.atlas
  73. 0
      assets/res/spine/likeRole/数字/数字1024.atlas.meta
  74. 0
      assets/res/spine/likeRole/数字/数字1024.json
  75. 0
      assets/res/spine/likeRole/数字/数字1024.json.meta
  76. 0
      assets/res/spine/likeRole/数字/数字1024.png
  77. 0
      assets/res/spine/likeRole/数字/数字1024.png.meta
  78. 0
      assets/res/spine/likeRole/数字/数字128.atlas
  79. 0
      assets/res/spine/likeRole/数字/数字128.atlas.meta
  80. 0
      assets/res/spine/likeRole/数字/数字128.json
  81. 0
      assets/res/spine/likeRole/数字/数字128.json.meta
  82. 0
      assets/res/spine/likeRole/数字/数字128.png
  83. 0
      assets/res/spine/likeRole/数字/数字128.png.meta
  84. 0
      assets/res/spine/likeRole/数字/数字16.atlas
  85. 0
      assets/res/spine/likeRole/数字/数字16.atlas.meta
  86. 0
      assets/res/spine/likeRole/数字/数字16.json
  87. 2
      assets/res/spine/likeRole/数字/数字16.json.meta
  88. 0
      assets/res/spine/likeRole/数字/数字16.png
  89. 0
      assets/res/spine/likeRole/数字/数字16.png.meta
  90. 0
      assets/res/spine/likeRole/数字/数字2.atlas
  91. 0
      assets/res/spine/likeRole/数字/数字2.atlas.meta
  92. 0
      assets/res/spine/likeRole/数字/数字2.json
  93. 2
      assets/res/spine/likeRole/数字/数字2.json.meta
  94. 0
      assets/res/spine/likeRole/数字/数字2.png
  95. 0
      assets/res/spine/likeRole/数字/数字2.png.meta
  96. 0
      assets/res/spine/likeRole/数字/数字2048.atlas
  97. 0
      assets/res/spine/likeRole/数字/数字2048.atlas.meta
  98. 0
      assets/res/spine/likeRole/数字/数字2048.json
  99. 0
      assets/res/spine/likeRole/数字/数字2048.json.meta
  100. 0
      assets/res/spine/likeRole/数字/数字2048.png
  101. Some files were not shown because too many files have changed in this diff Show More

@ -667,7 +667,7 @@
"a": 255
},
"_skeletonData": {
"__uuid__": "63c3559c-ff6d-439e-ae2e-bb17ffa60f04",
"__uuid__": "92bf30d8-bc81-4826-8b8c-c9b5b9dcc2fd",
"__expectedType__": "sp.SkeletonData"
},
"defaultSkin": "土",
@ -1075,11 +1075,11 @@
"a": 255
},
"_skeletonData": {
"__uuid__": "ee9c0c4b-851f-4f02-beb6-c3b719e3fa9d",
"__uuid__": "95f5d4e0-f589-4e29-8f31-6483e457efcf",
"__expectedType__": "sp.SkeletonData"
},
"defaultSkin": "土",
"defaultAnimation": "待机",
"defaultAnimation": "",
"_premultipliedAlpha": false,
"_timeScale": 1,
"_preCacheMode": 0,
@ -1211,11 +1211,11 @@
"a": 255
},
"_skeletonData": {
"__uuid__": "90700d70-3da1-40c0-9671-51f002407bc3",
"__uuid__": "2cec1a4c-5d6f-45f4-b432-f59ac52a3e0c",
"__expectedType__": "sp.SkeletonData"
},
"defaultSkin": "土",
"defaultAnimation": "待机",
"defaultAnimation": "",
"_premultipliedAlpha": false,
"_timeScale": 1,
"_preCacheMode": 0,

@ -0,0 +1,490 @@
[
{
"__type__": "cc.Prefab",
"_name": "格子锁",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"data": {
"__id__": 1
},
"optimizationPolicy": 0,
"persistent": false
},
{
"__type__": "cc.Node",
"_name": "格子锁",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
"_children": [
{
"__id__": 2
},
{
"__id__": 8
}
],
"_active": true,
"_components": [
{
"__id__": 14
},
{
"__id__": 16
},
{
"__id__": 18
}
],
"_prefab": {
"__id__": 20
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "锁定",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 3
},
{
"__id__": 5
}
],
"_prefab": {
"__id__": 7
},
"_lpos": {
"__type__": "cc.Vec3",
"x": -17.1845703125,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 4
},
"_contentSize": {
"__type__": "cc.Size",
"width": 42,
"height": 45
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "52BfiQtHBLk5IrGlqyFIeP"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 6
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "201e9a69-4d94-4182-b893-c972f15ee76e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 1,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "50cCFcSOJGPbVuqJkpsr7c"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "39f4GsgNtNsq8/wCLq3tPA",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "num",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 9
},
{
"__id__": 11
}
],
"_prefab": {
"__id__": 13
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 12.5,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 8
},
"_enabled": true,
"__prefab": {
"__id__": 10
},
"_contentSize": {
"__type__": "cc.Size",
"width": 37.369140625,
"height": 54.4
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "a7rWzpiMxPDrFoMqw0xD9h"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 8
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "32",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 30,
"_fontSize": 30,
"_fontFamily": "Arial",
"_lineHeight": 40,
"_overflow": 0,
"_enableWrapText": true,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_enableOutline": true,
"_outlineColor": {
"__type__": "cc.Color",
"r": 213,
"g": 123,
"b": 85,
"a": 255
},
"_outlineWidth": 2,
"_enableShadow": false,
"_shadowColor": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_shadowOffset": {
"__type__": "cc.Vec2",
"x": 2,
"y": 2
},
"_shadowBlur": 2,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "b8MyhW1LFDR7LJQVwPdPvM"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "a0kjvwE+JJI7QzpIQAs4CB",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 15
},
"_contentSize": {
"__type__": "cc.Size",
"width": 82.369140625,
"height": 68
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "85sTDvKSNMXZkiAHpfcCpx"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 17
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "0b9461e4-38ea-4e13-b133-f28d07bc5178@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 0,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "715KNuSXlNAabmEpf0YdgP"
},
{
"__type__": "cc.Layout",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 19
},
"_resizeMode": 1,
"_layoutType": 1,
"_cellSize": {
"__type__": "cc.Size",
"width": 40,
"height": 40
},
"_startAxis": 0,
"_paddingLeft": 3,
"_paddingRight": 10,
"_paddingTop": 0,
"_paddingBottom": 0,
"_spacingX": -10,
"_spacingY": 0,
"_verticalDirection": 1,
"_horizontalDirection": 0,
"_constraint": 0,
"_constraintNum": 2,
"_affectedByScale": false,
"_isAlign": false,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "acA5MrJQNI66W+fTtjgwyu"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "a01BJWthhKbr3LbCXP7YXR",
"instance": null,
"targetOverrides": null
}
]

@ -0,0 +1,13 @@
{
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
"uuid": "f1878340-181d-4769-a195-bd78eb315b3e",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "格子锁"
}
}

File diff suppressed because it is too large Load Diff

@ -1,7 +1,7 @@
[
{
"id": 1,
"name": "凡修·初阶",
"name": "幼儿园小班·上",
"icon": "凡修·初阶",
"level": [
1,
@ -34,7 +34,7 @@
},
{
"id": 2,
"name": "凡修·中阶",
"name": "幼儿园小班·下",
"icon": "凡修·中阶",
"level": [
6,
@ -67,7 +67,7 @@
},
{
"id": 3,
"name": "凡修·高阶",
"name": "幼儿园中班·上",
"icon": "凡修·高阶",
"level": [
11,
@ -100,7 +100,7 @@
},
{
"id": 4,
"name": "凡修·圆满",
"name": "幼儿园中班·下",
"icon": "凡修·圆满",
"level": [
16,
@ -133,7 +133,7 @@
},
{
"id": 5,
"name": "人仙·初阶",
"name": "幼儿园大班·上",
"icon": "人仙·初阶",
"level": [
21,
@ -166,7 +166,7 @@
},
{
"id": 6,
"name": "人仙·中阶",
"name": "幼儿园大班·下",
"icon": "人仙·中阶",
"level": [
26,
@ -200,7 +200,7 @@
},
{
"id": 7,
"name": "人仙·高阶",
"name": "小学一年级·上",
"icon": "人仙·高阶",
"level": [
31,
@ -234,7 +234,7 @@
},
{
"id": 8,
"name": "人仙·圆满",
"name": "小学一年级·下",
"icon": "人仙·圆满",
"level": [
36,
@ -268,7 +268,7 @@
},
{
"id": 9,
"name": "地仙·初阶",
"name": "小学二年级·上",
"icon": "地仙·初阶",
"level": [
41,
@ -302,7 +302,7 @@
},
{
"id": 10,
"name": "地仙·中阶",
"name": "小学二年级·下",
"icon": "地仙·中阶",
"level": [
46,
@ -336,7 +336,7 @@
},
{
"id": 11,
"name": "地仙·高阶",
"name": "小学三年级·上",
"icon": "地仙·高阶",
"level": [
51,
@ -371,7 +371,7 @@
},
{
"id": 12,
"name": "地仙·圆满",
"name": "小学三年级·下",
"icon": "地仙·圆满",
"level": [
56,
@ -406,7 +406,7 @@
},
{
"id": 13,
"name": "天仙·初阶",
"name": "小学四年级·上",
"icon": "天仙·初阶",
"level": [
61,
@ -441,7 +441,7 @@
},
{
"id": 14,
"name": "天仙·中阶",
"name": "小学四年级·下",
"icon": "天仙·中阶",
"level": [
66,
@ -476,7 +476,7 @@
},
{
"id": 15,
"name": "天仙·高阶",
"name": "小学五年级·上",
"icon": "天仙·高阶",
"level": [
71,
@ -511,7 +511,7 @@
},
{
"id": 16,
"name": "天仙·圆满",
"name": "小学五年级·下",
"icon": "天仙·圆满",
"level": [
76,
@ -546,7 +546,7 @@
},
{
"id": 17,
"name": "真仙·初阶",
"name": "小学六年级·上",
"icon": "真仙·初阶",
"level": [
81,
@ -581,7 +581,7 @@
},
{
"id": 18,
"name": "真仙·中阶",
"name": "小学六年级·下",
"icon": "真仙·中阶",
"level": [
86,
@ -616,7 +616,7 @@
},
{
"id": 19,
"name": "真仙·高阶",
"name": "初中一年级·上",
"icon": "真仙·高阶",
"level": [
91,
@ -651,7 +651,7 @@
},
{
"id": 20,
"name": "真仙·圆满",
"name": "初中一年级·下",
"icon": "真仙·圆满",
"level": [
96,
@ -686,7 +686,7 @@
},
{
"id": 21,
"name": "玄仙·初阶",
"name": "初中二年级·上",
"icon": "玄仙·初阶",
"level": [
101,
@ -721,7 +721,7 @@
},
{
"id": 22,
"name": "玄仙·中阶",
"name": "初中二年级·下",
"icon": "玄仙·中阶",
"level": [
106,
@ -756,7 +756,7 @@
},
{
"id": 23,
"name": "玄仙·高阶",
"name": "初中三年级·上",
"icon": "玄仙·高阶",
"level": [
111,
@ -791,7 +791,7 @@
},
{
"id": 24,
"name": "玄仙·圆满",
"name": "初中三年级·下",
"icon": "玄仙·圆满",
"level": [
116,
@ -826,7 +826,7 @@
},
{
"id": 25,
"name": "金仙·初阶",
"name": "高中一年级·上",
"icon": "金仙·初阶",
"level": [
121,
@ -861,7 +861,7 @@
},
{
"id": 26,
"name": "金仙·中阶",
"name": "高中一年级·下",
"icon": "金仙·中阶",
"level": [
126,
@ -896,7 +896,7 @@
},
{
"id": 27,
"name": "金仙·高阶",
"name": "高中二年级·上",
"icon": "金仙·高阶",
"level": [
131,
@ -931,7 +931,7 @@
},
{
"id": 28,
"name": "金仙·圆满",
"name": "高中二年级·下",
"icon": "金仙·圆满",
"level": [
136,
@ -966,7 +966,7 @@
},
{
"id": 29,
"name": "太乙·初阶",
"name": "高中三年级·上",
"icon": "太乙·初阶",
"level": [
141,
@ -1001,7 +1001,7 @@
},
{
"id": 30,
"name": "太乙·中阶",
"name": "高中三年级·下",
"icon": "太乙·中阶",
"level": [
146,
@ -1036,7 +1036,7 @@
},
{
"id": 31,
"name": "太乙·高阶",
"name": "大一·上",
"icon": "太乙·高阶",
"level": [
151,
@ -1071,7 +1071,7 @@
},
{
"id": 32,
"name": "太乙·圆满",
"name": "大一·下",
"icon": "太乙·圆满",
"level": [
156,
@ -1106,7 +1106,7 @@
},
{
"id": 33,
"name": "大罗·初阶",
"name": "大二·上",
"icon": "大罗·初阶",
"level": [
161,
@ -1141,7 +1141,7 @@
},
{
"id": 34,
"name": "大罗·中阶",
"name": "大二·下",
"icon": "大罗·中阶",
"level": [
166,
@ -1176,7 +1176,7 @@
},
{
"id": 35,
"name": "大罗·高阶",
"name": "大三·上",
"icon": "大罗·高阶",
"level": [
171,
@ -1211,7 +1211,7 @@
},
{
"id": 36,
"name": "大罗·圆满",
"name": "大三·下",
"icon": "大罗·圆满",
"level": [
176,
@ -1246,7 +1246,7 @@
},
{
"id": 37,
"name": "混元·初阶",
"name": "大四·上",
"icon": "混元·初阶",
"level": [
181,
@ -1281,7 +1281,7 @@
},
{
"id": 38,
"name": "混元·中阶",
"name": "大四·下",
"icon": "混元·中阶",
"level": [
186,
@ -1316,7 +1316,7 @@
},
{
"id": 39,
"name": "混元·高阶",
"name": "硕士一年级·上",
"icon": "混元·高阶",
"level": [
191,
@ -1351,7 +1351,7 @@
},
{
"id": 40,
"name": "混元·圆满",
"name": "硕士一年级·下",
"icon": "混元·圆满",
"level": [
196,
@ -1386,7 +1386,7 @@
},
{
"id": 41,
"name": "合道·初阶",
"name": "硕士二年级·上",
"icon": "合道·初阶",
"level": [
201,
@ -1421,7 +1421,7 @@
},
{
"id": 42,
"name": "合道·中阶",
"name": "硕士二年级·下",
"icon": "合道·中阶",
"level": [
206,
@ -1456,7 +1456,7 @@
},
{
"id": 43,
"name": "合道·高阶",
"name": "硕士三年级·上",
"icon": "合道·高阶",
"level": [
211,
@ -1491,7 +1491,7 @@
},
{
"id": 44,
"name": "合道·圆满",
"name": "硕士三年级·下",
"icon": "合道·圆满",
"level": [
216,
@ -1526,7 +1526,7 @@
},
{
"id": 45,
"name": "太初",
"name": "博士一年级·上",
"icon": "太初",
"level": [
221,
@ -1558,5 +1558,261 @@
8,
9
]
},
{
"id": 46,
"name": "博士一年级·下",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 47,
"name": "博士二年级·上",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 48,
"name": "博士二年级·下",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 49,
"name": "博士三年级·上",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 50,
"name": "博士三年级·下",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 51,
"name": "博士四年级·上",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 52,
"name": "博士四年级·下",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 53,
"name": "博士五年级·上",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 54,
"name": "博士五年级·下",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 55,
"name": "讲师初阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 56,
"name": "讲师初阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 57,
"name": "讲师中阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 58,
"name": "讲师中阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 59,
"name": "讲师高阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 60,
"name": "讲师高阶",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
},
{
"id": 61,
"name": "教授",
"icon": "太初",
"level": [],
"reward": "",
"levelvalue": 0,
"diffcult": 0,
"weapondrop": 0,
"weaponweight": [],
"aiweapon": "",
"aiusead": 0,
"aiusechanzi": [],
"aiusetext": [],
"charactersweight": []
}
]

@ -1,6 +1,6 @@
[
{
"id": 100001,
"id": 10101,
"name": "",
"desc": "剑劈砍",
"icon": "",
@ -22,7 +22,7 @@
"result": ""
},
{
"id": 100002,
"id": 10102,
"name": "",
"desc": "扇形攻击",
"icon": "",
@ -44,7 +44,7 @@
"result": ""
},
{
"id": 100003,
"id": 10103,
"name": "",
"desc": "扇形二连击",
"icon": "",
@ -66,7 +66,7 @@
"result": ""
},
{
"id": 100004,
"id": 10104,
"name": "",
"desc": "连击带击退",
"icon": "",
@ -88,7 +88,7 @@
"result": ""
},
{
"id": 100005,
"id": 10105,
"name": "",
"desc": "扇形3连击",
"icon": "",
@ -110,7 +110,7 @@
"result": ""
},
{
"id": 200001,
"id": 20101,
"name": "",
"desc": "抡一圈",
"icon": "",
@ -132,7 +132,7 @@
"result": ""
},
{
"id": 200002,
"id": 20102,
"name": "",
"desc": "抡2圈",
"icon": "",
@ -154,7 +154,7 @@
"result": ""
},
{
"id": 200003,
"id": 20103,
"name": "",
"desc": "抡2圈,概率眩晕",
"icon": "",
@ -176,7 +176,7 @@
"result": ""
},
{
"id": 200004,
"id": 20104,
"name": "",
"desc": "携带青龙影子,扩大攻击范围",
"icon": "",
@ -198,7 +198,7 @@
"result": ""
},
{
"id": 200005,
"id": 20105,
"name": "",
"desc": "额外飞出龙影攻击",
"icon": "",
@ -220,7 +220,7 @@
"result": ""
},
{
"id": 300001,
"id": 30101,
"name": "",
"desc": "水球术",
"icon": "",
@ -242,7 +242,7 @@
"result": ""
},
{
"id": 300002,
"id": 30102,
"name": "",
"desc": "连发",
"icon": "",
@ -264,7 +264,7 @@
"result": ""
},
{
"id": 300003,
"id": 30103,
"name": "",
"desc": "三连发",
"icon": "",
@ -286,7 +286,7 @@
"result": ""
},
{
"id": 300004,
"id": 30104,
"name": "",
"desc": "4连发",
"icon": "",
@ -308,7 +308,7 @@
"result": ""
},
{
"id": 300005,
"id": 30105,
"name": "",
"desc": "5连发",
"icon": "",
@ -330,7 +330,7 @@
"result": ""
},
{
"id": 400001,
"id": 40101,
"name": "",
"desc": "单体抛物线",
"icon": "",
@ -352,7 +352,7 @@
"result": ""
},
{
"id": 400002,
"id": 40102,
"name": "",
"desc": "2散射",
"icon": "",
@ -374,7 +374,7 @@
"result": ""
},
{
"id": 400003,
"id": 40103,
"name": "",
"desc": "3散射",
"icon": "",
@ -396,7 +396,7 @@
"result": ""
},
{
"id": 400004,
"id": 40104,
"name": "",
"desc": "穿透效果",
"icon": "",
@ -418,7 +418,7 @@
"result": ""
},
{
"id": 400005,
"id": 40105,
"name": "",
"desc": "5散射",
"icon": "",
@ -440,7 +440,7 @@
"result": ""
},
{
"id": 500001,
"id": 50101,
"name": "",
"desc": "直线戳攻击",
"icon": "",
@ -462,7 +462,7 @@
"result": ""
},
{
"id": 500002,
"id": 50102,
"name": "",
"desc": "2段连击",
"icon": "",
@ -484,7 +484,7 @@
"result": ""
},
{
"id": 500003,
"id": 50103,
"name": "",
"desc": "三连击",
"icon": "",
@ -506,7 +506,7 @@
"result": ""
},
{
"id": 500004,
"id": 50104,
"name": "",
"desc": "三连击加眩晕效果",
"icon": "",
@ -528,7 +528,7 @@
"result": ""
},
{
"id": 500005,
"id": 50105,
"name": "",
"desc": "三连击加眩晕效果后添加一段横扫,并击退",
"icon": "",

@ -32,7 +32,7 @@
"id": 1002,
"type": 1,
"level": 2,
"weight": 0,
"weight": 30,
"group": "",
"quality": 0,
"icon": "",
@ -61,7 +61,7 @@
"id": 1003,
"type": 1,
"level": 3,
"weight": 0,
"weight": 10,
"group": "",
"quality": 0,
"icon": "",
@ -90,7 +90,7 @@
"id": 1004,
"type": 1,
"level": 4,
"weight": 0,
"weight": 4,
"group": "",
"quality": 0,
"icon": "",
@ -119,7 +119,7 @@
"id": 1005,
"type": 2,
"level": 1,
"weight": 0,
"weight": 55,
"group": "",
"quality": 0,
"icon": "",
@ -148,7 +148,7 @@
"id": 1006,
"type": 2,
"level": 2,
"weight": 0,
"weight": 30,
"group": "",
"quality": 0,
"icon": "",
@ -177,7 +177,7 @@
"id": 1007,
"type": 2,
"level": 3,
"weight": 0,
"weight": 10,
"group": "",
"quality": 0,
"icon": "",
@ -206,7 +206,7 @@
"id": 1008,
"type": 2,
"level": 4,
"weight": 0,
"weight": 4,
"group": "",
"quality": 0,
"icon": "",
@ -235,7 +235,7 @@
"id": 1009,
"type": 3,
"level": 1,
"weight": 0,
"weight": 55,
"group": "",
"quality": 0,
"icon": "",
@ -264,7 +264,7 @@
"id": 1010,
"type": 3,
"level": 2,
"weight": 0,
"weight": 30,
"group": "",
"quality": 0,
"icon": "",
@ -293,7 +293,7 @@
"id": 1011,
"type": 3,
"level": 3,
"weight": 0,
"weight": 10,
"group": "",
"quality": 0,
"icon": "",
@ -322,7 +322,7 @@
"id": 1012,
"type": 3,
"level": 4,
"weight": 0,
"weight": 4,
"group": "",
"quality": 0,
"icon": "",
@ -351,7 +351,7 @@
"id": 1013,
"type": 4,
"level": 1,
"weight": 0,
"weight": 55,
"group": "",
"quality": 0,
"icon": "",
@ -380,7 +380,7 @@
"id": 1014,
"type": 4,
"level": 2,
"weight": 0,
"weight": 30,
"group": "",
"quality": 0,
"icon": "",
@ -409,7 +409,7 @@
"id": 1015,
"type": 4,
"level": 3,
"weight": 0,
"weight": 10,
"group": "",
"quality": 0,
"icon": "",
@ -438,7 +438,7 @@
"id": 1016,
"type": 4,
"level": 4,
"weight": 0,
"weight": 4,
"group": "",
"quality": 0,
"icon": "",
@ -467,7 +467,7 @@
"id": 1017,
"type": 5,
"level": 1,
"weight": 0,
"weight": 55,
"group": "",
"quality": 0,
"icon": "",
@ -496,7 +496,7 @@
"id": 1018,
"type": 5,
"level": 2,
"weight": 0,
"weight": 30,
"group": "",
"quality": 0,
"icon": "",
@ -525,7 +525,7 @@
"id": 1019,
"type": 5,
"level": 3,
"weight": 0,
"weight": 10,
"group": "",
"quality": 0,
"icon": "",
@ -554,7 +554,7 @@
"id": 1020,
"type": 5,
"level": 4,
"weight": 0,
"weight": 4,
"group": "",
"quality": 0,
"icon": "",
@ -583,7 +583,7 @@
"id": 2001,
"type": 10,
"level": 0,
"weight": 0,
"weight": 3,
"group": "",
"quality": 0,
"icon": "",
@ -612,7 +612,7 @@
"id": 2002,
"type": 11,
"level": 0,
"weight": 0,
"weight": 2,
"group": "",
"quality": 0,
"icon": "",

@ -8,6 +8,6 @@
],
"subMetas": {},
"userData": {
"atlasUuid": "afd3a7ab-cc62-4f75-877f-e89b8db42767"
"atlasUuid": "3f83e816-c888-4208-b564-e901ecaaae42"
}
}

@ -11,6 +11,7 @@ import {
cellKindAfterReturnToBag,
cellKindAfterType3Pickup,
cellKindAfterType3Place,
isElementGlyphType,
} from '../rules/MapPlaceRules';
import { UpgradeSystem } from '../upgrade/UpgradeSystem';
import {
@ -437,7 +438,7 @@ export class MergeSession {
const w2Type = Number(this._config.getWeapon2Type(slot.weapon2Id)) as Weapon2TileType;
if (w2Type === Weapon2TileType.Grid) {
if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Grid) {
if (!this._canDropOnCell(gridIndex, w2Type)) {
return this._dropRejectReason(gridIndex, w2Type);
}
@ -449,7 +450,7 @@ export class MergeSession {
return null;
}
if (w2Type === Weapon2TileType.Shovel) {
if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Shovel) {
if (!this._canDropOnCell(gridIndex, w2Type)) {
return this._dropRejectReason(gridIndex, w2Type);
}
@ -472,6 +473,11 @@ export class MergeSession {
const targetTile = this.map.getTile(gridIndex);
if (targetTile) {
const element = this._mergeElementOntoMap(slot, gridIndex, targetTile, () => {
this.bag.clearSlot(slotIndex);
});
if (element !== 'skip') return element;
const merged = this._tryBagMapSingleMerge(slotIndex, gridIndex, slot, targetTile);
if (merged === null) return null;
if (merged !== 'skip') return merged;
@ -494,6 +500,7 @@ export class MergeSession {
private _dropMapToMap(fromGrid: number, toGrid: number): PlaceRejectReason | null {
const pendingType3 = this._pendingDragTile?.source === TileSource.PrepPlaced
&& !isElementGlyphType(this._config.getWeapon2Type(this._pendingDragTile.weapon2Id))
&& this._config.getWeapon2Type(this._pendingDragTile.weapon2Id) === Weapon2TileType.Grid;
if (fromGrid === toGrid) {
@ -509,7 +516,7 @@ export class MergeSession {
const w2Type = this._config.getWeapon2Type(tile.weapon2Id) as Weapon2TileType;
if (w2Type === Weapon2TileType.Grid && tile.source === TileSource.PrepPlaced) {
if (!isElementGlyphType(w2Type) && w2Type === Weapon2TileType.Grid && tile.source === TileSource.PrepPlaced) {
if (!this._canDropOnCell(toGrid, Weapon2TileType.Grid)) {
return this._dropRejectReason(toGrid, Weapon2TileType.Grid);
}
@ -545,6 +552,12 @@ export class MergeSession {
const targetTile = this.map.getTile(toGrid);
if (targetTile) {
const element = this._mergeElementOntoMap(tile, toGrid, targetTile, () => {
this.map.removeTile(fromGrid);
this.map.setCellKind(fromGrid, cellKindAfterReturnToBag());
});
if (element !== 'skip') return element;
const merged = this._tryMapToMapSingleMerge(fromGrid, toGrid, tile, targetTile);
if (merged === null) return null;
if (merged !== 'skip') return merged;
@ -1184,7 +1197,8 @@ export class MergeSession {
): PlaceRejectReason | null | 'skip' {
if (!this._canSwapWeaponTile(bagSlot.weapon2Id, mapTile.weapon2Id)) return 'skip';
const cellKind = this.map.getCellKind(gridIndex);
const cellKind = this._pathChecker?.getLiveCellKind?.(gridIndex)
?? this.map.getCellKind(gridIndex);
if (cellKind !== MapCellKind.Put) return 'skip';
const mapW2Type = this._config.getWeapon2Type(mapTile.weapon2Id) as Weapon2TileType;
@ -1207,8 +1221,8 @@ export class MergeSession {
): PlaceRejectReason | null | 'skip' {
if (!this._canSwapWeaponTile(sourceTile.weapon2Id, targetTile.weapon2Id)) return 'skip';
const fromKind = this.map.getCellKind(fromGrid);
const toKind = this.map.getCellKind(toGrid);
const fromKind = this._pathChecker?.getLiveCellKind?.(fromGrid) ?? this.map.getCellKind(fromGrid);
const toKind = this._pathChecker?.getLiveCellKind?.(toGrid) ?? this.map.getCellKind(toGrid);
if (fromKind !== MapCellKind.Put || toKind !== MapCellKind.Put) return 'skip';
const srcW2Type = this._config.getWeapon2Type(sourceTile.weapon2Id) as Weapon2TileType;
@ -1232,7 +1246,8 @@ export class MergeSession {
): PlaceRejectReason | null | 'skip' {
if (!this._canSwapWeaponTile(bagSlot.weapon2Id, mapTile.weapon2Id)) return 'skip';
const cellKind = this.map.getCellKind(fromGrid);
const cellKind = this._pathChecker?.getLiveCellKind?.(fromGrid)
?? this.map.getCellKind(fromGrid);
if (cellKind !== MapCellKind.Put) return 'skip';
this.map.placeTile(fromGrid, this._mapTileFromBagSlot(bagSlot, TileSource.BagRefresh));
@ -1243,13 +1258,37 @@ export class MergeSession {
return null;
}
/** 仅 type1/2 攻击字块可参与交换 */
/**
* 五行同 Text.type、同显示等级:目标格等级 +1。
* 不是五行对,或类型/等级不同,返回 skip。
*/
private _mergeElementOntoMap(
source: { weapon2Id: number; level?: number },
toGrid: number,
target: MapTileRecord,
clearSource: () => void,
): PlaceRejectReason | null | 'skip' {
const srcType = Math.floor(this._config.getWeapon2Type(source.weapon2Id));
const dstType = Math.floor(this._config.getWeapon2Type(target.weapon2Id));
if (srcType < 1 || srcType > 5 || dstType < 1 || dstType > 5) return 'skip';
const srcLevel = Math.floor(source.level ?? 1);
const dstLevel = Math.floor(target.level ?? 1);
if (srcType !== dstType || srcLevel !== dstLevel) return 'skip';
const max = this._config.getElementMaxLevel(srcType);
if (srcLevel >= max) return PlaceRejectReason.MaxLevel;
const newLevel = srcLevel + 1;
clearSource();
this.map.placeTile(toGrid, { ...target, level: newLevel });
this._recompose();
this.emit(MergeEventFactory.mapUpgraded(toGrid, target.weapon1Id ?? 0, newLevel));
return null;
}
/** 仅五行字可参与交换 */
private _canSwapWeaponTile(weapon2IdA: number, weapon2IdB: number): boolean {
const typeA = this._config.getWeapon2Type(weapon2IdA) as Weapon2TileType;
const typeB = this._config.getWeapon2Type(weapon2IdB) as Weapon2TileType;
const swappable = (t: Weapon2TileType) =>
t === Weapon2TileType.Single || t === Weapon2TileType.Combo;
return swappable(typeA) && swappable(typeB);
const typeA = this._config.getWeapon2Type(weapon2IdA);
const typeB = this._config.getWeapon2Type(weapon2IdB);
return isElementGlyphType(typeA) && isElementGlyphType(typeB);
}
/** 背包槽 → 地图字块(含损毁与英雄绑定) */

@ -25,6 +25,7 @@ export { MapTileBoard } from './board/MapTileBoard';
export type { MapCellSnapshot } from './board/MapTileBoard';
export {
isElementGlyphType,
canDropWeapon2OnCell,
canDragMapTile,
canDragPrepType3Cell,

@ -1,6 +1,15 @@
import { MapCellKind, PlaceRejectReason, TileSource, Weapon2TileType, type MapTileRecord } from '../types/MergeTypes';
/** 根据 Weapon2.type 判断能否落到该格(type1/2 只认可放置且尚无字块) */
/**
* 新产品五行字:Text.type 1–5(金木水火土),与旧 Single/Combo/Grid/Shovel 枚举值重叠。
* @param weapon2Type Text.type
*/
export function isElementGlyphType(weapon2Type: number): boolean {
const t = Math.floor(Number(weapon2Type));
return t >= 1 && t <= 5;
}
/** 根据 Weapon2.type 判断能否落到该格(五行字只认空 Put) */
export function canDropWeapon2OnCell(
weapon2Type: Weapon2TileType,
cellKind: MapCellKind,
@ -8,11 +17,9 @@ export function canDropWeapon2OnCell(
canPutGrid = false,
): boolean {
if (hasTile) return false;
// 配表 type 可能是字符串,统一成数字再比
switch (Number(weapon2Type)) {
case Weapon2TileType.Single:
case Weapon2TileType.Combo:
return cellKind === MapCellKind.Put;
const t = Number(weapon2Type);
if (isElementGlyphType(t)) return cellKind === MapCellKind.Put;
switch (t) {
case Weapon2TileType.Grid:
return cellKind === MapCellKind.Walkable && canPutGrid;
case Weapon2TileType.Shovel:
@ -48,10 +55,9 @@ export function canDragMapTile(
weapon2Type: Weapon2TileType,
isBuiltinPutWithoutTile: boolean,
): boolean {
switch (Number(weapon2Type)) {
case Weapon2TileType.Single:
case Weapon2TileType.Combo:
return true;
const t = Number(weapon2Type);
if (isElementGlyphType(t)) return true;
switch (t) {
case Weapon2TileType.Grid:
return tile.source === TileSource.PrepPlaced && !isBuiltinPutWithoutTile;
case Weapon2TileType.Shovel:

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.9 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a",
"displayName": "图层 5898",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "0b9461e4-38ea-4e13-b133-f28d07bc5178",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "0b9461e4-38ea-4e13-b133-f28d07bc5178@f9941",
"displayName": "图层 5898",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 96,
"height": 68,
"rawWidth": 96,
"rawHeight": 68,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-48,
-34,
0,
48,
-34,
0,
-48,
34,
0,
48,
34,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
68,
96,
68,
0,
0,
96,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-48,
-34,
0
],
"maxPos": [
48,
34,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "0b9461e4-38ea-4e13-b133-f28d07bc5178@6c48a"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "201e9a69-4d94-4182-b893-c972f15ee76e",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a",
"displayName": "锁定",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "201e9a69-4d94-4182-b893-c972f15ee76e",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "201e9a69-4d94-4182-b893-c972f15ee76e@f9941",
"displayName": "锁定",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 42,
"height": 45,
"rawWidth": 42,
"rawHeight": 45,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-21,
-22.5,
0,
21,
-22.5,
0,
-21,
22.5,
0,
21,
22.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
45,
42,
45,
0,
0,
42,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-21,
-22.5,
0
],
"maxPos": [
21,
22.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "201e9a69-4d94-4182-b893-c972f15ee76e@6c48a"
}
}

@ -2,7 +2,7 @@
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "4115d7a6-71f6-4c70-87a9-799bc3a97eaa",
"uuid": "7926ac92-75a9-4878-b2a4-a647272a2dd5",
"files": [],
"subMetas": {},
"userData": {}

@ -2,7 +2,7 @@
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "e12d7cb8-5cca-414f-8cb1-dedf71a4b23c",
"uuid": "28969b5f-98cd-4781-ac67-38f3c5c75b3e",
"files": [],
"subMetas": {},
"userData": {}

@ -0,0 +1 @@
D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\大宝剑

@ -0,0 +1,55 @@
剑类武器+专属技能.png
size: 1363,456
format: RGBA8888
filter: Linear,Linear
repeat: none
刀光1
rotate: false
xy: 0, 0
size: 479, 456
orig: 481, 456
offset: 1, 0
index: -1
刀光2
rotate: false
xy: 481, 9
size: 370, 447
orig: 481, 456
offset: 9, 0
index: -1
刀光3
rotate: false
xy: 853, 70
size: 198, 386
orig: 481, 456
offset: 15, 0
index: -1
刀光4
rotate: false
xy: 1224, 93
size: 139, 363
orig: 481, 456
offset: 32, 0
index: -1
大宝剑
rotate: false
xy: 1053, 106
size: 169, 350
orig: 171, 352
offset: 1, 1
index: -1
特效
rotate: true
xy: 1053, 18
size: 86, 135
orig: 86, 140
offset: 0, 0
index: -1
飞剑
rotate: true
xy: 853, 21
size: 47, 86
orig: 49, 88
offset: 1, 1
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "5ba2c37c-132e-4f19-8c2c-c5ebd2d1ca6d",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "dcce3833-3da9-44f4-ba04-72175d2ae9db",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "5ba2c37c-132e-4f19-8c2c-c5ebd2d1ca6d"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 286 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a",
"displayName": "剑类武器+专属技能",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "57dd01b8-21ad-4333-8778-cf8e96f3c340",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "57dd01b8-21ad-4333-8778-cf8e96f3c340@f9941",
"displayName": "剑类武器+专属技能",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1363,
"height": 456,
"rawWidth": 1363,
"rawHeight": 456,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-681.5,
-228,
0,
681.5,
-228,
0,
-681.5,
228,
0,
681.5,
228,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
456,
1363,
456,
0,
0,
1363,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-681.5,
-228,
0
],
"maxPos": [
681.5,
228,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "57dd01b8-21ad-4333-8778-cf8e96f3c340@6c48a"
}
}

@ -0,0 +1,41 @@
剑阵.png
size: 1799,492
format: RGBA8888
filter: Linear,Linear
repeat: none
诛仙剑/光圈
rotate: false
xy: 597, 0
size: 547, 492
orig: 555, 500
offset: 4, 4
index: -1
诛仙剑/光芒1
rotate: true
xy: 0, 6
size: 486, 595
orig: 488, 672
offset: 1, 1
index: -1
诛仙剑/光芒2
rotate: false
xy: 1146, 99
size: 486, 393
orig: 488, 632
offset: 1, 1
index: -1
诛仙剑/剑111
rotate: true
xy: 1146, 21
size: 76, 450
orig: 82, 505
offset: 3, 5
index: -1
诛仙剑/剑222
rotate: false
xy: 1634, 273
size: 165, 219
orig: 190, 233
offset: 15, 8
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "c6a4d454-8720-43f1-8e79-e06d6a87767d",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "7b03a26d-8a9f-4312-a397-d414e1ef4574",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "c6a4d454-8720-43f1-8e79-e06d6a87767d"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 340 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a",
"displayName": "剑阵",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "0378f015-dad8-4b18-9d1c-12a0fa698bbf",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@f9941",
"displayName": "剑阵",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1799,
"height": 492,
"rawWidth": 1799,
"rawHeight": 492,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-899.5,
-246,
0,
899.5,
-246,
0,
-899.5,
246,
0,
899.5,
246,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
492,
1799,
492,
0,
0,
1799,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-899.5,
-246,
0
],
"maxPos": [
899.5,
246,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "0378f015-dad8-4b18-9d1c-12a0fa698bbf@6c48a"
}
}

@ -2,7 +2,7 @@
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "33ee6650-1a2e-4f50-b1fb-58af5d17b040",
"uuid": "eb35c200-5b5d-4731-b8d8-36df41c2a926",
"files": [],
"subMetas": {},
"userData": {}

@ -0,0 +1 @@
D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\弓箭

@ -0,0 +1,125 @@
弓类武器+专属技能.png
size: 498,523
format: RGBA8888
filter: Linear,Linear
repeat: none
技能落地受击1
rotate: true
xy: 319, 255
size: 79, 45
orig: 89, 53
offset: 5, 3
index: -1
技能落地受击2
rotate: true
xy: 319, 336
size: 100, 55
orig: 113, 78
offset: 6, 3
index: -1
技能落地受击3
rotate: true
xy: 412, 0
size: 111, 67
orig: 120, 76
offset: 3, 4
index: -1
技能落地受击4
rotate: false
xy: 192, 1
size: 118, 61
orig: 128, 71
offset: 1, 5
index: -1
波纹
rotate: false
xy: 0, 279
size: 163, 61
orig: 165, 63
offset: 1, 1
index: -1
火焰1
rotate: false
xy: 0, 342
size: 224, 94
orig: 240, 104
offset: 7, 5
index: -1
火焰11
rotate: true
xy: 99, 7
size: 208, 91
orig: 225, 101
offset: 9, 4
index: -1
火焰3
rotate: true
xy: 319, 32
size: 221, 91
orig: 237, 102
offset: 7, 6
index: -1
火焰5
rotate: true
xy: 226, 206
size: 230, 91
orig: 261, 101
offset: 7, 5
index: -1
火焰7
rotate: true
xy: 379, 255
size: 268, 91
orig: 280, 100
offset: 7, 5
index: -1
火焰9
rotate: true
xy: 0, 29
size: 224, 97
orig: 245, 105
offset: 7, 4
index: -1
特效
rotate: false
xy: 412, 113
size: 86, 140
orig: 86, 140
offset: 0, 0
index: -1
通用拖尾
rotate: false
xy: 0, 438
size: 377, 85
orig: 424, 92
offset: 13, 3
index: -1
龙头
rotate: true
xy: 192, 64
size: 140, 121
orig: 156, 133
offset: 6, 6
index: -1
龙舌弓/弓类/弓
rotate: false
xy: 165, 217
size: 49, 123
orig: 50, 123
offset: 1, 0
index: -1
龙舌弓/弓类/箭矢
rotate: true
xy: 472, 341
size: 88, 17
orig: 93, 23
offset: 2, 4
index: -1
龙舌弓/弓类/箭矢2
rotate: true
xy: 472, 431
size: 92, 21
orig: 93, 23
offset: 0, 2
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "33badaf2-314f-4269-93e9-de5514b5d580",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "2cfd40d1-8308-45e0-9d48-fc9918263deb",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "33badaf2-314f-4269-93e9-de5514b5d580"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 266 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a",
"displayName": "弓类武器+专属技能",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@f9941",
"displayName": "弓类武器+专属技能",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 498,
"height": 523,
"rawWidth": 498,
"rawHeight": 523,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-249,
-261.5,
0,
249,
-261.5,
0,
-249,
261.5,
0,
249,
261.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
523,
498,
523,
0,
0,
498,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-249,
-261.5,
0
],
"maxPos": [
249,
261.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "1a6d4f7c-ffe8-4d9a-89c4-6de9717955f7@6c48a"
}
}

@ -2,7 +2,7 @@
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "043f5156-460e-4fa1-ba45-7dcf8129ed16",
"uuid": "21f36989-5cc4-4157-8a7b-37ebec7a6a79",
"files": [],
"subMetas": {},
"userData": {}

@ -0,0 +1 @@
D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\木棍

@ -0,0 +1,153 @@
棍类武器+专属技能.png
size: 1774,1292
format: RGBA8888
filter: Linear,Linear
repeat: none
AOE光圈扩散1
rotate: false
xy: 1638, 474
size: 102, 102
orig: 114, 113
offset: 6, 5
index: -1
AOE光圈扩散2
rotate: false
xy: 835, 9
size: 227, 226
orig: 241, 239
offset: 7, 6
index: -1
AOE光圈扩散3
rotate: false
xy: 1053, 906
size: 380, 386
orig: 403, 408
offset: 10, 12
index: -1
AOE光圈扩散4
rotate: false
xy: 0, 153
size: 542, 546
orig: 564, 576
offset: 12, 15
index: -1
AOE光圈扩散5
rotate: false
xy: 0, 701
size: 580, 591
orig: 606, 626
offset: 10, 14
index: -1
光效32
rotate: false
xy: 582, 828
size: 469, 464
orig: 500, 484
offset: 31, 10
index: -1
击中光1
rotate: true
xy: 1598, 89
size: 214, 173
orig: 235, 191
offset: 11, 8
index: -1
击中光2
rotate: true
xy: 1388, 46
size: 257, 208
orig: 279, 226
offset: 11, 8
index: -1
击中光3
rotate: false
xy: 544, 49
size: 289, 239
orig: 310, 258
offset: 10, 9
index: -1
击中光4
rotate: false
xy: 1064, 0
size: 322, 265
orig: 345, 285
offset: 11, 10
index: -1
击中光5
rotate: false
xy: 1311, 305
size: 325, 271
orig: 347, 291
offset: 10, 9
index: -1
击中光6
rotate: false
xy: 1435, 767
size: 330, 279
orig: 353, 299
offset: 10, 9
index: -1
如意金箍棒/棍类/如意金箍棒
rotate: true
xy: 359, 34
size: 117, 183
orig: 117, 183
offset: 0, 0
index: -1
如意金箍棒/火焰环
rotate: false
xy: 582, 649
size: 410, 177
orig: 500, 484
offset: 47, 75
index: -1
如意金箍棒/火焰环23
rotate: true
xy: 852, 237
size: 410, 177
orig: 500, 484
offset: 47, 75
index: -1
棍圆
rotate: false
xy: 544, 290
size: 306, 357
orig: 343, 396
offset: 25, 25
index: -1
棍圆21
rotate: true
xy: 1053, 598
size: 306, 357
orig: 343, 396
offset: 25, 25
index: -1
金箍棒1
rotate: false
xy: 0, 52
size: 357, 99
orig: 357, 99
offset: 0, 0
index: -1
金箍棒2
rotate: false
xy: 1435, 1048
size: 339, 244
orig: 376, 408
offset: 0, 3
index: -1
金箍棒3
rotate: false
xy: 1031, 267
size: 278, 329
orig: 382, 390
offset: 0, 6
index: -1
金箍棒4
rotate: true
xy: 1412, 578
size: 187, 343
orig: 392, 346
offset: 2, 3
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "2499632f-2735-42d7-a814-72d005443c28",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "35c3ad81-2132-4358-8e17-a1063d1b12d7",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "2499632f-2735-42d7-a814-72d005443c28"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 MiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a",
"displayName": "棍类武器+专属技能",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "06c2a664-77b6-45bb-a3f9-599c4e02dc56",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@f9941",
"displayName": "棍类武器+专属技能",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1774,
"height": 1292,
"rawWidth": 1774,
"rawHeight": 1292,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-887,
-646,
0,
887,
-646,
0,
-887,
646,
0,
887,
646,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
1292,
1774,
1292,
0,
0,
1774,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-887,
-646,
0
],
"maxPos": [
887,
646,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "06c2a664-77b6-45bb-a3f9-599c4e02dc56@6c48a"
}
}

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "4ca90a83-642c-4619-ae0c-591056b4db90",
"files": [],
"subMetas": {},
"userData": {}
}

@ -0,0 +1 @@
D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\法杖

@ -0,0 +1,167 @@
法杖武器+专属技能.png
size: 1881,950
format: RGBA8888
filter: Linear,Linear
repeat: none
AOE光圈扩散1
rotate: false
xy: 144, 0
size: 102, 102
orig: 114, 113
offset: 6, 5
index: -1
AOE光圈扩散2
rotate: false
xy: 1499, 335
size: 227, 226
orig: 241, 239
offset: 7, 6
index: -1
AOE光圈扩散3
rotate: false
xy: 1126, 564
size: 380, 386
orig: 403, 408
offset: 10, 12
index: -1
AOE光圈扩散4
rotate: false
xy: 582, 404
size: 542, 546
orig: 564, 576
offset: 12, 15
index: -1
AOE光圈扩散5
rotate: false
xy: 0, 359
size: 580, 591
orig: 606, 626
offset: 10, 14
index: -1
光点1
rotate: true
xy: 0, 41
size: 316, 142
orig: 336, 149
offset: 0, 4
index: -1
光点2
rotate: false
xy: 248, 3
size: 368, 99
orig: 370, 103
offset: 2, 2
index: -1
光点3
rotate: false
xy: 1261, 22
size: 186, 147
orig: 212, 166
offset: 9, 0
index: -1
光点4
rotate: true
xy: 144, 104
size: 253, 190
orig: 293, 225
offset: 26, 20
index: -1
刀光1
rotate: true
xy: 336, 115
size: 242, 241
orig: 251, 250
offset: 5, 4
index: -1
刀光2
rotate: false
xy: 579, 118
size: 230, 239
orig: 239, 249
offset: 6, 4
index: -1
刀光3
rotate: true
xy: 1508, 563
size: 223, 237
orig: 232, 248
offset: 7, 4
index: -1
刀光4
rotate: true
xy: 1261, 171
size: 201, 227
orig: 218, 242
offset: 8, 5
index: -1
刀光5
rotate: true
xy: 1295, 374
size: 188, 202
orig: 202, 212
offset: 8, 0
index: -1
刀光6
rotate: false
xy: 1490, 10
size: 173, 202
orig: 191, 208
offset: 8, 6
index: -1
挥砍1
rotate: false
xy: 1126, 409
size: 167, 153
orig: 177, 164
offset: 6, 5
index: -1
挥砍2
rotate: true
xy: 1728, 368
size: 161, 153
orig: 173, 164
offset: 7, 5
index: -1
挥砍3
rotate: true
xy: 1728, 214
size: 152, 153
orig: 167, 164
offset: 8, 4
index: -1
挥砍4
rotate: false
xy: 1665, 66
size: 138, 146
orig: 160, 161
offset: 9, 6
index: -1
挥砍5
rotate: true
xy: 1747, 657
size: 129, 132
orig: 151, 144
offset: 10, 1
index: -1
挥砍6
rotate: true
xy: 1747, 531
size: 124, 130
orig: 144, 141
offset: 10, 6
index: -1
法杖
rotate: true
xy: 1508, 788
size: 162, 371
orig: 162, 371
offset: 0, 0
index: -1
聚集光能
rotate: true
xy: 811, 12
size: 390, 448
orig: 406, 464
offset: 8, 8
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "e02a71b2-6c29-4b70-b3bb-9d75249cf1ad",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "c9a6d736-aeee-4865-a852-c4998d8827d1",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "e02a71b2-6c29-4b70-b3bb-9d75249cf1ad"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 799 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a",
"displayName": "法杖武器+专属技能",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@f9941",
"displayName": "法杖武器+专属技能",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1881,
"height": 950,
"rawWidth": 1881,
"rawHeight": 950,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-940.5,
-475,
0,
940.5,
-475,
0,
-940.5,
475,
0,
940.5,
475,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
950,
1881,
950,
0,
0,
1881,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-940.5,
-475,
0
],
"maxPos": [
940.5,
475,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "d8fd31f9-4ff3-448c-b76b-ac2b1938884d@6c48a"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a",
"displayName": "飞行水弹",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "d0abd767-3ed4-49ca-b7dd-e295c41cd319",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@f9941",
"displayName": "飞行水弹",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 322,
"height": 122,
"rawWidth": 322,
"rawHeight": 122,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-161,
-61,
0,
161,
-61,
0,
-161,
61,
0,
161,
61,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
122,
322,
122,
0,
0,
322,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-161,
-61,
0
],
"maxPos": [
161,
61,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "d0abd767-3ed4-49ca-b7dd-e295c41cd319@6c48a"
}
}

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "957c5a83-cb59-4f98-8d71-0851929ffdc5",
"files": [],
"subMetas": {},
"userData": {}
}

@ -0,0 +1 @@
D:\WXWork\1688855084654441\WeDrive\中昱智云\抖音游戏\战斗类\【新】2048数字守卫战\UI\数字皮肤+武器\武器\长枪

@ -0,0 +1,167 @@
枪类武器+专属技能.png
size: 1058,543
format: RGBA8888
filter: Linear,Linear
repeat: none
枪类/a11
rotate: false
xy: 821, 297
size: 226, 43
orig: 226, 47
offset: 0, 2
index: -1
枪类/刀光1
rotate: true
xy: 121, 301
size: 242, 241
orig: 251, 250
offset: 5, 4
index: -1
枪类/刀光2
rotate: false
xy: 364, 304
size: 230, 239
orig: 239, 249
offset: 6, 4
index: -1
枪类/刀光3
rotate: false
xy: 596, 306
size: 223, 237
orig: 232, 248
offset: 7, 4
index: -1
枪类/刀光4
rotate: true
xy: 821, 342
size: 201, 227
orig: 218, 242
offset: 8, 5
index: -1
枪类/刀光5
rotate: false
xy: 698, 17
size: 188, 202
orig: 202, 212
offset: 8, 0
index: -1
枪类/刀光6
rotate: true
xy: 121, 126
size: 173, 202
orig: 191, 208
offset: 8, 6
index: -1
枪类/技能落地受击1
rotate: false
xy: 796, 250
size: 79, 45
orig: 89, 53
offset: 5, 3
index: -1
枪类/技能落地受击2
rotate: true
xy: 69, 12
size: 100, 55
orig: 113, 78
offset: 6, 3
index: -1
枪类/技能落地受击3
rotate: true
xy: 0, 1
size: 111, 67
orig: 120, 76
offset: 3, 4
index: -1
枪类/技能落地受击4
rotate: true
xy: 258, 6
size: 118, 61
orig: 128, 71
offset: 1, 5
index: -1
枪类/挥砍1
rotate: true
xy: 325, 132
size: 167, 153
orig: 177, 164
offset: 6, 5
index: -1
枪类/挥砍2
rotate: true
xy: 543, 141
size: 161, 153
orig: 173, 164
offset: 7, 5
index: -1
枪类/挥砍3
rotate: true
xy: 888, 143
size: 152, 153
orig: 167, 164
offset: 8, 4
index: -1
枪类/挥砍4
rotate: true
xy: 548, 1
size: 138, 146
orig: 160, 161
offset: 9, 6
index: -1
枪类/挥砍5
rotate: true
xy: 414, 1
size: 129, 132
orig: 151, 144
offset: 10, 1
index: -1
枪类/挥砍6
rotate: true
xy: 126, 0
size: 124, 130
orig: 144, 141
offset: 10, 6
index: -1
枪类/枪
rotate: false
xy: 0, 114
size: 119, 429
orig: 119, 429
offset: 0, 0
index: -1
枪类/枪受击1
rotate: false
xy: 975, 50
size: 83, 91
orig: 86, 94
offset: 2, 3
index: -1
枪类/枪受击2
rotate: false
xy: 888, 48
size: 85, 93
orig: 85, 94
offset: 0, 0
index: -1
枪类/枪受击3
rotate: true
xy: 698, 221
size: 83, 96
orig: 83, 96
offset: 0, 0
index: -1
枪类/枪受击4
rotate: false
xy: 321, 28
size: 91, 96
orig: 91, 96
offset: 0, 0
index: -1
枪类/波纹
rotate: true
xy: 480, 139
size: 163, 61
orig: 165, 63
offset: 1, 1
index: -1

@ -0,0 +1,12 @@
{
"ver": "1.0.0",
"importer": "*",
"imported": true,
"uuid": "a8f105f8-f322-444a-8f08-e580505287f0",
"files": [
".atlas",
".json"
],
"subMetas": {},
"userData": {}
}

File diff suppressed because one or more lines are too long

@ -0,0 +1,13 @@
{
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "542e1bba-b475-48e1-93b2-89480d605a79",
"files": [
".json"
],
"subMetas": {},
"userData": {
"atlasUuid": "a8f105f8-f322-444a-8f08-e580505287f0"
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 261 KiB

@ -0,0 +1,134 @@
{
"ver": "1.0.27",
"importer": "image",
"imported": true,
"uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08",
"files": [
".json",
".png"
],
"subMetas": {
"6c48a": {
"importer": "texture",
"uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a",
"displayName": "枪类武器+专属技能",
"id": "6c48a",
"name": "texture",
"userData": {
"wrapModeS": "clamp-to-edge",
"wrapModeT": "clamp-to-edge",
"imageUuidOrDatabaseUri": "090ff1ad-c3d7-4f22-afd7-609231fe9d08",
"isUuid": true,
"visible": false,
"minfilter": "linear",
"magfilter": "linear",
"mipfilter": "none",
"anisotropy": 0
},
"ver": "1.0.22",
"imported": true,
"files": [
".json"
],
"subMetas": {}
},
"f9941": {
"importer": "sprite-frame",
"uuid": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@f9941",
"displayName": "枪类武器+专属技能",
"id": "f9941",
"name": "spriteFrame",
"userData": {
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1058,
"height": 543,
"rawWidth": 1058,
"rawHeight": 543,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"packable": true,
"pixelsToUnit": 100,
"pivotX": 0.5,
"pivotY": 0.5,
"meshType": 0,
"vertices": {
"rawPosition": [
-529,
-271.5,
0,
529,
-271.5,
0,
-529,
271.5,
0,
529,
271.5,
0
],
"indexes": [
0,
1,
2,
2,
1,
3
],
"uv": [
0,
543,
1058,
543,
0,
0,
1058,
0
],
"nuv": [
0,
0,
1,
0,
0,
1,
1,
1
],
"minPos": [
-529,
-271.5,
0
],
"maxPos": [
529,
271.5,
0
]
},
"isUuid": true,
"imageUuidOrDatabaseUri": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a",
"atlasUuid": "",
"trimType": "auto"
},
"ver": "1.0.12",
"imported": true,
"files": [
".json"
],
"subMetas": {}
}
},
"userData": {
"type": "sprite-frame",
"fixAlphaTransparencyArtifacts": false,
"hasAlpha": true,
"redirect": "090ff1ad-c3d7-4f22-afd7-609231fe9d08@6c48a"
}
}

@ -0,0 +1,9 @@
{
"ver": "1.2.0",
"importer": "directory",
"imported": true,
"uuid": "d9a72bf0-7c2a-463c-b688-37c66a8f7694",
"files": [],
"subMetas": {},
"userData": {}
}

Before

Width:  |  Height:  |  Size: 212 KiB

After

Width:  |  Height:  |  Size: 212 KiB

Before

Width:  |  Height:  |  Size: 584 KiB

After

Width:  |  Height:  |  Size: 584 KiB

Before

Width:  |  Height:  |  Size: 566 KiB

After

Width:  |  Height:  |  Size: 566 KiB

@ -2,7 +2,7 @@
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "ee9c0c4b-851f-4f02-beb6-c3b719e3fa9d",
"uuid": "95f5d4e0-f589-4e29-8f31-6483e457efcf",
"files": [
".json"
],

Before

Width:  |  Height:  |  Size: 394 KiB

After

Width:  |  Height:  |  Size: 394 KiB

@ -2,7 +2,7 @@
"ver": "1.2.7",
"importer": "spine-data",
"imported": true,
"uuid": "63c3559c-ff6d-439e-ae2e-bb17ffa60f04",
"uuid": "92bf30d8-bc81-4826-8b8c-c9b5b9dcc2fd",
"files": [
".json"
],

Before

Width:  |  Height:  |  Size: 297 KiB

After

Width:  |  Height:  |  Size: 297 KiB

Before

Width:  |  Height:  |  Size: 604 KiB

After

Width:  |  Height:  |  Size: 604 KiB

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save