youhaitao пре 2 година
родитељ
комит
ee15a6be5f
5 измењених фајлова са 272 додато и 50 уклоњено
  1. 1 1
      README.md
  2. 5 5
      assets/main/SceneMain.ts
  3. 260 38
      assets/res/pageMap/res/prefab/pageMap.prefab
  4. 5 5
      assets/src/common/common.ts
  5. 1 1
      settings/project.json

+ 1 - 1
README.md

@@ -28,7 +28,7 @@
 
 测试配置:
     assets/src/common/common.ts
-        isDebug: boolean = true;// 是否开启测试
+        debugTpye: number = 1;// 模式测试 0:非测试 1:本地测试 2:外网测试
         unitCur: number = 6;// 第几集,从1开始
         pageCur: number = 4;// 第几个游戏,从1开始
     上面的描述:测试状态,从第六集第四个游戏开始测试。

+ 5 - 5
assets/main/SceneMain.ts

@@ -73,7 +73,7 @@ export default class Scene extends cc.Component {
         this.initUI();
         await this.initData();
         common.log("场景加载完成,等待进入游戏层");
-        if (common.isDebug) {
+        if (common.debugTpye == 1) {
             this.nodePageMap.active = false;
             this.addPrefab(common.getUnitNum(), common.getPageNum());
         }
@@ -179,15 +179,15 @@ export default class Scene extends cc.Component {
     }
 
     resetBtnNext(show) {
-        if (common.isDebug) {
-            this.btnNext.active = true;
-        }
-        else{
+        if (common.debugTpye == 0) {
             this.btnNext.active = false;// 显示下一步按钮
             if (!show) return;
             let gameOne = common.getGameFormLocal();
             this.btnNext.active = Number(gameOne) >= 0;
         }
+        else{
+            this.btnNext.active = true;
+        }
     }
 
     /**

+ 260 - 38
assets/res/pageMap/res/prefab/pageMap.prefab

@@ -27,14 +27,14 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 82
+        "__id__": 88
       },
       {
-        "__id__": 83
+        "__id__": 89
       }
     ],
     "_prefab": {
-      "__id__": 84
+      "__id__": 90
     },
     "_opacity": 255,
     "_color": {
@@ -232,22 +232,22 @@
         "__id__": 58
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 66
+        "__id__": 72
       },
       {
-        "__id__": 73
+        "__id__": 79
       },
       {
-        "__id__": 77
+        "__id__": 83
       }
     ],
     "_active": true,
     "_components": [],
     "_prefab": {
-      "__id__": 81
+      "__id__": 87
     },
     "_opacity": 255,
     "_color": {
@@ -2317,15 +2317,19 @@
     "_parent": {
       "__id__": 5
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 59
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 59
+        "__id__": 62
       }
     ],
     "_prefab": {
-      "__id__": 61
+      "__id__": 64
     },
     "_opacity": 255,
     "_color": {
@@ -2374,6 +2378,113 @@
     "groupIndex": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 58
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 60
+      }
+    ],
+    "_prefab": {
+      "__id__": 61
+    },
+    "_opacity": 200,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_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__": 59
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1a32fc76-f0bd-4f66-980f-56929c0ca0b3"
+    },
+    "_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__": "c94c2fd2-3c89-4b40-bf3d-3019e190b645"
+    },
+    "fileId": "10IVZQ81ZExJDTNjeowCMF",
+    "sync": false
+  },
   {
     "__type__": "cc.Button",
     "_name": "",
@@ -2388,7 +2499,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 60
+        "__id__": 63
       }
     ],
     "_N$interactable": true,
@@ -2474,15 +2585,19 @@
     "_parent": {
       "__id__": 5
     },
-    "_children": [],
+    "_children": [
+      {
+        "__id__": 66
+      }
+    ],
     "_active": true,
     "_components": [
       {
-        "__id__": 63
+        "__id__": 69
       }
     ],
     "_prefab": {
-      "__id__": 65
+      "__id__": 71
     },
     "_opacity": 255,
     "_color": {
@@ -2531,12 +2646,119 @@
     "groupIndex": 0,
     "_id": ""
   },
+  {
+    "__type__": "cc.Node",
+    "_name": "icon",
+    "_objFlags": 0,
+    "_parent": {
+      "__id__": 65
+    },
+    "_children": [],
+    "_active": true,
+    "_components": [
+      {
+        "__id__": 67
+      }
+    ],
+    "_prefab": {
+      "__id__": 68
+    },
+    "_opacity": 200,
+    "_color": {
+      "__type__": "cc.Color",
+      "r": 0,
+      "g": 0,
+      "b": 0,
+      "a": 255
+    },
+    "_contentSize": {
+      "__type__": "cc.Size",
+      "width": 120,
+      "height": 120
+    },
+    "_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__": 66
+    },
+    "_enabled": true,
+    "_materials": [
+      {
+        "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
+      }
+    ],
+    "_srcBlendFactor": 770,
+    "_dstBlendFactor": 771,
+    "_spriteFrame": {
+      "__uuid__": "1a32fc76-f0bd-4f66-980f-56929c0ca0b3"
+    },
+    "_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__": "c94c2fd2-3c89-4b40-bf3d-3019e190b645"
+    },
+    "fileId": "85sPtD7EtOzaBIE0gyZEke",
+    "sync": false
+  },
   {
     "__type__": "cc.Button",
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 62
+      "__id__": 65
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2545,7 +2767,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 64
+        "__id__": 70
       }
     ],
     "_N$interactable": true,
@@ -2633,17 +2855,17 @@
     },
     "_children": [
       {
-        "__id__": 67
+        "__id__": 73
       }
     ],
     "_active": true,
     "_components": [
       {
-        "__id__": 70
+        "__id__": 76
       }
     ],
     "_prefab": {
-      "__id__": 72
+      "__id__": 78
     },
     "_opacity": 255,
     "_color": {
@@ -2697,17 +2919,17 @@
     "_name": "icon",
     "_objFlags": 0,
     "_parent": {
-      "__id__": 66
+      "__id__": 72
     },
     "_children": [],
     "_active": true,
     "_components": [
       {
-        "__id__": 68
+        "__id__": 74
       }
     ],
     "_prefab": {
-      "__id__": 69
+      "__id__": 75
     },
     "_opacity": 200,
     "_color": {
@@ -2761,7 +2983,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 67
+      "__id__": 73
     },
     "_enabled": true,
     "_materials": [
@@ -2804,7 +3026,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 66
+      "__id__": 72
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2813,7 +3035,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 71
+        "__id__": 77
       }
     ],
     "_N$interactable": true,
@@ -2903,11 +3125,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 74
+        "__id__": 80
       }
     ],
     "_prefab": {
-      "__id__": 76
+      "__id__": 82
     },
     "_opacity": 255,
     "_color": {
@@ -2961,7 +3183,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 73
+      "__id__": 79
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -2970,7 +3192,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 75
+        "__id__": 81
       }
     ],
     "_N$interactable": true,
@@ -3060,11 +3282,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 78
+        "__id__": 84
       }
     ],
     "_prefab": {
-      "__id__": 80
+      "__id__": 86
     },
     "_opacity": 255,
     "_color": {
@@ -3118,7 +3340,7 @@
     "_name": "",
     "_objFlags": 0,
     "node": {
-      "__id__": 77
+      "__id__": 83
     },
     "_enabled": true,
     "_normalMaterial": null,
@@ -3127,7 +3349,7 @@
     "zoomScale": 1.2,
     "clickEvents": [
       {
-        "__id__": 79
+        "__id__": 85
       }
     ],
     "_N$interactable": true,
@@ -3263,16 +3485,16 @@
         "__id__": 58
       },
       {
-        "__id__": 62
+        "__id__": 65
       },
       {
-        "__id__": 66
+        "__id__": 72
       },
       {
-        "__id__": 73
+        "__id__": 79
       },
       {
-        "__id__": 77
+        "__id__": 83
       }
     ],
     "_id": ""

+ 5 - 5
assets/src/common/common.ts

@@ -36,13 +36,13 @@ class common {
         this._instance.editSpineRun();
         return this._instance;
     };
-
-    isDebug: boolean = true;
+    /** 模式测试 0:非测试 1:本地测试 2:外网测试 */
+    debugTpye: number = 2;
     project: string = "luojigou_model";
     itemId: string = '';
-    unitCur: number = 3;// 第几集,从1开始
-    pageCur: number = 8;// 第几个游戏,从1开始
-    isCanPlayVideo = false;
+    unitCur: number = 14;// 第几集,从1开始
+    pageCur: number = 4;// 第几个游戏,从1开始
+    isCanPlayVideo: boolean = false;
     attributeMap: any = {};// 内部形式为 { "0" : AttributeUtil }
     urlToken: string = 'https://open.api.luojigou.vip/mall/mobile/common/verify/token';// 验证token的地址;
     urlOver: string = 'https://open.api.luojigou.vip/app/app/gameCourse/record/12321312';// 当前集游戏完结,上报地址;

+ 1 - 1
settings/project.json

@@ -2,7 +2,7 @@
   "migrate-history": [
     "cloud-function"
   ],
-  "last-module-event-record-time": 1675230146636,
+  "last-module-event-record-time": 1675995102307,
   "group-list": [
     "default"
   ],