棋盘

assets/bundle/gridMap/UECube.prefab

@@ -25,16 +25,19 @@
       },
       {
         "__id__": 11
+      },
+      {
+        "__id__": 16
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 16
+        "__id__": 19
       }
     ],
     "_prefab": {
-      "__id__": 17
+      "__id__": 20
     },
     "_opacity": 255,
     "_color": {
@@ -316,7 +319,7 @@
       "ctor": "Float64Array",
       "array": [
         0,
-        0,
+        12,
         0,
         0,
         0,
@@ -567,6 +570,114 @@
     "sync": false
   },
   {
+    "__type__": "cc.Node",
+    "_name": "lbt_key",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 17
+      }
+    ],
+    "_prefab": {
+      "__id__": 18
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 16.68,
+      "height": 50.4
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        0,
+        -32,
+        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__": 16
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_string": "1",
+    "_N$string": "1",
+    "_fontSize": 30,
+    "_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": "1cS3DhTKJDarkSLoFds8KQ",
+    "sync": false
+  },
+  {
     "__type__": "03c073JvHlParUW0UaW/tbe",
     "_name": "",
     "_objFlags": 0,
@@ -580,6 +691,9 @@
     "lbt_num": {
       "__id__": 9
     },
+    "lbt_key": {
+      "__id__": 17
+    },
     "sp_item": {
       "__id__": 5
     },

assets/bundle/gridMap/UEGridMap.prefab

@@ -604,6 +604,12 @@
     "cubeLayer": {
       "__id__": 6
     },
+    "tipLayer": {
+      "__id__": 8
+    },
+    "effectLayer": {
+      "__id__": 10
+    },
     "_id": ""
   },
   {

assets/script/logic/gridMap/UECube.ts

@@ -33,6 +33,8 @@ export default class UECube extends UEBase {
     private itemNode: cc.Node = null!;
     @property(cc.Label)
     private lbt_num: cc.Label = null!;
+    @property(cc.Label)
+    private lbt_key: cc.Label = null!;
     @property(ResSprite)
     private sp_item: ResSprite = null!;
     originalPos: cc.Vec3 = cc.Vec3.ZERO;
@@ -51,6 +53,7 @@ export default class UECube extends UEBase {
             let mergePropCfg = Gamecfg.mergePropInfo.getItem(cubeData.id.toString());
             this.sp_item.setSpriteFrame('gridMap', `mergeEquip/${mergePropCfg.icon}`);
         }
+        this.lbt_key.string = `${cubeData.type}_${cubeData.id}`;
     }
 
     /** 触发点击 */

assets/script/logic/gridMap/UEGridMap.ts

@@ -43,6 +43,7 @@ export default class UEGridMap extends UEBase {
     Init() {
         this.ueMergeTip = AssetMgr.instantiateUE(UEMergeTip);
         this.tipLayer.addChild(this.ueMergeTip.node);
+        this.ueMergeTip.node.active = false;
         this.gridLayer.setContentSize(GridConstant.CELL_WIDTH * GridConstant.ROW, GridConstant.CELL_HEIGHT * GridConstant.COL);
         // this.LoadMapData();
         GameDataCenter.gridMap.Init(this);
@@ -204,6 +205,7 @@ export default class UEGridMap extends UEBase {
                     this.ueMergeTip.node.active = true;
                     this.ueMergeTip.node.setPosition(targetCell.node.getPosition());
                     this.ueMergeTip.Init({
+                        idx: targetCell.GetZIndex(),
                         ueCube1: this.selectedCell.GetCube(),
                         ueCube2: targetCell.GetCube()
                     });

assets/script/logic/gridMap/UEMergeTip.ts

@@ -5,6 +5,7 @@ import UECube from "./UECube";
 const { ccclass, property } = cc._decorator;
 
 export interface I_MergeTipData {
+    idx: number;
     ueCube1: UECube;
     ueCube2: UECube;
 }

assets/script/shared/admin/PtlDeleteSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "0944427b-9b0c-4f46-b1c4-12a0823353fb",
+  "uuid": "27038615-dd53-46e8-b583-f57d634d16b7",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "389ec9d1-7000-4ae8-bf6e-4f07a7a91c99",
+  "uuid": "a0b1fc5f-62f5-4883-b497-62aabe77e9cd",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlGetVer.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "de3e6acc-c09e-4df5-994f-fe6dd4ff0aa8",
+  "uuid": "f2b8e5fb-d7a5-42dc-902d-620277447a93",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlHuodongFind.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "3f48548c-1edc-42ae-8342-b36e3140d761",
+  "uuid": "2026ea43-2ab8-45ba-b5aa-2e1465e023f0",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,

assets/script/shared/admin/PtlUpdateSetting.ts.meta

@@ -1,6 +1,6 @@
 {
   "ver": "1.1.0",
-  "uuid": "caba5dcf-b248-4d7d-b019-74c1404584fb",
+  "uuid": "8ba135ae-0551-466c-95f5-b5d741a50ba5",
   "importer": "typescript",
   "isPlugin": false,
   "loadPluginInWeb": true,