diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts index 2f9d8b3..5e11a03 100644 --- a/assets/Script/Block.ts +++ b/assets/Script/Block.ts @@ -184,6 +184,12 @@ export default class Block extends cc.Component { } //createAd 为是否创建粘合快图片 init(block_Info, posX, posY, node, createAd) { + if (block_Info.floor) { + console.log("floor:", block_Info.floor) + } + if (block_Info.floorTime) { + console.log("floorTime:", block_Info.floorTime) + } this.block_Info = this.jsonDeepClone(block_Info); if (node) this.block_Info.node = node; this.type = block_Info.type; @@ -271,8 +277,10 @@ export default class Block extends cc.Component { } } - } + if (block_Info.floor && block_Info.floorTime) { + } + } //初始化方块类型 diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index 2dbd9f2..1edb36c 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -60,6 +60,7 @@ export default class GameManager extends cc.Component { this.getSetting(); this.readUserData(); this.getShareInfo(); + this.checkDailyQuests(); }, 100); @@ -85,6 +86,10 @@ export default class GameManager extends cc.Component { } } + checkDailyQuests() { + cc.fx.GameTool.getDailyQuestsInfo((data) => { + }) + } start() { setTimeout(() => { diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 8540861..7bd3d06 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -111,6 +111,7 @@ export default class JiaZai extends cc.Component { this.closeAvatar(); this.setShareInfo(); this.checkTasks(); + // this.checkDailyQuests(); //console.log("进入首页获取的share", cc.fx.GameConfig.GM_INFO.otherUid, cc.fx.GameConfig.GM_INFO.otherLevel); @@ -401,6 +402,11 @@ export default class JiaZai extends cc.Component { } } + checkDailyQuests() { + cc.fx.GameTool.getDailyQuestsInfo((data) => { + }) + } + openAvatar() { if (!JiaZai.cachedAvatarPrefab) { console.log('Avatar prefab is not loaded yet.'); @@ -1611,7 +1617,7 @@ export default class JiaZai extends cc.Component { let top = this.node.getChildByName("Load").getChildByName("Top"); top.getChildByName("day").getChildByName("red").active = false; if (cc.fx.GameConfig.GM_INFO.tasks.levelPass.target == 0) { - console.log("没有获取人任务列表从服务器拿"); + console.log("没有获取任务列表从服务器拿"); cc.fx.GameTool.getDailyQuestsInfo((data) => { if (data.code == 1) { let res = data.data.task; diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts index bef8df9..6db3425 100644 --- a/assets/Script/Map.ts +++ b/assets/Script/Map.ts @@ -561,6 +561,9 @@ export default class MapConroler extends cc.Component { position: blockInfo.position, stacking: blockInfo.color }; + if (blockInfo.floor) info["floor"] = blockInfo.floor; + if (blockInfo.floorTime) info["floorTime"] = blockInfo.floorTime; + // 缓存 Block_Array 访问 const blockUpPrefab = this.Block_Array[info.block]; let blockUp = cc.instantiate(blockUpPrefab); @@ -1682,34 +1685,6 @@ export default class MapConroler extends cc.Component { return jg; } - checkLeft(allBlocks) { - let jg = false; - return jg; - } - - checkRight(allBlocks, max) { - let jg = false; - for (let i = 0; i < allBlocks.length; i++) { - - } - return jg; - } - - checkDown(allBlocks) { - let jg = false; - for (let i = 0; i < allBlocks.length; i++) { - - } - return jg; - } - - checkUp(allBlocks, max) { - let jg = false; - for (let i = 0; i < allBlocks.length; i++) { - - } - return jg; - } //特殊处理，方块带道具或者需要消除冰块 @@ -1800,6 +1775,9 @@ export default class MapConroler extends cc.Component { cc.fx.GameTool.shushu_Track("daily_task", data); } } + else { + cc.fx.GameTool.setDailyQuestInfo(); + } if (cc.fx.GameConfig.GM_INFO.level >= 17) { cc.fx.GameTool.setWinStreak("sucess"); cc.fx.GameConfig.GM_INFO.winState = true; diff --git a/assets/custom/Json/level1.json.meta b/assets/custom/Json/level1.json.meta index 25a0752..3628a5a 100644 --- a/assets/custom/Json/level1.json.meta +++ b/assets/custom/Json/level1.json.meta @@ -1,6 +1,6 @@ { "ver": "1.0.2", - "uuid": "aabd80cb-b51f-44d9-b9db-0bd736acd045", + "uuid": "cf23a18b-2a0f-45e2-9906-24be2d5b870f", "importer": "json", "subMetas": {} } \ No newline at end of file diff --git a/assets/custom/test/level1000.json b/assets/custom/test/level1000.json new file mode 100644 index 0000000..a255158 --- /dev/null +++ b/assets/custom/test/level1000.json @@ -0,0 +1,409 @@ +{ + "LEVEL_INFO": [ + { + "risefall": [], + "id": "1", + "map": [ + 8, + 10 + ], + "time": 500, + "gap": [ + { + "x": 1, + "y": 8, + "z": 0 + }, + { + "x": 1, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 7, + "z": 0 + }, + { + "x": 2, + "y": 8, + "z": 0 + }, + { + "x": 6, + "y": 8, + "z": 0 + }, + { + "x": 5, + "y": 8, + "z": 0 + }, + { + "x": 5, + "y": 7, + "z": 0 + }, + { + "x": 6, + "y": 7, + "z": 0 + }, + { + "x": 1, + "y": 1, + "z": 0 + }, + { + "x": 6, + "y": 1, + "z": 0 + } + ] + } + ], + "BLOCK_INFO": [ + [ + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": -240, + "y": -240, + "z": 0 + }, + "id": 210 + }, + { + "block": 23, + "color": 1, + "type": 0, + "position": { + "x": 360, + "y": -240, + "z": 0 + }, + "id": 220 + }, + { + "block": 2, + "color": 6, + "type": 8, + "position": { + "x": 0, + "y": 240, + "z": 0 + }, + "id": 230 + }, + { + "block": 2, + "color": 8, + "type": 8, + "position": { + "x": 120, + "y": 240, + "z": 0 + }, + "id": 240 + }, + { + "block": 1, + "color": 8, + "type": 0, + "position": { + "x": -120, + "y": 120, + "z": 0 + }, + "id": 250 + }, + { + "block": 1, + "color": 6, + "type": 0, + "position": { + "x": 360, + "y": 120, + "z": 0 + }, + "id": 260 + }, + { + "block": 22, + "color": 5, + "type": 0, + "position": { + "x": 120, + "y": 0, + "z": 0 + }, + "id": 270 + }, + { + "block": 0, + "color": 1, + "type": 0, + "position": { + "x": -240, + "y": 0, + "z": 0 + }, + "id": 280 + }, + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": 360, + "y": 0, + "z": 0 + }, + "id": 290 + }, + { + "block": 1, + "color": 7, + "type": 0, + "position": { + "x": 360, + "y": -120, + "z": 0 + }, + "id": 300 + }, + { + "block": 0, + "color": 7, + "type": 0, + "position": { + "x": 0, + "y": -240, + "z": 0 + }, + "id": 310 + }, + { + "block": 0, + "color": 1, + "type": 0, + "position": { + "x": 360, + "y": -360, + "z": 0 + }, + "id": 320 + }, + { + "block": 0, + "color": 10, + "type": 0, + "position": { + "x": 120, + "y": -240, + "z": 0 + }, + "id": 330 + }, + { + "block": 0, + "color": 3, + "type": 0, + "position": { + "x": -240, + "y": -360, + "z": 0 + }, + "id": 340 + }, + { + "block": 5, + "color": 2, + "type": 0, + "position": { + "x": 120, + "y": -480, + "z": 0 + }, + "id": 350 + }, + { + "block": 0, + "color": 5, + "type": 9, + "position": { + "x": -120, + "y": -360, + "z": 0 + }, + "adhesiveTime": 2, + "id": 360 + }, + { + "block": 0, + "color": 3, + "type": 9, + "position": { + "x": -120, + "y": -480, + "z": 0 + }, + "adhesiveTime": 1, + "id": 370 + }, + { + "block": 0, + "color": 3, + "type": 9, + "position": { + "x": 240, + "y": -360, + "z": 0 + }, + "adhesiveTime": 2, + "id": 380 + }, + { + "block": 0, + "color": 10, + "type": 9, + "position": { + "x": 240, + "y": -480, + "z": 0 + }, + "adhesiveTime": 1, + "id": 390 + }, + { + "block": 1, + "color": 10, + "type": 0, + "position": { + "x": -120, + "y": -120, + "z": 0 + }, + "floor": 1, + "floorTime": 11, + "id": 400 + }, + { + "block": 0, + "color": 5, + "type": 0, + "position": { + "x": 0, + "y": -120, + "z": 0 + }, + "floor": 1, + "floorTime": 11, + "id": 410 + }, + { + "block": 0, + "color": 8, + "type": 0, + "position": { + "x": -120, + "y": -240, + "z": 0 + }, + "floor": 1, + "floorTime": 11, + "id": 420 + } + ] + ], + "WALL_INFO": [ + [ + { + "id": 2, + "num": 2, + "color": 7, + "special": 0, + "length": 1 + }, + { + "id": 3, + "num": 3, + "color": 2, + "special": 4, + "length": 2 + }, + { + "id": 4, + "num": 4, + "color": 2, + "special": 4, + "length": 0 + }, + { + "id": 5, + "num": 13, + "color": 1, + "special": 0, + "length": 1 + }, + { + "id": 6, + "num": 15, + "color": 3, + "special": 0, + "length": 1 + }, + { + "id": 7, + "num": 26, + "color": 5, + "special": 0, + "length": 2 + }, + { + "id": 8, + "num": 27, + "color": 5, + "special": 0, + "length": 0 + }, + { + "id": 9, + "num": 25, + "color": 10, + "special": 0, + "length": 1 + }, + { + "id": 10, + "num": 14, + "color": 8, + "special": 4, + "length": 2 + }, + { + "id": 11, + "num": 16, + "color": 8, + "special": 4, + "length": 0 + }, + { + "id": 12, + "num": 8, + "color": 6, + "special": 0, + "length": 2 + }, + { + "id": 13, + "num": 12, + "color": 6, + "special": 0, + "length": 0 + } + ] + ] +} \ No newline at end of file diff --git a/assets/custom/test/level1000.json.meta b/assets/custom/test/level1000.json.meta new file mode 100644 index 0000000..a254cff --- /dev/null +++ b/assets/custom/test/level1000.json.meta @@ -0,0 +1,6 @@ +{ + "ver": "1.0.2", + "uuid": "c60f12a7-bbdb-4555-a51d-98ab7cf9b598", + "importer": "json", + "subMetas": {} +} \ No newline at end of file diff --git a/assets/prefab/prop/floor.prefab b/assets/prefab/prop/floor.prefab new file mode 100644 index 0000000..fcfeee2 --- /dev/null +++ b/assets/prefab/prop/floor.prefab @@ -0,0 +1,437 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "", + "_objFlags": 0, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "asyncLoadAssets": false, + "readonly": false + }, + { + "__type__": "cc.Node", + "_name": "floor", + "_objFlags": 0, + "_parent": null, + "_children": [ + { + "__id__": 2 + }, + { + "__id__": 5 + }, + { + "__id__": 7 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 12 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "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.Node", + "_name": "icon", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + } + ], + "_prefab": { + "__id__": 4 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "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__": 2 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_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": "48vFumJApBjb/xUEZIhVH6", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "time", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 6 + }, + "_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, + 8, + 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": "afr7mnXGdMXZMpTDxTmfms", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "bingkuai", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 8 + } + ], + "_prefab": { + "__id__": 9 + }, + "_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__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 7 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": false, + "premultipliedAlpha": false, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "b98ab73e-af9c-47fa-862c-144da3071249" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b8wpbx8wBCiIPB7kPP1L7Z", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "ad8cbbzCohCR5uifssdRTf+", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "freeze": { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + }, + "ice": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "", + "sync": false + } +] \ No newline at end of file diff --git a/assets/prefab/prop/floor.prefab.meta b/assets/prefab/prop/floor.prefab.meta new file mode 100644 index 0000000..4f9adb0 --- /dev/null +++ b/assets/prefab/prop/floor.prefab.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.3.2", + "uuid": "03145c50-d467-4d06-a2fc-83f38137cb92", + "importer": "prefab", + "optimizationPolicy": "AUTO", + "asyncLoadAssets": false, + "readonly": false, + "subMetas": {} +} \ No newline at end of file diff --git a/assets/prefab/prop/freeze.prefab b/assets/prefab/prop/freeze.prefab index 94b91a1..3b45127 100644 --- a/assets/prefab/prop/freeze.prefab +++ b/assets/prefab/prop/freeze.prefab @@ -420,6 +420,7 @@ "freeze": { "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" }, + "ice": null, "_id": "" }, {