甘艺伟 1 vecka sedan
förälder
incheckning
48642d03b9
74 ändrade filer med 2005 tillägg och 413 borttagningar
  1. 15 301
      assets/bundle/gridMap/UECell.prefab
  2. 414 0
      assets/bundle/gridMap/UECube.prefab
  3. 9 0
      assets/bundle/gridMap/UECube.prefab.meta
  4. 164 9
      assets/bundle/gridMap/UEGridMap.prefab
  5. 13 0
      assets/bundle/gridMap/equipIcon.meta
  6. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_101.png
  7. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_101.png.meta
  8. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_102.png
  9. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_102.png.meta
  10. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_103.png
  11. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_103.png.meta
  12. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_104.png
  13. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_104.png.meta
  14. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_105.png
  15. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_105.png.meta
  16. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_106.png
  17. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_106.png.meta
  18. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_107.png
  19. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_107.png.meta
  20. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_108.png
  21. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_108.png.meta
  22. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_109.png
  23. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_109.png.meta
  24. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_110.png
  25. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_110.png.meta
  26. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_111.png
  27. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_111.png.meta
  28. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_112.png
  29. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_112.png.meta
  30. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_113.png
  31. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_113.png.meta
  32. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_114.png
  33. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_114.png.meta
  34. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_115.png
  35. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_115.png.meta
  36. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_116.png
  37. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_116.png.meta
  38. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_117.png
  39. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_117.png.meta
  40. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_118.png
  41. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_118.png.meta
  42. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_119.png
  43. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_119.png.meta
  44. BIN
      assets/bundle/gridMap/equipIcon/zb_icon_120.png
  45. 38 0
      assets/bundle/gridMap/equipIcon/zb_icon_120.png.meta
  46. 13 0
      assets/bundle/gridMap/qualityBg.meta
  47. BIN
      assets/bundle/gridMap/qualityBg/item_frame0.png
  48. 38 0
      assets/bundle/gridMap/qualityBg/item_frame0.png.meta
  49. BIN
      assets/bundle/gridMap/qualityBg/item_frame1.png
  50. 38 0
      assets/bundle/gridMap/qualityBg/item_frame1.png.meta
  51. BIN
      assets/bundle/gridMap/qualityBg/item_frame2.png
  52. 38 0
      assets/bundle/gridMap/qualityBg/item_frame2.png.meta
  53. BIN
      assets/bundle/gridMap/qualityBg/item_frame3.png
  54. 38 0
      assets/bundle/gridMap/qualityBg/item_frame3.png.meta
  55. BIN
      assets/bundle/gridMap/qualityBg/item_frame4.png
  56. 38 0
      assets/bundle/gridMap/qualityBg/item_frame4.png.meta
  57. BIN
      assets/bundle/gridMap/qualityBg/item_frame5.png
  58. 38 0
      assets/bundle/gridMap/qualityBg/item_frame5.png.meta
  59. BIN
      assets/bundle/gridMap/qualityBg/item_frame6.png
  60. 38 0
      assets/bundle/gridMap/qualityBg/item_frame6.png.meta
  61. 3 0
      assets/json/chapterInfo.json
  62. 6 0
      assets/json/chapterInfo.json.meta
  63. 40 0
      assets/json/chapterLayout.json
  64. 6 0
      assets/json/chapterLayout.json.meta
  65. 3 0
      assets/json/emitterInfo.json
  66. 6 0
      assets/json/emitterInfo.json.meta
  67. 24 0
      assets/json/mergePropInfo.json
  68. 6 0
      assets/json/mergePropInfo.json.meta
  69. 9 1
      assets/script/common/gameCfg.ts
  70. 13 2
      assets/script/common/xlsConfig.ts
  71. 12 58
      assets/script/logic/gridMap/UECell.ts
  72. 96 0
      assets/script/logic/gridMap/UECube.ts
  73. 10 0
      assets/script/logic/gridMap/UECube.ts.meta
  74. 117 42
      assets/script/logic/gridMap/UEGridMap.ts

+ 15 - 301
assets/bundle/gridMap/UECell.prefab

@@ -22,22 +22,16 @@
       },
       },
       {
       {
         "__id__": 6
         "__id__": 6
-      },
-      {
-        "__id__": 10
-      },
-      {
-        "__id__": 15
       }
       }
     ],
     ],
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 18
+        "__id__": 11
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 19
+      "__id__": 12
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -238,17 +232,20 @@
       },
       },
       {
       {
         "__id__": 8
         "__id__": 8
+      },
+      {
+        "__id__": 9
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 9
+      "__id__": 10
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
       "__type__": "cc.Color",
       "__type__": "cc.Color",
       "r": 255,
       "r": 255,
-      "g": 0,
-      "b": 0,
+      "g": 255,
+      "b": 255,
       "a": 255
       "a": 255
     },
     },
     "_contentSize": {
     "_contentSize": {
@@ -306,7 +303,7 @@
     "_srcBlendFactor": 770,
     "_srcBlendFactor": 770,
     "_dstBlendFactor": 771,
     "_dstBlendFactor": 771,
     "_spriteFrame": {
     "_spriteFrame": {
-      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+      "__uuid__": "cd823272-0988-4a1a-9551-0b63b64dae5c"
     },
     },
     "_type": 0,
     "_type": 0,
     "_sizeMode": 0,
     "_sizeMode": 0,
@@ -350,293 +347,13 @@
     "_id": ""
     "_id": ""
   },
   },
   {
   {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "0aXk2o6AVGwYH63KgOWxjp",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "itemNode",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [
-      {
-        "__id__": 11
-      }
-    ],
-    "_active": true,
-    "_components": [],
-    "_prefab": {
-      "__id__": 14
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 0,
-      "height": 0
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "New Sprite",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 10
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 12
-      }
-    ],
-    "_prefab": {
-      "__id__": 13
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 40,
-      "height": 36
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Sprite",
+    "__type__": "a265cWgtmNLz5ceE6clJyg2",
     "_name": "",
     "_name": "",
     "_objFlags": 0,
     "_objFlags": 0,
     "node": {
     "node": {
-      "__id__": 11
-    },
-    "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_spriteFrame": {
-      "__uuid__": "8cdb44ac-a3f6-449f-b354-7cd48cf84061"
-    },
-    "_type": 0,
-    "_sizeMode": 1,
-    "_fillType": 0,
-    "_fillCenter": {
-      "__type__": "cc.Vec2",
-      "x": 0,
-      "y": 0
-    },
-    "_fillStart": 0,
-    "_fillRange": 0,
-    "_isTrimmedMode": true,
-    "_atlas": null,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "33zkUgO6dJxIldeuiZmUE4",
-    "sync": false
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "430adYqyxBLaiHOaq6w0m0",
-    "sync": false
-  },
-  {
-    "__type__": "cc.Node",
-    "_name": "lbt_num",
-    "_objFlags": 0,
-    "_parent": {
-      "__id__": 1
-    },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      }
-    ],
-    "_prefab": {
-      "__id__": 17
-    },
-    "_opacity": 255,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 138,
-      "g": 255,
-      "b": 0,
-      "a": 255
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 22.25,
-      "height": 50.4
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_trs": {
-      "__type__": "TypedArray",
-      "ctor": "Float64Array",
-      "array": [
-        0,
-        0,
-        0,
-        0,
-        0,
-        0,
-        1,
-        1,
-        1,
-        1
-      ]
-    },
-    "_eulerAngles": {
-      "__type__": "cc.Vec3",
-      "x": 0,
-      "y": 0,
-      "z": 0
-    },
-    "_skewX": 0,
-    "_skewY": 0,
-    "_is3DNode": false,
-    "_groupIndex": 0,
-    "groupIndex": 0,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.Label",
-    "_name": "",
-    "_objFlags": 0,
-    "node": {
-      "__id__": 15
+      "__id__": 6
     },
     },
     "_enabled": true,
     "_enabled": true,
-    "_materials": [
-      {
-        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
-      }
-    ],
-    "_srcBlendFactor": 770,
-    "_dstBlendFactor": 771,
-    "_string": "1",
-    "_N$string": "1",
-    "_fontSize": 40,
-    "_lineHeight": 40,
-    "_enableWrapText": true,
-    "_N$file": null,
-    "_isSystemFontUsed": true,
-    "_spacingX": 0,
-    "_batchAsBitmap": false,
-    "_styleFlags": 0,
-    "_underlineHeight": 0,
-    "_N$horizontalAlign": 1,
-    "_N$verticalAlign": 1,
-    "_N$fontFamily": "Arial",
-    "_N$overflow": 0,
-    "_N$cacheMode": 0,
     "_id": ""
     "_id": ""
   },
   },
   {
   {
@@ -647,7 +364,7 @@
     "asset": {
     "asset": {
       "__id__": 0
       "__id__": 0
     },
     },
-    "fileId": "5eC2ShfUdKU4YbXvNlqkE4",
+    "fileId": "0aXk2o6AVGwYH63KgOWxjp",
     "sync": false
     "sync": false
   },
   },
   {
   {
@@ -658,15 +375,12 @@
       "__id__": 1
       "__id__": 1
     },
     },
     "_enabled": true,
     "_enabled": true,
-    "itemNode": {
-      "__id__": 10
-    },
-    "lbt_num": {
-      "__id__": 16
-    },
+    "itemNode": null,
+    "lbt_num": null,
     "node_select": {
     "node_select": {
       "__id__": 2
       "__id__": 2
     },
     },
+    "sp_item": null,
     "_id": ""
     "_id": ""
   },
   },
   {
   {

+ 414 - 0
assets/bundle/gridMap/UECube.prefab

@@ -0,0 +1,414 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "UECube",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      },
+      {
+        "__id__": 8
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      }
+    ],
+    "_prefab": {
+      "__id__": 12
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "itemNode",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      }
+    ],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "sp_item",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 5
+      }
+    ],
+    "_prefab": {
+      "__id__": 6
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 100,
+      "height": 100
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Sprite",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": null,
+    "_type": 0,
+    "_sizeMode": 0,
+    "_fillType": 0,
+    "_fillCenter": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_fillStart": 0,
+    "_fillRange": 0,
+    "_isTrimmedMode": false,
+    "_atlas": null,
+    "_id": ""
+  },
+  {
+    "__type__": "a265cWgtmNLz5ceE6clJyg2",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 3
+    },
+    "_enabled": true,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "33zkUgO6dJxIldeuiZmUE4",
+    "sync": false
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "430adYqyxBLaiHOaq6w0m0",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "lbt_num",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 138,
+      "g": 255,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 22.25,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.Label",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 8
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "1",
+    "_N$string": "1",
+    "_fontSize": 40,
+    "_lineHeight": 40,
+    "_enableWrapText": true,
+    "_N$file": null,
+    "_isSystemFontUsed": true,
+    "_spacingX": 0,
+    "_batchAsBitmap": false,
+    "_styleFlags": 0,
+    "_underlineHeight": 0,
+    "_N$horizontalAlign": 1,
+    "_N$verticalAlign": 1,
+    "_N$fontFamily": "Arial",
+    "_N$overflow": 0,
+    "_N$cacheMode": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "5eC2ShfUdKU4YbXvNlqkE4",
+    "sync": false
+  },
+  {
+    "__type__": "03c073JvHlParUW0UaW/tbe",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "itemNode": {
+      "__id__": 2
+    },
+    "lbt_num": {
+      "__id__": 9
+    },
+    "sp_item": {
+      "__id__": 5
+    },
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "",
+    "sync": false
+  }
+]

+ 9 - 0
assets/bundle/gridMap/UECube.prefab.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.3.2",
+  "uuid": "b1448898-31aa-41e2-82e6-34d02a326bd0",
+  "importer": "prefab",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

+ 164 - 9
assets/bundle/gridMap/UEGridMap.prefab

@@ -24,14 +24,14 @@
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 7
+        "__id__": 11
       },
       },
       {
       {
-        "__id__": 8
+        "__id__": 12
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 9
+      "__id__": 13
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -95,11 +95,11 @@
     "_active": true,
     "_active": true,
     "_components": [
     "_components": [
       {
       {
-        "__id__": 5
+        "__id__": 9
       }
       }
     ],
     ],
     "_prefab": {
     "_prefab": {
-      "__id__": 6
+      "__id__": 10
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -155,11 +155,18 @@
     "_parent": {
     "_parent": {
       "__id__": 2
       "__id__": 2
     },
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 4
+      },
+      {
+        "__id__": 6
+      }
+    ],
     "_active": true,
     "_active": true,
     "_components": [],
     "_components": [],
     "_prefab": {
     "_prefab": {
-      "__id__": 4
+      "__id__": 8
     },
     },
     "_opacity": 255,
     "_opacity": 255,
     "_color": {
     "_color": {
@@ -209,6 +216,148 @@
     "_id": ""
     "_id": ""
   },
   },
   {
   {
+    "__type__": "cc.Node",
+    "_name": "cellLayer",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "ad9IeXlSBHZ4DxDFzmXfd1",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "cubeLayer",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 3
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [],
+    "_prefab": {
+      "__id__": 7
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 0,
+      "height": 0
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        0,
+        0,
+        0,
+        0,
+        0,
+        1,
+        1,
+        1,
+        1
+      ]
+    },
+    "_eulerAngles": {
+      "__type__": "cc.Vec3",
+      "x": 0,
+      "y": 0,
+      "z": 0
+    },
+    "_skewX": 0,
+    "_skewY": 0,
+    "_is3DNode": false,
+    "_groupIndex": 0,
+    "groupIndex": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__id__": 0
+    },
+    "fileId": "f3/GOaLpdN17ZCARShAevp",
+    "sync": false
+  },
+  {
     "__type__": "cc.PrefabInfo",
     "__type__": "cc.PrefabInfo",
     "root": {
     "root": {
       "__id__": 1
       "__id__": 1
@@ -295,12 +444,18 @@
     "cellPrefab": {
     "cellPrefab": {
       "__uuid__": "b8920836-86d2-466d-951c-df24fe0d55c0"
       "__uuid__": "b8920836-86d2-466d-951c-df24fe0d55c0"
     },
     },
-    "gridCenter": {
-      "__id__": 2
+    "cubePrefab": {
+      "__uuid__": "b1448898-31aa-41e2-82e6-34d02a326bd0"
     },
     },
     "gridLayer": {
     "gridLayer": {
       "__id__": 3
       "__id__": 3
     },
     },
+    "cellLayer": {
+      "__id__": 4
+    },
+    "cubeLayer": {
+      "__id__": 6
+    },
     "_id": ""
     "_id": ""
   },
   },
   {
   {

+ 13 - 0
assets/bundle/gridMap/equipIcon.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "bd086a1e-58a9-4a2c-ae60-136939aa16d4",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_101.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_101.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "88534295-5434-4389-8c81-b8cf98cf9cfb",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_101": {
+      "ver": "1.0.6",
+      "uuid": "be26535b-3bec-491c-9ca5-84460502bfc7",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "88534295-5434-4389-8c81-b8cf98cf9cfb",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 25,
+      "trimY": 18,
+      "width": 78,
+      "height": 93,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_102.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_102.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "708230b1-2144-4ee1-91c5-1f74f4e8619a",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_102": {
+      "ver": "1.0.6",
+      "uuid": "dc2aa95c-46cd-4efe-9cae-07bd8ef4c24c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "708230b1-2144-4ee1-91c5-1f74f4e8619a",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -0.5,
+      "offsetY": 0.5,
+      "trimX": 22,
+      "trimY": 15,
+      "width": 83,
+      "height": 97,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_103.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_103.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3cad6a08-4c12-45a6-8b84-875aa7eac1fe",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_103": {
+      "ver": "1.0.6",
+      "uuid": "a1d1e80c-90dd-4c7e-86c7-6a7a2ab09b71",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3cad6a08-4c12-45a6-8b84-875aa7eac1fe",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 2,
+      "offsetY": 0.5,
+      "trimX": 21,
+      "trimY": 16,
+      "width": 90,
+      "height": 95,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_104.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_104.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "d83e4c51-1525-4219-879f-01b1b7035a47",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_104": {
+      "ver": "1.0.6",
+      "uuid": "9a8763d6-d455-48c4-9e91-8d57a8db4627",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "d83e4c51-1525-4219-879f-01b1b7035a47",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 0.5,
+      "trimX": 19,
+      "trimY": 16,
+      "width": 93,
+      "height": 95,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_105.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_105.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "cafa6f41-cc22-4c0a-a9eb-97689a6fb5fd",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_105": {
+      "ver": "1.0.6",
+      "uuid": "027dbb37-96ac-4eb3-9b51-26584c960478",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "cafa6f41-cc22-4c0a-a9eb-97689a6fb5fd",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0.5,
+      "trimX": 20,
+      "trimY": 13,
+      "width": 89,
+      "height": 101,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_106.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_106.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f35803c2-ec06-42de-8349-0278d84975f0",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_106": {
+      "ver": "1.0.6",
+      "uuid": "fe42bf68-95b7-4887-99cb-959c7f594f3a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f35803c2-ec06-42de-8349-0278d84975f0",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 0.5,
+      "trimX": 20,
+      "trimY": 13,
+      "width": 91,
+      "height": 101,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_107.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_107.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "f3b21259-4f9e-4da1-b1f4-f185f1364c46",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_107": {
+      "ver": "1.0.6",
+      "uuid": "37ea09d0-7651-407c-9944-eeb0b55c20f8",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "f3b21259-4f9e-4da1-b1f4-f185f1364c46",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1,
+      "offsetY": 1,
+      "trimX": 24,
+      "trimY": 13,
+      "width": 78,
+      "height": 100,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_108.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_108.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "7d551eee-38e6-4dbf-b451-0585a4b2804f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_108": {
+      "ver": "1.0.6",
+      "uuid": "fc901859-59d4-46fa-ba8c-76288b385e1c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "7d551eee-38e6-4dbf-b451-0585a4b2804f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -2,
+      "offsetY": 0,
+      "trimX": 15,
+      "trimY": 14,
+      "width": 94,
+      "height": 100,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_109.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_109.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "1fb62ebd-2a72-4e17-8af8-4a45fbc6b0a5",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_109": {
+      "ver": "1.0.6",
+      "uuid": "713efe1f-35b9-43be-85d6-95803bb927b6",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "1fb62ebd-2a72-4e17-8af8-4a45fbc6b0a5",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 12,
+      "trimY": 10,
+      "width": 104,
+      "height": 109,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_110.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_110.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "435192c8-2ebf-4f40-98fd-c41f32997354",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_110": {
+      "ver": "1.0.6",
+      "uuid": "d00a39b4-0df3-4850-893c-64733817cec4",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "435192c8-2ebf-4f40-98fd-c41f32997354",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -1.5,
+      "offsetY": -1.5,
+      "trimX": 15,
+      "trimY": 15,
+      "width": 95,
+      "height": 101,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_111.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_111.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "43452d80-8f97-455f-b54f-dc3146d4c801",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_111": {
+      "ver": "1.0.6",
+      "uuid": "6da56556-138c-47a7-86b1-efaa69a82c4f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "43452d80-8f97-455f-b54f-dc3146d4c801",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": 0.5,
+      "trimX": 15,
+      "trimY": 10,
+      "width": 99,
+      "height": 107,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_112.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_112.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3296020e-e388-47ae-ba68-703cf86e0a42",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_112": {
+      "ver": "1.0.6",
+      "uuid": "1994b8f7-55fc-4a62-8a5a-881f1e2f35cb",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3296020e-e388-47ae-ba68-703cf86e0a42",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -0.5,
+      "trimX": 17,
+      "trimY": 13,
+      "width": 96,
+      "height": 103,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_113.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_113.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "49f5797e-84cf-4e44-9f83-9c5306123a18",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_113": {
+      "ver": "1.0.6",
+      "uuid": "93ac1703-555f-4376-8aeb-b40a3dc0ce63",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "49f5797e-84cf-4e44-9f83-9c5306123a18",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 13,
+      "trimY": 12,
+      "width": 102,
+      "height": 105,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_114.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_114.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "8cd42cf2-afe1-4052-99d3-3ce78ed25878",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_114": {
+      "ver": "1.0.6",
+      "uuid": "1a500ba6-26bc-4f88-a1f3-98670537c544",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "8cd42cf2-afe1-4052-99d3-3ce78ed25878",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 12,
+      "trimY": 12,
+      "width": 104,
+      "height": 105,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_115.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_115.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "c89db21e-c07a-4135-bc34-ebbf52d59bed",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_115": {
+      "ver": "1.0.6",
+      "uuid": "b937c2bc-00a4-48da-b902-2e6db30a41d5",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "c89db21e-c07a-4135-bc34-ebbf52d59bed",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0.5,
+      "offsetY": -0.5,
+      "trimX": 15,
+      "trimY": 11,
+      "width": 99,
+      "height": 107,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_116.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_116.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "17635842-6cd2-4d26-b367-8de92f88277d",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_116": {
+      "ver": "1.0.6",
+      "uuid": "73124cb7-2eaa-41b8-b197-a36f49160c6a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "17635842-6cd2-4d26-b367-8de92f88277d",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": -3,
+      "offsetY": -0.5,
+      "trimX": 13,
+      "trimY": 11,
+      "width": 96,
+      "height": 107,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_117.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_117.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "4edc35e7-5a67-4881-8a37-ad9b56e20a3e",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_117": {
+      "ver": "1.0.6",
+      "uuid": "9015b245-61c8-429d-996d-9f69883fc002",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "4edc35e7-5a67-4881-8a37-ad9b56e20a3e",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": -0.5,
+      "trimX": 19,
+      "trimY": 12,
+      "width": 93,
+      "height": 105,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_118.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_118.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "b5e36b82-ea40-4a7a-a200-44d291e7cc4f",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_118": {
+      "ver": "1.0.6",
+      "uuid": "9c995ffe-fb3c-4e28-a798-3699c24ee920",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "b5e36b82-ea40-4a7a-a200-44d291e7cc4f",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": -0.5,
+      "trimX": 15,
+      "trimY": 13,
+      "width": 98,
+      "height": 103,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_119.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_119.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "e7318b3f-6875-448b-90e4-4fc66e72dc0c",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_119": {
+      "ver": "1.0.6",
+      "uuid": "3f83464e-5124-495a-aeec-51175d9b09d8",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "e7318b3f-6875-448b-90e4-4fc66e72dc0c",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1,
+      "offsetY": -1,
+      "trimX": 15,
+      "trimY": 10,
+      "width": 100,
+      "height": 110,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/equipIcon/zb_icon_120.png


+ 38 - 0
assets/bundle/gridMap/equipIcon/zb_icon_120.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "a6433df5-ed86-40cc-991d-c93a2040c2ea",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "zb_icon_120": {
+      "ver": "1.0.6",
+      "uuid": "3b3fc7ca-2e9a-492a-b8ef-0b485872e14e",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "a6433df5-ed86-40cc-991d-c93a2040c2ea",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 1.5,
+      "offsetY": 0.5,
+      "trimX": 14,
+      "trimY": 9,
+      "width": 103,
+      "height": 109,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 13 - 0
assets/bundle/gridMap/qualityBg.meta

@@ -0,0 +1,13 @@
+{
+  "ver": "1.1.3",
+  "uuid": "b61e907f-5d13-4ce1-aca2-282f8e8aaab0",
+  "importer": "folder",
+  "isBundle": false,
+  "bundleName": "",
+  "priority": 1,
+  "compressionType": {},
+  "optimizeHotUpdate": {},
+  "inlineSpriteFrames": {},
+  "isRemoteBundle": {},
+  "subMetas": {}
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame0.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame0.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "00ba6e23-31b6-4d67-95cd-023031926c72",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame0": {
+      "ver": "1.0.6",
+      "uuid": "cd823272-0988-4a1a-9551-0b63b64dae5c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "00ba6e23-31b6-4d67-95cd-023031926c72",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame1.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame1.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "50371cea-da12-400a-96a4-ee2e3b570a84",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame1": {
+      "ver": "1.0.6",
+      "uuid": "e1d9efb8-fe54-4e8f-bbea-eb13c2efb74a",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "50371cea-da12-400a-96a4-ee2e3b570a84",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame2.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame2.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "3e85a605-940c-44e1-aace-8041290bb5cf",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame2": {
+      "ver": "1.0.6",
+      "uuid": "32cef444-beec-4757-848b-bd8d14855036",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "3e85a605-940c-44e1-aace-8041290bb5cf",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame3.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame3.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "0d1ea21d-8dd6-4a75-94af-b768c7228bb6",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame3": {
+      "ver": "1.0.6",
+      "uuid": "789419d4-f619-48f7-aaa6-7f1abfc21b5f",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "0d1ea21d-8dd6-4a75-94af-b768c7228bb6",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame4.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame4.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "73d6dbbe-0c2b-466d-9462-7fdd2c6e4745",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame4": {
+      "ver": "1.0.6",
+      "uuid": "746e4418-49d7-4f51-9039-fdd892fb6cb4",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "73d6dbbe-0c2b-466d-9462-7fdd2c6e4745",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame5.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame5.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "9ba4dc27-f498-4260-b44c-8056e80afe07",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame5": {
+      "ver": "1.0.6",
+      "uuid": "8d03856e-854c-4a58-b2e5-dcb11e46d204",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "9ba4dc27-f498-4260-b44c-8056e80afe07",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

BIN
assets/bundle/gridMap/qualityBg/item_frame6.png


+ 38 - 0
assets/bundle/gridMap/qualityBg/item_frame6.png.meta

@@ -0,0 +1,38 @@
+{
+  "ver": "2.3.7",
+  "uuid": "544b4482-70f8-4437-bfae-67009a661ff9",
+  "importer": "texture",
+  "type": "sprite",
+  "wrapMode": "clamp",
+  "filterMode": "bilinear",
+  "premultiplyAlpha": false,
+  "genMipmaps": false,
+  "packable": true,
+  "width": 128,
+  "height": 128,
+  "platformSettings": {},
+  "subMetas": {
+    "item_frame6": {
+      "ver": "1.0.6",
+      "uuid": "2eea2755-3d1c-48db-b7db-7c47ec871b0c",
+      "importer": "sprite-frame",
+      "rawTextureUuid": "544b4482-70f8-4437-bfae-67009a661ff9",
+      "trimType": "auto",
+      "trimThreshold": 1,
+      "rotated": false,
+      "offsetX": 0,
+      "offsetY": 0,
+      "trimX": 0,
+      "trimY": 0,
+      "width": 128,
+      "height": 128,
+      "rawWidth": 128,
+      "rawHeight": 128,
+      "borderTop": 0,
+      "borderBottom": 0,
+      "borderLeft": 0,
+      "borderRight": 0,
+      "subMetas": {}
+    }
+  }
+}

+ 3 - 0
assets/json/chapterInfo.json

@@ -0,0 +1,3 @@
+[
+  {"id":1,"grid":[11,12,13,15,16,22,23,25,26,31,32,34,36,41,42,43,44,46,53,54,55,56,61,62,63,64,65,66,71,72,73,74,76],"map":"map_1","name":"xx"}
+]

+ 6 - 0
assets/json/chapterInfo.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "bae57196-c828-40c2-bc1e-4f896f291a43",
+  "importer": "json",
+  "subMetas": {}
+}

+ 40 - 0
assets/json/chapterLayout.json

@@ -0,0 +1,40 @@
+[
+  {"id":10001,"infoId":1,"grid":11,"type":3,"correlationId":10001},
+  {"id":10002,"infoId":1,"grid":12,"type":3,"correlationId":10002},
+  {"id":10003,"infoId":1,"grid":13,"type":3,"correlationId":10003},
+  {"id":10004,"infoId":1,"grid":15,"type":3,"correlationId":10004},
+  {"id":10005,"infoId":1,"grid":16,"type":3,"correlationId":10005},
+  {"id":10006,"infoId":1,"grid":22,"type":3,"correlationId":10006},
+  {"id":10007,"infoId":1,"grid":23,"type":3,"correlationId":10007},
+  {"id":10008,"infoId":1,"grid":25,"type":3,"correlationId":10008},
+  {"id":10009,"infoId":1,"grid":26,"type":3,"correlationId":10009},
+  {"id":10010,"infoId":1,"grid":31,"type":3,"correlationId":10010},
+  {"id":10011,"infoId":1,"grid":32,"type":3,"correlationId":10011},
+  {"id":10012,"infoId":1,"grid":34,"type":3,"correlationId":10012},
+  {"id":10013,"infoId":1,"grid":36,"type":3,"correlationId":10013},
+  {"id":10014,"infoId":1,"grid":41,"type":3,"correlationId":10014},
+  {"id":10015,"infoId":1,"grid":42,"type":3,"correlationId":10015},
+  {"id":10016,"infoId":1,"grid":43,"type":3,"correlationId":10016},
+  {"id":10017,"infoId":1,"grid":44,"type":3,"correlationId":10017},
+  {"id":10018,"infoId":1,"grid":46,"type":3,"correlationId":10018},
+  {"id":10019,"infoId":1,"grid":53,"type":3,"correlationId":10019},
+  {"id":20001,"infoId":2,"grid":11,"type":3,"correlationId":10020},
+  {"id":20002,"infoId":2,"grid":12,"type":3,"correlationId":10001},
+  {"id":20003,"infoId":2,"grid":13,"type":3,"correlationId":10002},
+  {"id":20004,"infoId":2,"grid":15,"type":3,"correlationId":10003},
+  {"id":20005,"infoId":2,"grid":16,"type":3,"correlationId":10004},
+  {"id":20006,"infoId":2,"grid":22,"type":3,"correlationId":10005},
+  {"id":20007,"infoId":2,"grid":23,"type":3,"correlationId":10006},
+  {"id":20008,"infoId":2,"grid":25,"type":3,"correlationId":10007},
+  {"id":20009,"infoId":2,"grid":26,"type":3,"correlationId":10008},
+  {"id":20010,"infoId":2,"grid":31,"type":3,"correlationId":10009},
+  {"id":20011,"infoId":2,"grid":32,"type":3,"correlationId":10010},
+  {"id":20012,"infoId":2,"grid":34,"type":3,"correlationId":10011},
+  {"id":20013,"infoId":2,"grid":36,"type":3,"correlationId":10012},
+  {"id":20014,"infoId":2,"grid":41,"type":3,"correlationId":10013},
+  {"id":20015,"infoId":2,"grid":42,"type":3,"correlationId":10014},
+  {"id":20016,"infoId":2,"grid":43,"type":3,"correlationId":10015},
+  {"id":20017,"infoId":2,"grid":44,"type":3,"correlationId":10016},
+  {"id":20018,"infoId":2,"grid":46,"type":3,"correlationId":10017},
+  {"id":20019,"infoId":2,"grid":53,"type":3,"correlationId":10018}
+]

+ 6 - 0
assets/json/chapterLayout.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "ead247b8-50b1-4c82-b63c-e29c88c25af9",
+  "importer": "json",
+  "subMetas": {}
+}

+ 3 - 0
assets/json/emitterInfo.json

@@ -0,0 +1,3 @@
+[
+  {"name":"","icon":"","prop":null,"demand":null,"chargingCost":null}
+]

+ 6 - 0
assets/json/emitterInfo.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "feb1bac6-f409-478a-9953-ae3b067f6ffa",
+  "importer": "json",
+  "subMetas": {}
+}

+ 24 - 0
assets/json/mergePropInfo.json

@@ -0,0 +1,24 @@
+[
+  {"id":10001,"name":"装备1","icon":"zb_icon_101","type":2,"quality":1},
+  {"id":10002,"name":"装备2","icon":"zb_icon_102","type":2,"quality":1},
+  {"id":10003,"name":"装备3","icon":"zb_icon_103","type":2,"quality":1},
+  {"id":10004,"name":"装备4","icon":"zb_icon_104","type":2,"quality":1},
+  {"id":10005,"name":"装备5","icon":"zb_icon_105","type":2,"quality":1},
+  {"id":10006,"name":"装备6","icon":"zb_icon_106","type":2,"quality":1},
+  {"id":10007,"name":"装备7","icon":"zb_icon_107","type":2,"quality":1},
+  {"id":10008,"name":"装备8","icon":"zb_icon_108","type":2,"quality":1},
+  {"id":10009,"name":"装备9","icon":"zb_icon_109","type":2,"quality":1},
+  {"id":10010,"name":"装备10","icon":"zb_icon_110","type":2,"quality":1},
+  {"id":10011,"name":"装备11","icon":"zb_icon_111","type":2,"quality":1},
+  {"id":10012,"name":"装备12","icon":"zb_icon_112","type":2,"quality":1},
+  {"id":10013,"name":"装备13","icon":"zb_icon_113","type":2,"quality":1},
+  {"id":10014,"name":"装备14","icon":"zb_icon_114","type":2,"quality":1},
+  {"id":10015,"name":"装备15","icon":"zb_icon_115","type":2,"quality":1},
+  {"id":10016,"name":"装备16","icon":"zb_icon_116","type":2,"quality":1},
+  {"id":10017,"name":"装备17","icon":"zb_icon_117","type":2,"quality":1},
+  {"id":10018,"name":"装备18","icon":"zb_icon_118","type":2,"quality":1},
+  {"id":10019,"name":"装备19","icon":"zb_icon_119","type":2,"quality":1},
+  {"id":10020,"name":"装备20","icon":"zb_icon_120","type":2,"quality":1},
+  {"id":10021,"name":"装备21","icon":"zb_icon_120","type":2,"quality":1},
+  {"id":10022,"name":"装备22","icon":"zb_icon_120","type":2,"quality":1}
+]

+ 6 - 0
assets/json/mergePropInfo.json.meta

@@ -0,0 +1,6 @@
+{
+  "ver": "1.0.2",
+  "uuid": "2ed5f018-24c6-4a12-8418-7e82996d4990",
+  "importer": "json",
+  "subMetas": {}
+}

+ 9 - 1
assets/script/common/gameCfg.ts

@@ -1,6 +1,6 @@
 import ConfProxy, { ConfListProxy } from "./confProxy"
 import ConfProxy, { ConfListProxy } from "./confProxy"
 import { XlsConfig, xlsItemKind, xlsItemMoney, xlsMathInfo, xlsPackageInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan
 import { XlsConfig, xlsItemKind, xlsItemMoney, xlsMathInfo, xlsPackageInfo, xlsLanguageLang, xlsLanguageClientText, xlsLanguageSeverHouduan
-, xlsAudioInfo, xlsGuideInfo } from "./xlsConfig"
+, xlsAudioInfo, xlsGuideInfo, xlsChapterInfo, xlsChapterLayout, xlsEmitterInfo, xlsMergePropInfo } from "./xlsConfig"
 
 
 export default class Gamecfg {
 export default class Gamecfg {
     static itemKind:ConfProxy<xlsItemKind>
     static itemKind:ConfProxy<xlsItemKind>
@@ -13,6 +13,10 @@ export default class Gamecfg {
     static audioInfo:ConfProxy<xlsAudioInfo>
     static audioInfo:ConfProxy<xlsAudioInfo>
     static guideInfo:ConfProxy<xlsGuideInfo>
     static guideInfo:ConfProxy<xlsGuideInfo>
     static guideInfoList:ConfListProxy<xlsGuideInfo>
     static guideInfoList:ConfListProxy<xlsGuideInfo>
+    static chapterInfo:ConfProxy<xlsChapterInfo>
+    static chapterLayoutList:ConfListProxy<xlsChapterLayout>
+    static emitterInfo:ConfProxy<xlsEmitterInfo>
+    static mergePropInfo:ConfProxy<xlsMergePropInfo>
 
 
     static initLoading(loadSuccess: Function) {
     static initLoading(loadSuccess: Function) {
        try {
        try {
@@ -37,6 +41,10 @@ export default class Gamecfg {
                Gamecfg.languageSeverHouduan = new ConfProxy("languageSeverHouduan",xls.xlsLanguageSeverHouduan ,"key")
                Gamecfg.languageSeverHouduan = new ConfProxy("languageSeverHouduan",xls.xlsLanguageSeverHouduan ,"key")
                Gamecfg.guideInfo = new ConfProxy("guideInfo",xls.xlsGuideInfo ,"id")
                Gamecfg.guideInfo = new ConfProxy("guideInfo",xls.xlsGuideInfo ,"id")
                Gamecfg.guideInfoList = new ConfListProxy("guideInfoList",xls.xlsGuideInfo ,"event")
                Gamecfg.guideInfoList = new ConfListProxy("guideInfoList",xls.xlsGuideInfo ,"event")
+               Gamecfg.chapterInfo = new ConfProxy("chapterInfo",xls.xlsChapterInfo ,"id")
+               Gamecfg.chapterLayoutList = new ConfListProxy("chapterLayoutList",xls.xlsChapterLayout ,"infoId")
+               Gamecfg.emitterInfo = new ConfProxy("emitterInfo",xls.xlsEmitterInfo ,"id")
+               Gamecfg.mergePropInfo = new ConfProxy("mergePropInfo",xls.xlsMergePropInfo ,"id")
 
 
                 loadSuccess(true)
                 loadSuccess(true)
             }, progressCallback)
             }, progressCallback)

+ 13 - 2
assets/script/common/xlsConfig.ts

@@ -1,9 +1,13 @@
 import GameController from "../GameController"
 import GameController from "../GameController"
 import { gameMethod } from "./gameMethod"
 import { gameMethod } from "./gameMethod"
+// type for attr.excel
 // type for audio.excel
 // type for audio.excel
 export type xlsAudioInfo = {id:string,name:string,vol:number}
 export type xlsAudioInfo = {id:string,name:string,vol:number}
 // type for chapter.excel
 // type for chapter.excel
+export type xlsChapterInfo = {id:int,grid:int[],map:string,name:string}
+export type xlsChapterLayout = {id:int,infoId:int,grid:int,type:int,correlationId:int,unlock:int}
 // type for emitter.excel
 // type for emitter.excel
+export type xlsEmitterInfo = {id:int,name:string,icon:string,type:int,upLimit:int,restoreInterval:int,restoreNum:int,prop:int[],demand:int[],chargingType:int,chargingCost:int[],expiryTime:int}
 // type for guide.excel
 // type for guide.excel
 export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],ytype:number,condition:number[],type:number,pram:any[],pram1:any[]}
 export type xlsGuideInfo = {id:string,event:string,way:string,variable:number[],ytype:number,condition:number[],type:number,pram:any[],pram1:any[]}
 // type for help.excel
 // type for help.excel
@@ -17,8 +21,11 @@ export type xlsLanguageClientText = {key:string,cn:string,us:string,kr:string,tw
 export type xlsLanguageSeverHouduan = {}
 export type xlsLanguageSeverHouduan = {}
 // type for language.excel
 // type for language.excel
 export type xlsLanguageLang = {key:string,cn:string,kr:string,tw:string,jp:string}
 export type xlsLanguageLang = {key:string,cn:string,kr:string,tw:string,jp:string}
+// type for level.excel
 // type for math.excel
 // type for math.excel
 export type xlsMathInfo = {key:string,pram:{"count"?:number,"count1"?:number,"str"?:string,"item"?:number[],"items"?:number[][],"kv"?:{[key:string]:number}}}
 export type xlsMathInfo = {key:string,pram:{"count"?:number,"count1"?:number,"str"?:string,"item"?:number[],"items"?:number[][],"kv"?:{[key:string]:number}}}
+// type for mergeProp.excel
+export type xlsMergePropInfo = {id:int,name:string,icon:string,type:int,quality:int}
 // type for name.excel
 // type for name.excel
 // type for package.excel
 // type for package.excel
 export type xlsPackageInfo = {id:string,group:string,plat:string,wayhttp:string,cfgUrl:string,params:any[],logo:string,loadingTips1:string,loadingTips2:string}
 export type xlsPackageInfo = {id:string,group:string,plat:string,wayhttp:string,cfgUrl:string,params:any[],logo:string,loadingTips1:string,loadingTips2:string}
@@ -26,12 +33,16 @@ export type xlsPackageInfo = {id:string,group:string,plat:string,wayhttp:string,
 // type for shop.excel
 // type for shop.excel
 
 
 export class XlsConfig {
 export class XlsConfig {
-    xlsAudioInfo: xlsAudioInfo[]
     xlsLanguageClientText: xlsLanguageClientText[]
     xlsLanguageClientText: xlsLanguageClientText[]
+    xlsAudioInfo: xlsAudioInfo[]
+    xlsChapterInfo: xlsChapterInfo[]
+    xlsChapterLayout: xlsChapterLayout[]
     xlsPackageInfo: xlsPackageInfo[]
     xlsPackageInfo: xlsPackageInfo[]
+    xlsEmitterInfo: xlsEmitterInfo[]
+    xlsMergePropInfo: xlsMergePropInfo[]
     xlsGuideInfo: xlsGuideInfo[]
     xlsGuideInfo: xlsGuideInfo[]
-    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
     xlsMathInfo: xlsMathInfo[]
     xlsMathInfo: xlsMathInfo[]
+    xlsLanguageSeverHouduan: xlsLanguageSeverHouduan[]
     xlsItemKind: xlsItemKind[]
     xlsItemKind: xlsItemKind[]
     xlsItemMoney: xlsItemMoney[]
     xlsItemMoney: xlsItemMoney[]
     xlsLanguageLang: xlsLanguageLang[]
     xlsLanguageLang: xlsLanguageLang[]

+ 12 - 58
assets/script/logic/gridMap/UECell.ts

@@ -1,12 +1,12 @@
+
 import UEBase from "../../frameWork/compment/UEBase";
 import UEBase from "../../frameWork/compment/UEBase";
+import UECube from "./UECube";
 
 
 const { ccclass, property } = cc._decorator;
 const { ccclass, property } = cc._decorator;
 
 
 export interface I_CellData {
 export interface I_CellData {
-    id: number;
-    type: number;
-    level?: number;
     zIndex: number;
     zIndex: number;
+    ueCube: UECube;
 }
 }
 @ccclass
 @ccclass
 export default class UECell extends UEBase {
 export default class UECell extends UEBase {
@@ -15,77 +15,31 @@ export default class UECell extends UEBase {
     static readonly CLS: string = "UECell";
     static readonly CLS: string = "UECell";
 
 
     @property(cc.Node)
     @property(cc.Node)
-    private itemNode: cc.Node = null!;
-    @property(cc.Label)
-    private lbt_num: cc.Label = null!;
-    @property(cc.Node)
     private node_select: cc.Node = null!;
     private node_select: cc.Node = null!;
-    @property(cc.Node)
-    private sp_item: cc.Node = null!;
 
 
-    private originalPos: cc.Vec3 = cc.v3(0, 0);
     cellData: I_CellData = null!;
     cellData: I_CellData = null!;
-    Init(cellData: I_CellData, idx: number) {
+    Init(cellData: I_CellData) {
         this.cellData = cellData;
         this.cellData = cellData;
         this.node.zIndex = cellData.zIndex;
         this.node.zIndex = cellData.zIndex;
-        this.lbt_num.string = idx.toString();
-        this.originalPos = this.node.position;
     }
     }
 
 
-    /** 是否有物品可以拖动 */
-    CanDrag(): boolean {
-        return true;
-    }
 
 
-    StartDrag(): void {
-        this.node.zIndex = 1000;
-    }
     SetSelect(isSelect: boolean) {
     SetSelect(isSelect: boolean) {
         this.node_select.active = isSelect;
         this.node_select.active = isSelect;
     }
     }
 
 
-    UpdateDragPosition(pos: cc.Vec3): void {
-        if (this.itemNode) {
-            this.itemNode.position = pos.sub(this.node.position);
-        }
-    }
-
-    EndDrag(): void {
-        if (this.itemNode) {
-            this.node.zIndex = this.cellData.zIndex;
-            this.PlayJellyAnim();
-        }
-    }
-
-    ClearCell() {
-
+    /** 是否有物品可以拖动 */
+    CanDrag(): boolean {
+        return !this.IsEmpty();
     }
     }
 
 
-    /** 播放果冻效果 */
-    PlayJellyAnim() {
-        cc.tween(this.itemNode)
-            .to(0.15, { position: cc.Vec3.ZERO })
-            .to(0.1, { scale: 1.3 })
-            .to(0.1, { scale: 0.9 })
-            .to(0.08, { scale: 1 })
-            .start();
+    GetCube(): UECube {
+        return this.cellData.ueCube;
     }
     }
 
 
-    /** 播放合成动画 */
-    PlayMergeAnim() {
-        cc.tween(this.itemNode)
-            .by(0.1, { position: cc.v3(0, 40) })
-            .by(0.1, { position: cc.v3(0, -40) })
-            .by(0.1, { position: cc.v3(0, 10) })
-            .by(0.1, { position: cc.v3(0, -10) })
-            .start();
+    /** 该棋格是否是空的 */
+    IsEmpty(): boolean {
+        return this.cellData.ueCube == null;
     }
     }
 
 
-    private UpdateItemDisplay(): void {
-        // 根据 itemType 和 itemLevel 更新物品显示
-        if (this.itemNode) {
-            this.itemNode.active = true;
-            // TODO: 更新物品的具体显示效果
-        }
-    }
 }
 }

+ 96 - 0
assets/script/logic/gridMap/UECube.ts

@@ -0,0 +1,96 @@
+import Gamecfg from "../../common/gameCfg";
+import ResSprite from "../../frameWork/compment/ResSprite";
+import UEBase from "../../frameWork/compment/UEBase";
+
+const { ccclass, property } = cc._decorator;
+
+export interface I_CubeData {
+    /** 物品类型 */
+    type: number;
+    /** 物品ID */
+    id: number;
+    /** 层级 */
+    zIndex: number;
+    /** 解锁条件 */
+    unlock: number
+}
+@ccclass
+export default class UECube extends UEBase {
+    static readonly BundleKey: string = "gridMap";
+    static readonly PrefabUrl: string = "UECube";
+    static readonly CLS: string = "UECube";
+
+    @property(cc.Node)
+    private itemNode: cc.Node = null!;
+    @property(cc.Label)
+    private lbt_num: cc.Label = null!;
+    @property(ResSprite)
+    private sp_item: ResSprite = null!;
+
+    private originalPos: cc.Vec3 = cc.v3(0, 0);
+    cellData: I_CubeData = null!;
+    Init(cellData: I_CubeData, idx: number) {
+        this.cellData = cellData;
+        this.node.zIndex = cellData.zIndex;
+        this.lbt_num.string = idx.toString();
+        this.originalPos = this.node.position;
+        if (cellData.type == 3) {
+            let mergePropCfg = Gamecfg.mergePropInfo.getItem(cellData.id.toString());
+            this.sp_item.setSpriteFrame('gridMap', `equipIcon/${mergePropCfg.icon}`);
+        }
+    }
+
+    /** 是否有物品可以拖动 */
+    CanDrag(): boolean {
+        return true;
+    }
+
+    StartDrag(): void {
+        this.node.zIndex = 1000;
+    }
+
+    UpdateDragPosition(pos: cc.Vec3): void {
+        if (this.itemNode) {
+            this.itemNode.position = pos.sub(this.node.position);
+        }
+    }
+
+    EndDrag(): void {
+        if (this.itemNode) {
+            this.node.zIndex = this.cellData.zIndex;
+            this.PlayJellyAnim();
+        }
+    }
+
+    ClearCell() {
+
+    }
+
+    /** 播放果冻效果 */
+    PlayJellyAnim() {
+        cc.tween(this.itemNode)
+            .to(0.15, { position: cc.Vec3.ZERO })
+            .to(0.1, { scale: 1.3 })
+            .to(0.1, { scale: 0.9 })
+            .to(0.08, { scale: 1 })
+            .start();
+    }
+
+    /** 播放合成动画 */
+    PlayMergeAnim() {
+        cc.tween(this.itemNode)
+            .by(0.1, { position: cc.v3(0, 40) })
+            .by(0.1, { position: cc.v3(0, -40) })
+            .by(0.1, { position: cc.v3(0, 10) })
+            .by(0.1, { position: cc.v3(0, -10) })
+            .start();
+    }
+
+    private UpdateItemDisplay(): void {
+        // 根据 itemType 和 itemLevel 更新物品显示
+        if (this.itemNode) {
+            this.itemNode.active = true;
+            // TODO: 更新物品的具体显示效果
+        }
+    }
+}

+ 10 - 0
assets/script/logic/gridMap/UECube.ts.meta

@@ -0,0 +1,10 @@
+{
+  "ver": "1.1.0",
+  "uuid": "03c07dc9-bc79-4f6a-b516-d14696fed6de",
+  "importer": "typescript",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

+ 117 - 42
assets/script/logic/gridMap/UEGridMap.ts

@@ -1,6 +1,9 @@
+import Gamecfg from "../../common/gameCfg";
+import { xlsChapterLayout } from "../../common/xlsConfig";
 import UEBase from "../../frameWork/compment/UEBase";
 import UEBase from "../../frameWork/compment/UEBase";
 import { GridConstant } from "./GridConstant";
 import { GridConstant } from "./GridConstant";
-import UECell from "./UECell";
+import UECell, { I_CellData } from "./UECell";
+import UECube from "./UECube";
 
 
 const { ccclass, property } = cc._decorator;
 const { ccclass, property } = cc._decorator;
 const DRAG_THRESHOLD: number = 10; // 拖动判定阈值(像素)
 const DRAG_THRESHOLD: number = 10; // 拖动判定阈值(像素)
@@ -12,40 +15,22 @@ export default class UEGridMap extends UEBase {
     static readonly CLS: string = "UEGridMap";
     static readonly CLS: string = "UEGridMap";
     @property(cc.Prefab)
     @property(cc.Prefab)
     cellPrefab: cc.Prefab = null!;
     cellPrefab: cc.Prefab = null!;
-    @property(cc.Node)
-    gridCenter: cc.Node = null;
+    @property(cc.Prefab)
+    cubePrefab: cc.Prefab = null!;
     @property(cc.Node)
     @property(cc.Node)
     gridLayer: cc.Node = null;
     gridLayer: cc.Node = null;
-    gridMap: UECell[][] = [];
+    @property(cc.Node)
+    cellLayer: cc.Node = null;
+    @property(cc.Node)
+    cubeLayer: cc.Node = null;
+    cellMap: { [gid: number]: UECell } = {};
     private isDragging: boolean = false;
     private isDragging: boolean = false;
     private dragStartPos: cc.Vec2 = cc.v2(0, 0);
     private dragStartPos: cc.Vec2 = cc.v2(0, 0);
     private selectedCell: UECell = null!;
     private selectedCell: UECell = null!;
     private clickCnt: number = 0;
     private clickCnt: number = 0;
     Init() {
     Init() {
-        const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
-        const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
         this.gridLayer.setContentSize(GridConstant.CELL_WIDTH * GridConstant.ROW, GridConstant.CELL_HEIGHT * GridConstant.COL);
         this.gridLayer.setContentSize(GridConstant.CELL_WIDTH * GridConstant.ROW, GridConstant.CELL_HEIGHT * GridConstant.COL);
-        let idx = 0;
-        for (let i = 0; i < GridConstant.COL; i++) {
-            let row = [];
-            for (let j = 0; j < GridConstant.ROW; j++) {
-                let cell = cc.instantiate(this.cellPrefab).getComponent(UECell);
-                this.gridLayer.addChild(cell.node);
-                cell.node.width = GridConstant.CELL_WIDTH;
-                cell.node.height = GridConstant.CELL_HEIGHT;
-                cell.node.setPosition(cc.v2(
-                    startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
-                    startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
-                ));
-                row.push(cell);
-                cell.Init({
-                    id: idx, type: 1,
-                    zIndex: idx
-                }, idx);
-                idx++;
-            }
-            this.gridMap.push(row);
-        }
+        this.LoadMapData();
         this.InitEvent();
         this.InitEvent();
     }
     }
 
 
@@ -56,6 +41,71 @@ export default class UEGridMap extends UEBase {
         this.gridLayer.on(cc.Node.EventType.TOUCH_CANCEL, this.OnTouchEnd, this);
         this.gridLayer.on(cc.Node.EventType.TOUCH_CANCEL, this.OnTouchEnd, this);
     }
     }
 
 
+
+    /** 加载地图数据 */
+    private LoadMapData() {
+        let chapterInfoCfg = Gamecfg.chapterInfo.getItem("1");
+        let layoutCfg = Gamecfg.chapterLayoutList.getItemList("1");
+        let layoutGridMap: { [grid: number]: xlsChapterLayout } = {};
+        layoutCfg.forEach(element => {
+            layoutGridMap[element.grid] = element;
+        });
+        const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
+        const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
+        this.cellMap = {};
+        for (let i = 0; i < GridConstant.COL; i++) {
+            let rowCells = [];
+            let rowCubes = [];
+            for (let j = 0; j < GridConstant.ROW; j++) {
+                let idx = (i + 1) * 10 + (j + 1);
+                if (chapterInfoCfg.grid.indexOf(idx) != -1) {
+                    let cell = this.CreateCell(i, j);
+                    rowCells.push(cell);
+                    let cellCfg: xlsChapterLayout = layoutGridMap[idx];
+                    let cube = null;
+                    if (cellCfg) {
+                        cube = cc.instantiate(this.cubePrefab).getComponent(UECube);
+                        rowCubes.push(cube);
+                        this.cubeLayer.addChild(cube.node);
+                        cube.node.width = GridConstant.CELL_WIDTH;
+                        cube.node.height = GridConstant.CELL_HEIGHT;
+                        cube.node.setPosition(cc.v2(
+                            startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
+                            startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
+                        ));
+                        cube.Init({
+                            type: cellCfg.type,
+                            id: cellCfg.correlationId,
+                            zIndex: idx,
+                            unlock: cellCfg.unlock
+                        }, idx)
+                    }
+                    cell.Init({
+                        zIndex: idx,
+                        ueCube: cube
+                    });
+                    this.cellMap[idx] = cell;
+                }
+            }
+
+        }
+    }
+
+    /** 创建格子 */
+    private CreateCell(i: number, j: number) {
+        const startX = -(GridConstant.ROW * GridConstant.CELL_WIDTH) / 2;
+        const startY = (GridConstant.COL * GridConstant.CELL_HEIGHT) / 2;
+        let cell = cc.instantiate(this.cellPrefab).getComponent(UECell);
+        this.cellLayer.addChild(cell.node);
+        cell.node.width = GridConstant.CELL_WIDTH;
+        cell.node.height = GridConstant.CELL_HEIGHT;
+        cell.node.setPosition(cc.v2(
+            startX + j * GridConstant.CELL_WIDTH + GridConstant.CELL_WIDTH / 2,
+            startY - i * GridConstant.CELL_HEIGHT - GridConstant.CELL_HEIGHT / 2
+        ));
+        return cell;
+    }
+
     private OnTouchStart(event: cc.Event.EventTouch): void {
     private OnTouchStart(event: cc.Event.EventTouch): void {
         const touchPos = this.gridLayer.convertToNodeSpaceAR(event.getLocation());
         const touchPos = this.gridLayer.convertToNodeSpaceAR(event.getLocation());
         const cell = this.GetCellByPos(touchPos);
         const cell = this.GetCellByPos(touchPos);
@@ -81,12 +131,12 @@ export default class UEGridMap extends UEBase {
         // 只有当移动距离超过阈值时才开始拖动
         // 只有当移动距离超过阈值时才开始拖动
         if (!this.isDragging && distance >= DRAG_THRESHOLD) {
         if (!this.isDragging && distance >= DRAG_THRESHOLD) {
             this.isDragging = true;
             this.isDragging = true;
-            this.selectedCell.StartDrag();
+            this.selectedCell.GetCube().StartDrag();
             this.selectedCell.SetSelect(false);
             this.selectedCell.SetSelect(false);
         }
         }
 
 
         if (this.isDragging) {
         if (this.isDragging) {
-            this.selectedCell.UpdateDragPosition(cc.v3(touchPos.x, touchPos.y));
+            this.selectedCell.GetCube().UpdateDragPosition(cc.v3(touchPos.x, touchPos.y));
         }
         }
     }
     }
 
 
@@ -96,11 +146,13 @@ export default class UEGridMap extends UEBase {
         const targetCell = this.GetCellByPos(touchPos);
         const targetCell = this.GetCellByPos(touchPos);
         if (!this.isDragging && this.selectedCell === targetCell) {
         if (!this.isDragging && this.selectedCell === targetCell) {
             //二次点击同一个格子
             //二次点击同一个格子
-            targetCell.PlayJellyAnim();
-            if (this.clickCnt >= 2) {
-                console.log("二次点击同一个格子");
-            } else {
-                this.clickCnt++;
+            if (!targetCell.IsEmpty()) {
+                targetCell.GetCube().PlayJellyAnim();
+                if (this.clickCnt >= 2) {
+                    console.log("二次点击同一个格子");
+                } else {
+                    this.clickCnt++;
+                }
             }
             }
         } else {
         } else {
             if (!this.isDragging) return;
             if (!this.isDragging) return;
@@ -109,7 +161,7 @@ export default class UEGridMap extends UEBase {
                 this.selectedCell.SetSelect(false);
                 this.selectedCell.SetSelect(false);
                 targetCell.SetSelect(true);
                 targetCell.SetSelect(true);
             }
             }
-            this.selectedCell.EndDrag();
+            this.selectedCell.GetCube().EndDrag();
             this.isDragging = false;
             this.isDragging = false;
             this.selectedCell = targetCell;
             this.selectedCell = targetCell;
         }
         }
@@ -124,22 +176,45 @@ export default class UEGridMap extends UEBase {
         const col = Math.floor((startY - pos.y) / GridConstant.CELL_HEIGHT);
         const col = Math.floor((startY - pos.y) / GridConstant.CELL_HEIGHT);
 
 
         if (col >= 0 && col < GridConstant.COL && row >= 0 && row < GridConstant.ROW) {
         if (col >= 0 && col < GridConstant.COL && row >= 0 && row < GridConstant.ROW) {
-            return this.gridMap[col][row];
+            let idx = (col + 1) * 10 + (row + 1);
+            return this.cellMap[idx];
         }
         }
         return null;
         return null;
     }
     }
 
 
     /** 尝试合成 */
     /** 尝试合成 */
     private TryMergeItems(fromCell: UECell, toCell: UECell): void {
     private TryMergeItems(fromCell: UECell, toCell: UECell): void {
-        if (fromCell.cellData.type == toCell.cellData.type &&
-            fromCell.cellData.id != toCell.cellData.id &&
-            fromCell.cellData.level == toCell.cellData.level) {
-            toCell.PlayMergeAnim();
-        }
+        // if (toCell.cellData.type == 0) {
+        //     //格子上没有物品
+
+        // } else if (fromCell.cellData.type == toCell.cellData.type &&
+        //     fromCell.cellData.id != toCell.cellData.id &&
+        //     fromCell.cellData.level == toCell.cellData.level) {
+        //     toCell.PlayMergeAnim();
+        // } else {
+
+        // }
+    }
+
+    private SwitchCell(fromCell: UECell, toCell: UECell): void {
+        //交换格子
+        const tempData = fromCell.cellData;
+        fromCell.cellData = toCell.cellData;
+        toCell.cellData = tempData;
+        // fromCell.UpdateCell();
+        // toCell.UpdateCell();
+        cc.tween(toCell.node)
+            .to(0.3, { position: fromCell.node.position })
+            .call(() => {
+                // fromCell.UpdateCell();
+                // toCell.UpdateCell();
+            })
+            .start();
     }
     }
 
 
     /** 抛出新的物品 */
     /** 抛出新的物品 */
-    private JumpNewItem() {
+    private ThrowNewItem() {
 
 
     }
     }
+
 }
 }