最新更新

This commit is contained in:
COMPUTER\EDY 2026-03-16 10:03:43 +08:00
parent a2ab8eddb3
commit 796be75738
33 changed files with 8292 additions and 5020 deletions

File diff suppressed because it is too large Load Diff

View File

@ -440,7 +440,6 @@ export default class Block extends cc.Component {
freeze.getChildByName("time").setPosition(posConfig.pos5.x - 10 - freezeX, posConfig.pos5.y - 2 - freezeY);
break;
case BlockType.:
debugger;
let horizontal = cc.instantiate(MapConroler._instance.Block_Prop[this.type]);
horizontal.parent = this.node;
let heng = "heng" + this.heng;
@ -997,7 +996,7 @@ export default class Block extends cc.Component {
if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0 ||
MapConroler._instance.blockLock == true
|| MapConroler._instance.change_colorBlock == true)
|| MapConroler._instance.change_colorBlock == true || MapConroler._instance.jump_state != null)
&& !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
let gameover = MapConroler._instance.predict_End(true);
if (gameover == false) {
@ -1398,7 +1397,7 @@ export default class Block extends cc.Component {
if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0 ||
MapConroler._instance.blockLock == true
|| MapConroler._instance.change_colorBlock == true)
|| MapConroler._instance.change_colorBlock == true || MapConroler._instance.jump_state != null)
&& !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
let gameover = MapConroler._instance.predict_End(true);
if (gameover == false) {
@ -1576,7 +1575,7 @@ export default class Block extends cc.Component {
if (MapConroler._instance.blockNum != 0 && (MapConroler._instance.openWall.length > 0 ||
MapConroler._instance.revolving_state != 0 || MapConroler._instance.longAndShortWall.length > 0 ||
MapConroler._instance.blockLock == true
|| MapConroler._instance.change_colorBlock == true)
|| MapConroler._instance.change_colorBlock == true || MapConroler._instance.jump_state != null)
&& !MapConroler._instance.gameOver && !MapConroler._instance.gameWin) {
let gameover = MapConroler._instance.predict_End(true);
if (gameover == false) {

View File

@ -2010,9 +2010,9 @@ export default class MapConroler extends cc.Component {
i += 1;
}
}
// if (i == wallArray.length - 1) {
// this.changeLength(wallArray);
// }
if (i == wallArray.length - 1) {
this.changeLength(wallArray);
}
}
}
@ -3194,7 +3194,7 @@ export default class MapConroler extends cc.Component {
setTimeout(() => {
console.log("_____________复活失败后使用魔法棒重新复活");
this.runRewive(data);
}, 1500);
}, 1000);
return;
}
@ -3353,6 +3353,7 @@ export default class MapConroler extends cc.Component {
this.node.active = false;
}
}
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3382,6 +3383,7 @@ export default class MapConroler extends cc.Component {
}
cc.fx.GameTool.setWinStreak("fail");
}
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3527,6 +3529,7 @@ export default class MapConroler extends cc.Component {
if (type) {
if (type == "time") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = true;
@ -3541,6 +3544,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.review == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "boom") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3555,6 +3559,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewBoom == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "lock") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3569,6 +3574,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "rotate") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3583,6 +3589,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "longAndShort") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
@ -3597,6 +3604,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "longAndShortColor") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false;
@ -3611,6 +3619,7 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "blockLock") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false;
@ -3624,6 +3633,21 @@ export default class MapConroler extends cc.Component {
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 1) buyBtn.getChildByName("coin2").active = true;
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
else if (type == "wall") {
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").active = true;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Time").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Boom").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Lock").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Revolving").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShort").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("LongAndShortColor").active = false;
this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("BlockLock").active = false;
let buyBtn = this.node.parent.parent.getChildByName("Lose").getChildByName("lose").getChildByName("Wall").getChildByName("buyBtn");
buyBtn.getChildByName("coin1").active = buyBtn.getChildByName("coin2").active = buyBtn.getChildByName("coin3").active = false;
if (cc.fx.GameConfig.GM_INFO.reviewDoor == 0) buyBtn.getChildByName("coin1").active = true;
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 1) buyBtn.getChildByName("coin2").active = true;
else if (cc.fx.GameConfig.GM_INFO.reviewDoor == 2) buyBtn.getChildByName("coin3").active = true;
}
}
}, time);
@ -5103,6 +5127,9 @@ export default class MapConroler extends cc.Component {
this.failLevel("longAndShortColor");
console.log("有长短门,是变色的");
}
else if (this.jump_state != null) {
this.failLevel("wall");
}
else {
this.failLevel("rotate");
}

View File

@ -606,7 +606,7 @@ export default class Wall extends cc.Component {
//跳跃门初始化
jumpInit() {
this.jump = true;
// this.length = 0;
this.length = 0;
this.jumpNode = this.node.parent.getChildByName("jump");
this.jumpNode.active = true;
cc.tween(this.jumpNode)
@ -698,7 +698,7 @@ export default class Wall extends cc.Component {
//变色门变色总方法
changeColorWall() {
console.log("通过此门,调用次门数组", this.colorArray);
// console.log("通过此门,调用次门数组", this.colorArray);
// console.log("改變顏色:", this.wall_Info.length);
for (let i = 0; i < this.teamDoors.length; i++) {
setTimeout(() => {

View File

@ -441,8 +441,8 @@ var GameTool = {
//关卡上限
maxLevel() {
let jg = false;
if (cc.fx.GameConfig.GM_INFO.level > 1279) {
cc.fx.GameConfig.GM_INFO.level = 1280;
if (cc.fx.GameConfig.GM_INFO.level > 1319) {
cc.fx.GameConfig.GM_INFO.level = 1320;
jg = true;
}
return jg;

BIN
assets/UI/UI/pop/wall.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "e0643b11-7ef6-4b75-a579-0c4f31477ca2",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 412,
"height": 111,
"platformSettings": {},
"subMetas": {
"wall": {
"ver": "1.0.6",
"uuid": "472735bf-b6f1-44d7-9b62-dbc2ac09c892",
"importer": "sprite-frame",
"rawTextureUuid": "e0643b11-7ef6-4b75-a579-0c4f31477ca2",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 412,
"height": 111,
"rawWidth": 412,
"rawHeight": 111,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "1e1894cd-1640-485d-b0a7-e556f1c917d2",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 807,
"height": 213,
"platformSettings": {},
"subMetas": {
"wallIcon": {
"ver": "1.0.6",
"uuid": "ec644367-35c1-4766-8b56-8c0fbe10c469",
"importer": "sprite-frame",
"rawTextureUuid": "1e1894cd-1640-485d-b0a7-e556f1c917d2",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 807,
"height": 213,
"rawWidth": 807,
"rawHeight": 213,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.5 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "8b969a46-41d8-4321-9067-271de35884e2",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 312,
"height": 66,
"platformSettings": {},
"subMetas": {
"wall_Title": {
"ver": "1.0.6",
"uuid": "7f2d7b8d-e22c-4e5b-a150-075efc127bbb",
"importer": "sprite-frame",
"rawTextureUuid": "8b969a46-41d8-4321-9067-271de35884e2",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 312,
"height": 66,
"rawWidth": 312,
"rawHeight": 66,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.6 KiB

View File

@ -0,0 +1,38 @@
{
"ver": "2.3.7",
"uuid": "a4374967-2cbb-444e-9dd7-3f4c043ccb60",
"importer": "texture",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 254,
"height": 67,
"platformSettings": {},
"subMetas": {
"wall_btn": {
"ver": "1.0.6",
"uuid": "35598947-2d1e-4ca7-b602-f22b9f62f4ed",
"importer": "sprite-frame",
"rawTextureUuid": "a4374967-2cbb-444e-9dd7-3f4c043ccb60",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 254,
"height": 67,
"rawWidth": 254,
"rawHeight": 67,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "dd84f262-7234-469f-955d-960e9c41e776",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "3459c8db-c765-43f6-b4ad-bb782e66a3b7",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "a4795ecc-e63b-489b-982c-2c0a5acd9999",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "c2832151-e49c-4569-9a2d-790b45b6ac9d",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "d8f72709-551b-441e-b5f9-aa52e70f987f",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "d139efa0-be95-4b4e-a767-dafee60081dc",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "f146a50e-157f-49cd-8c14-b8fa5a3aa667",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "6d199e6b-624e-43f5-8914-849440cdd024",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "f6a79a97-7525-42e1-8b8a-25983cae4f00",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "802ba007-a7e7-46c8-9592-18ae3f150049",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "4ec51eda-5c5c-40c1-bd85-435b0eca5bb1",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "7f2c0fee-a34f-4727-ad40-506813abf215",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "f793231a-b593-4b97-8c6a-bf836f1e87bf",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "2d456d84-a2df-4ed3-ab3d-63acdd30732b",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "f982a508-ff7a-4947-ac4a-c51b2a46207e",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "d6660d99-7433-452f-8da2-2b0641951feb",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "b529bdbe-d982-4627-a522-0397e0151d6b",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "082f6517-86c7-42e1-b9b0-b873845859e1",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "e82ae57a-454d-4b38-9c81-793e4a8baf71",
"importer": "json",
"subMetas": {}
}

View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "0e2b5eab-4c32-489d-924c-acb6f5c623e7",
"importer": "json",
"subMetas": {}
}