diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 0f70530..07d9318 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -15147,7 +15147,7 @@ }, { "__type__": "cc.Node", - "_name": "New Label", + "_name": "Uid", "_objFlags": 0, "_parent": { "__id__": 1 @@ -15160,6 +15160,9 @@ }, { "__id__": 332 + }, + { + "__id__": 333 } ], "_prefab": null, @@ -15173,7 +15176,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 66.74, + "width": 0, "height": 23.94 }, "_anchorPoint": { @@ -15185,8 +15188,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 41.784, - 1898.03, + 35.162, + 1907.018, 0, 0, 0, @@ -15225,8 +15228,8 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_string": "749531", - "_N$string": "749531", + "_string": "", + "_N$string": "", "_fontSize": 20, "_lineHeight": 19.96, "_enableWrapText": true, @@ -15254,9 +15257,9 @@ "alignMode": 1, "_target": null, "_alignFlags": 9, - "_left": 8.414000000000001, + "_left": 35.162, "_right": 0, - "_top": 10, + "_top": 1.0119999999999436, "_bottom": 0, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -15269,5 +15272,18 @@ "_originalWidth": 0, "_originalHeight": 0, "_id": "ce7XDOgWxAkqd9NR85oHSL" + }, + { + "__type__": "7ec7cMdjYVACJZomjSeP6wa", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 330 + }, + "_enabled": true, + "uid_Number": { + "__id__": 331 + }, + "_id": "67zCbKKV9PvYlB9x+eob0L" } ] \ No newline at end of file diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index c184e3f..bcf60e6 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -228,6 +228,10 @@ export default class GameManager extends cc.Component { cc.fx.GameConfig.GM_INFO.uid = data.data._id; cc.fx.StorageMessage.setStorage("uid", data.data._id); } + if (data.data.onlyId) { + console.log("_______________Uid:", data.data.onlyId); + cc.fx.GameConfig.GM_INFO.userId = data.data.onlyId; + } if (data.data.outTradeNo.length > 0) { console.log("设置补发数据", data.data.outTradeNo); cc.fx.GameConfig.GM_INFO.allOutTradeNo = []; diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index d4e823d..0f8b310 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -394,19 +394,17 @@ export default class MapConroler extends cc.Component { this.riseFallBlcok.push(block); } } - } - if (gap != null) { - if (gap.length > 0) { - if (!this.mapGap(cc.v2(i, j), gap) || i == 0 || i == this.mapWidth - 1 - || j == 0 || j == this.mapHeight - 1) { - block.opacity = 254; - block.removeComponent(cc.Sprite); - block.removeAllChildren(); - this.wallInfo.push(block); - } - else this.mapInfo.push(block); + + if (gap.length > 0) { + if (!this.mapGap(cc.v2(i, j), gap) || i == 0 || i == this.mapWidth - 1 + || j == 0 || j == this.mapHeight - 1) { + block.opacity = 254; + block.removeComponent(cc.Sprite); + block.removeAllChildren(); + this.wallInfo.push(block); } + else this.mapInfo.push(block); } else { if (i == 0 || i == this.mapWidth - 1 @@ -848,7 +846,6 @@ export default class MapConroler extends cc.Component { setDoorInfo(wall) { let doorInfo = cc.fx.GameConfig.WALL_INFO[0]; - if (doorInfo) { for (let j = 0; j < doorInfo.length; j++) { if (doorInfo[j].num == this.wallNum) { diff --git a/assets/Script/Uid.ts b/assets/Script/Uid.ts new file mode 100644 index 0000000..1a8ebaf --- /dev/null +++ b/assets/Script/Uid.ts @@ -0,0 +1,33 @@ +import NumberToImage from "./NumberToImage"; + + +const { ccclass, property, requireComponent } = cc._decorator; + +@ccclass +export default class Uid extends cc.Component { + static _instance: any; + @property(cc.Label) + uid_Number: cc.Label = null; + + + onLoad() { + // 为节点添加点击事件监听器 + if (Uid._instance == null) { + Uid._instance = this; + cc.game.addPersistRootNode(this.node); + } + else { + return; + } + if (cc.fx.GameConfig.GM_INFO.userId > 0) { + this.uid_Number.string = cc.fx.GameConfig.GM_INFO.userId; + } + } + + start() { + // ... 已有代码 ... + + + } + +} diff --git a/assets/Script/Uid.ts.meta b/assets/Script/Uid.ts.meta new file mode 100644 index 0000000..6f465bc --- /dev/null +++ b/assets/Script/Uid.ts.meta @@ -0,0 +1,10 @@ +{ + "ver": "1.1.0", + "uuid": "7ec7c31d-8d85-4008-9668-9a349e3fac1a", + "importer": "typescript", + "isPlugin": false, + "loadPluginInWeb": true, + "loadPluginInNative": true, + "loadPluginInEditor": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 9cacc4f..6c1e7b0 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -246,7 +246,7 @@ export class GameConfig { vibrateOpen: true, //震动 coinnum: 0, //每局的金币数 paid_user: false, //是否是付费用户 - version: 1.4, //版本号 + version: 1.5, //版本号 shushu_DistinctId: "", //数数访客ID shushu_AccountId: "", //数数账号ID uid: "", //用户和后端唯一id diff --git a/assets/resources/Json/level97_1.json b/assets/resources/Json/level97_1.json new file mode 100644 index 0000000..720823e --- /dev/null +++ b/assets/resources/Json/level97_1.json @@ -0,0 +1,288 @@ +{ + "LEVEL_INFO": [ + { + "id": "97", + "map": [ + 8, + 8 + ], + "time": 275, + "gap": [] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 0, + "color": 2, + "type": 0, + "position": { + "x": -240, + "y": 120, + "z": 0 + }, + "id": 210 + }, + { + "block": 1, + "color": 2, + "type": 0, + "position": { + "x": 360, + "y": 0, + "z": 0 + }, + "id": 220, + "adhesive":1 + }, + { + "block": 1, + "color": 7, + "type": 0, + "position": { + "x": -120, + "y": 0, + "z": 0 + }, + "id": 240 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": 240, + "y": -120, + "z": 0 + }, + "id": 260 + }, + { + "block": 22, + "color": 7, + "type": 0, + "position": { + "x": -120, + "y": 120, + "z": 0 + }, + "id": 230, + "adhesive":1 + }, + { + "block": 21, + "color": 3, + "type": 9, + "position": { + "x": 240, + "y": 120, + "z": 0 + }, + "id": 250, + "adhesive":1 + }, + { + "block": 0, + "color": 1, + "type": 9, + "position": { + "x": 360, + "y": 120, + "z": 0 + }, + "id": 270 + }, + { + "block": 2, + "color": 10, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "id": 280 + }, + { + "block": 2, + "color": 1, + "type": 0, + "position": { + "x": 360, + "y": -360, + "z": 0 + }, + "id": 290 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": 120, + "y": 120, + "z": 0 + }, + "id": 300 + }, + { + "block": 0, + "color": 8, + "type": 0, + "position": { + "x": -120, + "y": -120, + "z": 0 + }, + "id": 310 + }, + { + "block": 0, + "color": 8, + "type": 0, + "position": { + "x": 240, + "y": -240, + "z": 0 + }, + "id": 320 + }, + { + "block": 5, + "color": 6, + "type": 0, + "position": { + "x": 120, + "y": -240, + "z": 0 + }, + "id": 330 + }, + { + "block": 0, + "color": 6, + "type": 0, + "position": { + "x": -120, + "y": -240, + "z": 0 + }, + "id": 340 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 1, + "num": 7, + "color": 1, + "special": 2, + "length": 2, + "lock": false + }, + { + "id": 2, + "num": 7, + "color": 6, + "special": 2, + "length": 2, + "lock": false + }, + { + "id": 3, + "num": 9, + "color": 6, + "special": 2, + "length": 0, + "lock": false + }, + { + "id": 4, + "num": 15, + "color": 8, + "special": 2, + "length": 2, + "lock": false + }, + { + "id": 5, + "num": 17, + "color": 8, + "special": 2, + "length": 0, + "lock": false + }, + { + "id": 6, + "num": 11, + "color": 2, + "special": 0, + "length": 2 + }, + { + "id": 7, + "num": 13, + "color": 2, + "special": 0, + "length": 0 + }, + { + "id": 8, + "num": 21, + "color": 7, + "special": 0, + "length": 2 + }, + { + "id": 9, + "num": 20, + "color": 7, + "special": 0, + "length": 0 + }, + { + "id": 10, + "num": 2, + "color": 3, + "special": 0, + "length": 2 + }, + { + "id": 11, + "num": 3, + "color": 3, + "special": 0, + "length": 0 + }, + { + "id": 12, + "num": 6, + "color": 1, + "special": 0, + "length": 2 + }, + { + "id": 13, + "num": 8, + "color": 1, + "special": 0, + "length": 0 + }, + { + "id": 14, + "num": 14, + "color": 10, + "special": 0, + "length": 2 + }, + { + "id": 15, + "num": 16, + "color": 10, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/resources/level51.json.meta b/assets/resources/Json/level97_1.json.meta similarity index 53% rename from assets/resources/level51.json.meta rename to assets/resources/Json/level97_1.json.meta index 2ff3e00..cec509d 100644 --- a/assets/resources/level51.json.meta +++ b/assets/resources/Json/level97_1.json.meta @@ -1,6 +1,6 @@ { "ver": "1.0.2", - "uuid": "24976052-1e2b-4093-8a2f-ea8a6de66515", + "uuid": "613e8900-5acd-4d64-af09-04e3a3bcd4b1", "importer": "json", "subMetas": {} } \ No newline at end of file diff --git a/assets/resources/level51.json b/assets/resources/level51.json deleted file mode 100644 index e368435..0000000 --- a/assets/resources/level51.json +++ /dev/null @@ -1,573 +0,0 @@ -{ - "LEVEL_INFO": [ - { - "risefall": [], - "id": "51", - "map": [ - 11, - 13 - ], - "time": 250, - "gap": [] - } - ], - "BLOCK_INFO": [ - [ - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": 540, - "z": 0 - }, - "id": 210 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -180, - "y": 300, - "z": 0 - }, - "id": 220 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": 300, - "z": 0 - }, - "id": 230 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": 420, - "z": 0 - }, - "id": 240 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": 540, - "z": 0 - }, - "id": 250 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -180, - "y": -420, - "z": 0 - }, - "id": 260 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": -420, - "z": 0 - }, - "id": 270 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": -540, - "z": 0 - }, - "id": 280 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": -660, - "z": 0 - }, - "id": 290 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 300, - "y": 300, - "z": 0 - }, - "id": 300 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": 300, - "z": 0 - }, - "id": 310 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": 420, - "z": 0 - }, - "id": 320 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 300, - "y": -420, - "z": 0 - }, - "id": 330 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": -420, - "z": 0 - }, - "id": 340 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": -540, - "z": 0 - }, - "id": 350 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": -660, - "z": 0 - }, - "id": 360 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": -60, - "y": -180, - "z": 0 - }, - "id": 370 - }, - { - "block": 23, - "color": 1, - "type": 0, - "position": { - "x": 180, - "y": -180, - "z": 0 - }, - "id": 380 - }, - { - "block": 4, - "color": 1, - "type": 8, - "position": { - "x": 60, - "y": -660, - "z": 0 - }, - "id": 390 - }, - { - "block": 2, - "color": 1, - "type": 0, - "position": { - "x": -420, - "y": 420, - "z": 0 - }, - "id": 400 - }, - { - "block": 1, - "color": 5, - "type": 0, - "position": { - "x": -180, - "y": 540, - "z": 0 - }, - "id": 410 - }, - { - "block": 19, - "color": 5, - "type": 0, - "position": { - "x": -300, - "y": -60, - "z": 0 - }, - "id": 420 - }, - { - "block": 5, - "color": 4, - "type": 1, - "position": { - "x": -300, - "y": 180, - "z": 0 - }, - "stacking": 5, - "id": 430 - }, - { - "block": 5, - "color": 4, - "type": 0, - "position": { - "x": -300, - "y": -420, - "z": 0 - }, - "id": 440 - }, - { - "block": 1, - "color": 6, - "type": 0, - "position": { - "x": -300, - "y": -180, - "z": 0 - }, - "id": 450 - }, - { - "block": 1, - "color": 6, - "type": 0, - "position": { - "x": -180, - "y": -660, - "z": 0 - }, - "id": 460 - }, - { - "block": 0, - "color": 6, - "type": 8, - "position": { - "x": 540, - "y": -660, - "z": 0 - }, - "id": 470 - }, - { - "block": 1, - "color": 2, - "type": 0, - "position": { - "x": 420, - "y": -660, - "z": 0 - }, - "id": 480 - }, - { - "block": 0, - "color": 2, - "type": 8, - "position": { - "x": -420, - "y": -660, - "z": 0 - }, - "id": 490 - }, - { - "block": 5, - "color": 8, - "type": 0, - "position": { - "x": 540, - "y": -420, - "z": 0 - }, - "id": 500 - }, - { - "block": 1, - "color": 3, - "type": 0, - "position": { - "x": 420, - "y": 540, - "z": 0 - }, - "id": 510 - }, - { - "block": 1, - "color": 3, - "type": 0, - "position": { - "x": 540, - "y": -180, - "z": 0 - }, - "id": 520 - }, - { - "block": 5, - "color": 8, - "type": 1, - "position": { - "x": 540, - "y": 180, - "z": 0 - }, - "stacking": 3, - "id": 530 - }, - { - "block": 2, - "color": 10, - "type": 0, - "position": { - "x": 540, - "y": 420, - "z": 0 - }, - "id": 540 - }, - { - "block": 20, - "color": 9, - "type": 0, - "position": { - "x": 540, - "y": -60, - "z": 0 - }, - "id": 550 - }, - { - "block": 4, - "color": 10, - "type": 1, - "position": { - "x": 60, - "y": 300, - "z": 0 - }, - "stacking": 2, - "id": 560 - }, - { - "block": 18, - "color": 7, - "type": 1, - "position": { - "x": 60, - "y": -60, - "z": 0 - }, - "stacking": 9, - "id": 570 - } - ] - ], - "WALL_INFO": [ - [ - { - "id": 52, - "num": 20, - "color": 1, - "special": 0, - "length": 1 - }, - { - "id": 53, - "num": 29, - "color": 5, - "special": 0, - "length": 2 - }, - { - "id": 54, - "num": 30, - "color": 5, - "special": 0, - "length": 0 - }, - { - "id": 55, - "num": 25, - "color": 4, - "special": 0, - "length": 2 - }, - { - "id": 56, - "num": 27, - "color": 4, - "special": 0, - "length": 0 - }, - { - "id": 57, - "num": 26, - "color": 6, - "special": 0, - "length": 2 - }, - { - "id": 58, - "num": 28, - "color": 6, - "special": 0, - "length": 0 - }, - { - "id": 59, - "num": 12, - "color": 2, - "special": 0, - "length": 2 - }, - { - "id": 60, - "num": 14, - "color": 2, - "special": 0, - "length": 0 - }, - { - "id": 61, - "num": 11, - "color": 8, - "special": 0, - "length": 2 - }, - { - "id": 62, - "num": 13, - "color": 8, - "special": 0, - "length": 0 - }, - { - "id": 63, - "num": 0, - "color": 3, - "special": 0, - "length": 2 - }, - { - "id": 64, - "num": 1, - "color": 3, - "special": 0, - "length": 0 - }, - { - "id": 65, - "num": 19, - "color": 10, - "special": 0, - "length": 1 - }, - { - "id": 66, - "num": 4, - "color": 9, - "special": 0, - "length": 3 - }, - { - "id": 67, - "num": 5, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 68, - "num": 6, - "color": 9, - "special": 0, - "length": 0 - }, - { - "id": 69, - "num": 34, - "color": 7, - "special": 0, - "length": 3 - }, - { - "id": 70, - "num": 35, - "color": 7, - "special": 0, - "length": 0 - }, - { - "id": 71, - "num": 36, - "color": 7, - "special": 0, - "length": 0 - } - ] - ] -} \ No newline at end of file diff --git a/settings/project.json b/settings/project.json index f174634..d6fdfd7 100644 --- a/settings/project.json +++ b/settings/project.json @@ -1,5 +1,5 @@ { - "last-module-event-record-time": 1752481846169, + "last-module-event-record-time": 1753090760574, "group-list": [ "default", "Map"