【修改】新增调试工具

assets/resources/edt_prefab/Debug.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "c24e7d10-9ff0-4441-97d8-f28177603f10",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/resources/edt_prefab/Debug/debug_alert.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.6",
+  "uuid": "d5d7f67a-189d-45bc-94b1-336d432402a8",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/edt_prefab/Debug/debug_enter.prefab

@@ -0,0 +1,462 @@
+[
+  {
+    "__type__": "cc.Prefab",
+    "_name": "",
+    "_objFlags": 0,
+    "_native": "",
+    "data": {
+      "__id__": 1
+    },
+    "optimizationPolicy": 0,
+    "asyncLoadAssets": false,
+    "readonly": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "debug_enter",
+    "_objFlags": 0,
+    "_parent": null,
+    "_children": [
+      {
+        "__id__": 2
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 11
+      },
+      {
+        "__id__": 12
+      }
+    ],
+    "_prefab": {
+      "__id__": 13
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 810,
+      "height": 1440
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0,
+      "y": 0
+    },
+    "_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": "btn",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 1
+    },
+    "_children": [
+      {
+        "__id__": 3
+      },
+      {
+        "__id__": 6
+      }
+    ],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 9
+      }
+    ],
+    "_prefab": {
+      "__id__": 10
+    },
+    "_opacity": 169,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 132,
+      "height": 66
+    },
+    "_anchorPoint": {
+      "__type__": "cc.Vec2",
+      "x": 0.5,
+      "y": 0.5
+    },
+    "_trs": {
+      "__type__": "TypedArray",
+      "ctor": "Float64Array",
+      "array": [
+        405,
+        1418,
+        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": "bg",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 4
+      }
+    ],
+    "_prefab": {
+      "__id__": 5
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 255,
+      "g": 255,
+      "b": 255,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 132,
+      "height": 66
+    },
+    "_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": {
+      "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91"
+    },
+    "_type": 0,
+    "_sizeMode": 0,
+    "_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": {
+      "__uuid__": "005f289d-dd76-447f-864e-215f62b43e8e"
+    },
+    "fileId": "c3hx4mnllGKbPIwGt8xk4n",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Node",
+    "_name": "label",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 2
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 7
+      }
+    ],
+    "_prefab": {
+      "__id__": 8
+    },
+    "_opacity": 255,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 155,
+      "g": 155,
+      "b": 155,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 90,
+      "height": 83.16
+    },
+    "_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__": 6
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_useOriginalSize": false,
+    "_string": "调 试",
+    "_N$string": "调 试",
+    "_fontSize": 40,
+    "_lineHeight": 66,
+    "_enableWrapText": true,
+    "_N$file": {
+      "__uuid__": "6e82bca4-2312-41ba-bf07-3e4065619cf9"
+    },
+    "_isSystemFontUsed": false,
+    "_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": {
+      "__uuid__": "005f289d-dd76-447f-864e-215f62b43e8e"
+    },
+    "fileId": "4arNlESoBEN7SIS83nZ0HF",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 2
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 17,
+    "_left": 0,
+    "_right": 0,
+    "_top": -11,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "005f289d-dd76-447f-864e-215f62b43e8e"
+    },
+    "fileId": "7euFiA3eJPT48Ozv0DFO1q",
+    "sync": false
+  },
+  {
+    "__type__": "cc.Widget",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "alignMode": 1,
+    "_target": null,
+    "_alignFlags": 45,
+    "_left": 0,
+    "_right": 0,
+    "_top": 0,
+    "_bottom": 0,
+    "_verticalCenter": 0,
+    "_horizontalCenter": 0,
+    "_isAbsLeft": true,
+    "_isAbsRight": true,
+    "_isAbsTop": true,
+    "_isAbsBottom": true,
+    "_isAbsHorizontalCenter": true,
+    "_isAbsVerticalCenter": true,
+    "_originalWidth": 0,
+    "_originalHeight": 0,
+    "_id": ""
+  },
+  {
+    "__type__": "43dfc+9iBZL1oHff40fr4/F",
+    "_name": "",
+    "_objFlags": 0,
+    "node": {
+      "__id__": 1
+    },
+    "_enabled": true,
+    "btnNode": {
+      "__id__": 2
+    },
+    "_prevX": 0,
+    "_prevY": 0,
+    "_didMove": false,
+    "_id": ""
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 1
+    },
+    "asset": {
+      "__uuid__": "005f289d-dd76-447f-864e-215f62b43e8e"
+    },
+    "fileId": "9bGqJtPppHR6bzL78mEBWd",
+    "sync": false
+  }
+]

assets/resources/edt_prefab/Debug/debug_enter.prefab.meta

@@ -0,0 +1,8 @@
+{
+  "ver": "1.2.6",
+  "uuid": "005f289d-dd76-447f-864e-215f62b43e8e",
+  "optimizationPolicy": "AUTO",
+  "asyncLoadAssets": false,
+  "readonly": false,
+  "subMetas": {}
+}

assets/resources/res_json/Sheet1.json

@@ -1,37 +0,0 @@
-[
-  {
-    "id": 1,
-    "colour": "白",
-    "listCost": 0
-  },
-  {
-    "id": 2,
-    "colour": "绿",
-    "listCost": 200
-  },
-  {
-    "id": 3,
-    "colour": "蓝",
-    "listCost": 500
-  },
-  {
-    "id": 4,
-    "colour": "紫",
-    "listCost": 1000
-  },
-  {
-    "id": 5,
-    "colour": "粉",
-    "listCost": 2000
-  },
-  {
-    "id": 6,
-    "colour": "红",
-    "listCost": 5000
-  },
-  {
-    "id": 7,
-    "colour": "金",
-    "listCost": 10000
-  }
-]

assets/resources/res_json/Sheet1.json.meta

@@ -1,5 +0,0 @@
-{
-  "ver": "1.0.0",
-  "uuid": "e7749024-46e7-43b4-a4d7-aa4c8e5b59e6",
-  "subMetas": {}
-}

assets/script/app/constants/AppConstants.js

@@ -19,6 +19,7 @@ window.JMC.Proxy = cc.Enum({
 // 弹框 Id 枚举声明
 window.JMC.ALERT_ID = cc.Enum({
     DEFAULT: 0,                             // 默认
+    DEBUG: 999,                             // 测试
 });
 
 // 物品类型枚举声明

assets/script/core/ctrl/SceneCtrlBase.js

@@ -55,7 +55,7 @@ cc.Class({
         }
 
         if (!CC_EDITOR && G.OPEN_DEBUG) {
-            cc.loader.loadRes('debug/prefab/public/debug_debug_enter', cc.Prefab, (err, prefab) => {
+            cc.loader.loadRes('edt_prefab/Debug/debug_enter', cc.Prefab, (err, prefab) => {
                 if (err) {
                     G.LogUtils.log('err:', err);
                     return;

assets/script/core/debug.meta

@@ -0,0 +1,7 @@
+{
+  "ver": "1.0.1",
+  "uuid": "4e9053d5-e56a-48d1-b78c-9d1ac2df1924",
+  "isSubpackage": false,
+  "subpackageName": "",
+  "subMetas": {}
+}

assets/script/core/debug/DebugCtrl.js

@@ -0,0 +1,85 @@
+cc.Class({
+    extends: cc.Component,
+
+    editor: {
+        menu: 'Debug/DebugCtrl'
+    },
+
+    properties: {
+        btnNode: cc.Node,
+
+        _prevX: 0,
+        _prevY: 0,
+        _didMove: false
+    },
+
+    onEnable () {
+        this.btnNode.on(cc.Node.EventType.TOUCH_START, this._onTouchStart, this);
+        this.btnNode.on(cc.Node.EventType.TOUCH_MOVE, this._onTouchMove, this);
+        this.btnNode.on(cc.Node.EventType.TOUCH_END, this._onTouchEnd, this);
+        this.btnNode.on(cc.Node.EventType.TOUCH_CANCEL, this._onTouchEnd, this);
+        cc.tween(this.btnNode)
+            .delay(1)
+            .to(1, {opacity: 0})
+            .start();
+    },
+
+    onDisable () {
+        this.btnNode.off(cc.Node.EventType.TOUCH_START, this._onTouchStart, this);
+        this.btnNode.off(cc.Node.EventType.TOUCH_MOVE, this._onTouchMove, this);
+        this.btnNode.off(cc.Node.EventType.TOUCH_END, this._onTouchEnd, this);
+        this.btnNode.off(cc.Node.EventType.TOUCH_CANCEL, this._onTouchEnd, this);
+    },
+    onClicked () {
+        G.AppUtils.getSceneCtrl().showAlert('edt_prefab/Debug/debug_alert', undefined);
+    },
+
+    _onTouchStart (event) {
+        let location = event.getLocation();
+
+        this._didMove = false;
+
+        this.btnNode.stopAllActions();
+        this.btnNode.opacity = 255;
+        this._prevX = location.x;
+        this._prevY = location.y;
+    },
+
+    _onTouchMove (event) {
+        let location = event.getLocation();
+
+        let posX = this.btnNode.x;
+        let posY = this.btnNode.y;
+        if (!this._didMove) {
+            let deltaV2 = cc.v2(posX, posY).sub(cc.v2(location.x, location.y));
+            let dist = deltaV2.mag();
+            if (dist > 44) {
+                this._didMove = true;
+            }
+        }
+
+        if (this._didMove) {
+            this.btnNode.x = posX + (location.x - this._prevX);
+            this.btnNode.y = posY + (location.y - this._prevY);
+
+            this._prevX = location.x;
+            this._prevY = location.y;
+        }
+    },
+
+    _onTouchEnd (event) {
+        if (!this._didMove) {
+            this.onClicked();
+        }
+
+        this._didMove = false;
+
+        this._prevX = 0;
+        this._prevY = 0;
+
+        cc.tween(this.btnNode)
+            .delay(1)
+            .to(1, {opacity: 0})
+            .start();
+    }
+});

assets/script/core/debug/DebugCtrl.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "43dfcfbd-8816-4bd6-81df-7f8d1faf8fc5",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/core/debug/DebuguAlert.js

@@ -0,0 +1,75 @@
+const JMAlertBase = require('JMAlertBase');
+
+cc.Class({
+    editor: {
+        menu: 'Debug/DebugAlert'
+    },
+
+    extends: JMAlertBase ,
+
+    properties: {
+        itemIdEB: cc.EditBox,
+        itemNumEB: cc.EditBox,
+    },
+
+    onLoad () {
+        this._super();
+
+    },
+
+    onEnable () {
+        this._super();
+
+    },
+
+    onDisable () {
+        cc.game.targetOff(this);
+
+        this._super();
+    },
+
+    reloadData (data, cb) {
+    },
+    
+    debuguItemAddOnClicked() {
+        if (this.itemIdEB.String.length == 0) {
+            return;
+        }
+
+        let itemid = parseInt(this.itemIdEB.String);
+        let num = this.itemNumEB.String.length == 0 ? 1 : parseInt(this.itemNumEB.String);
+
+        this.requestAddItems([
+            {
+                id: itemid,
+                count: num
+            }
+        ]);
+    },
+
+    requestAddItems (items) {
+        let uid = G.UserMgr.getUid();
+        if (!uid) return;
+
+        let info = {
+            uid: uid,
+            items: items
+        };
+        G.NetworkMgr.sendSocketRequest('test_add_items', info, this.responseAddItems.bind(this));
+    },
+
+    responseAddItems (data) {
+        let requestInfo = data.requestInfo;
+        let responseInfo = data.responseInfo;
+        if (responseInfo.code === 200) {
+            for (const item of requestInfo.items) {
+                if (item.count > 0) {
+                    G.AppUtils.getSceneCtrl().addToast('获得: ' + item.id + "&&数量：" + item.count);
+                }
+                if (item.count < 0) {
+                    G.AppUtils.getSceneCtrl().addToast('删除: ' + item.id + "&&数量：" + Math.abs(item.count));
+                }
+            }
+        }
+    },
+});

assets/script/core/debug/DebuguAlert.js.meta

@@ -0,0 +1,9 @@
+{
+  "ver": "1.0.8",
+  "uuid": "115bcb91-ebb6-40d0-8566-52ee359670c9",
+  "isPlugin": false,
+  "loadPluginInWeb": true,
+  "loadPluginInNative": true,
+  "loadPluginInEditor": false,
+  "subMetas": {}
+}

assets/script/core/model/user/UserMgr.js

@@ -41,10 +41,12 @@ let UserMgr = {
     },
 
     //* ************* 用户信息获取 ************* *//
+    getUid() {
+        if (!this._playerInfo) return undefined;
+        
+        return this._playerInfo.uid;
+    },
 
-
-
-    
     /**
      * 设置玩家系统信息
      *