diff --git a/assets/FirstScene/loadBg.jpg b/assets/FirstScene/loadBg.jpg
index f57e8cd..8f2a5f7 100644
Binary files a/assets/FirstScene/loadBg.jpg and b/assets/FirstScene/loadBg.jpg differ
diff --git a/assets/Script/Block.ts b/assets/Script/Block.ts
index 6684de8..38cd804 100644
--- a/assets/Script/Block.ts
+++ b/assets/Script/Block.ts
@@ -230,21 +230,21 @@ export default class Block extends cc.Component {
// this.changeColor = 0;
this.blockId = block_Info.id;
//自身变色块，是个数组，可以有多组颜色循环变化
- // if (this.type == BlockType.变色块) {
- // if (this.block_Info.colorArray) {
- // change_Color = true;
- // this.block_Info.colorArray = this.block_Info.colorArray.toString();
- // this.colorArray = this.block_Info.colorArray.split('').map(char => parseInt(char) + 1);
- // }
- // }
-
- //叠加变色块，只有两个颜色
- if (this.type == BlockType.叠加块上) {
- if (this.block_Info.colorChange != undefined && this.block_Info.colorChange != null) {
+ if (this.type == BlockType.变色块) {
+ if (this.block_Info.colorArray) {
change_Color = true;
+ this.block_Info.colorArray = this.block_Info.colorArray.toString();
+ this.colorArray = this.block_Info.colorArray.split('').map(char => parseInt(char) + 1);
}
}
+ //叠加变色块，只有两个颜色
+ // if (this.type == BlockType.叠加块上) {
+ // if (this.block_Info.colorChange != undefined && this.block_Info.colorChange != null) {
+ // change_Color = true;
+ // }
+ // }
+
this.initColor(false);
this.initType();
this.initBlocks();
@@ -302,10 +302,7 @@ export default class Block extends cc.Component {
}
}
}
- //地板方块
- if (block_Info.floor && block_Info.floorTime) {
- this.setFloor();
- }
+
//发射花瓣方块
if (block_Info.flowerSend) {
@@ -315,10 +312,18 @@ export default class Block extends cc.Component {
if (block_Info.flowerReceive) {
MapConroler._instance.flowerBlock.push(this);
this.flowerType = 2;
+ this.node.parent.getChildByName("Adhesive").opacity = 0;
}
if (this.flowerType != 0) {
this.createFlower();
}
+
+ //地板方块
+ if (block_Info.floor && block_Info.floorTime) {
+ this.setFloor();
+ }
+
+
}
//创建粘合方块
@@ -541,7 +546,9 @@ export default class Block extends cc.Component {
else if (this.type == BlockType.问号块) {
return;
}
-
+ if (this.block_Info.colorChange != undefined && this.block_Info.colorChange != null) {
+ this.node.getChildByName("change_color").active = true;
+ }
if (this.type == BlockType.叠加块上) {
if (this.block_Info.colorChange != undefined && this.block_Info.colorChange != null) {
@@ -576,28 +583,30 @@ export default class Block extends cc.Component {
}
//变色块部分备份
- // if (this.type == BlockType.变色块) {
- // this.node.getChildByName("change_color").active = true;
- // this.color = this.colorArray[0];
- // name = this.color + "color" + this.block_Info.block;
- // number = Math.floor((this.color - 1) / 2);
- // //特殊方块，可移动不可消除类型
- // if (this.color == 11) {
- // name = "0color" + this.block_Info.block;
- // number = 5;
- // }
- // console.log("本身颜色", name);
- // let change_color = this.colorArray[0];
- // if (this.colorArray.length > 1)
- // change_color = this.colorArray[1];
- // let number2 = Math.floor((change_color - 1) / 2);
- // let name2 = change_color + "color" + this.block_Info.block;
- // this.node.getChildByName("change_color").active = true;
- // let nextSpriteFrame = MapConroler._instance.Block_Color[number2]._spriteFrames;
- // var spriteFrame2 = nextSpriteFrame[name2];
- // console.log("下一个颜色", name2);
- // this.node.getChildByName("change_color").getComponent(cc.Sprite).spriteFrame = spriteFrame2;
- // }
+ if (this.type == BlockType.变色块) {
+ this.node.getChildByName("change_color").active = true;
+ this.color = this.colorArray[0];
+ name = this.color + "color" + this.block_Info.block;
+ number = Math.floor((this.color - 1) / 2);
+ //特殊方块，可移动不可消除类型
+ if (this.color == 11) {
+ name = "0color" + this.block_Info.block;
+ number = 5;
+ }
+ console.log("本身颜色", name);
+ let change_color = this.colorArray[0];
+ if (this.colorArray.length > 1)
+ change_color = this.colorArray[1];
+ let number2 = Math.floor((change_color - 1) / 2);
+ let name2 = change_color + "color" + this.block_Info.block;
+ this.node.getChildByName("change_color").scaleX = 0.3;
+ this.node.getChildByName("change_color").scaleY = 0.3;
+
+ let nextSpriteFrame = MapConroler._instance.Block_Color[number2]._spriteFrames;
+ var spriteFrame2 = nextSpriteFrame[name2];
+ console.log("下一个颜色", name2);
+ this.node.getChildByName("change_color").getComponent(cc.Sprite).spriteFrame = spriteFrame2;
+ }
@@ -619,6 +628,7 @@ export default class Block extends cc.Component {
const firstItem = this.colorArray.shift();
// 将第一项添加到数组末尾
this.colorArray.push(firstItem);
+ this.initColor(true);
}
}
else {
@@ -987,7 +997,6 @@ export default class Block extends cc.Component {
return;
}
if (this.block_Info.floor) {
-
if (this.block_Info.floorMove == undefined) {
return;
}
@@ -1095,12 +1104,12 @@ export default class Block extends cc.Component {
if (this.teamBlocks[i].uuid != this.node.uuid) {
this.teamBlocks[i].zIndex = 200;
for (let j = 1; j < this.teamBlocks[i].children.length; j++) {
- if (this.teamBlocks[i].children[j].name != "moveFloor") {
+ if (this.teamBlocks[i].children[j].name != "moveFloor" && this.teamBlocks[i].children[j].name != "flowerReceive"
+ && this.teamBlocks[i].children[j].name != "flowerSend" && this.teamBlocks[i].children[j].name != "flowerFloor") {
if (this.teamBlocks[i].children[j]) {
this.teamBlocks[i].children[j].active = false;
}
}
-
}
}
}
@@ -1344,7 +1353,6 @@ export default class Block extends cc.Component {
MapConroler._instance.nextLevel(0);
let colorTemp = this.color;
if (this.node) {
- debugger;
this.moveFlower();
this.over = true;
this.node.active = false;
@@ -2365,6 +2373,9 @@ export default class Block extends cc.Component {
let floorX = - 65 + 120 * this.allBlocks[i].x; let floorY = 60 + 120 * this.allBlocks[i].y;
floor.setPosition(floorX, floorY);
floor.getComponent("Floor").init(this.block_Info.floorTime, this.posX + this.allBlocks[i].x, this.posY + this.allBlocks[i].y);
+ if (this.flowerType == 2) {
+ floor.opacity = 0;
+ }
}
if (this.type == BlockType.冻结块) {
if (this.node.getChildByName("freeze")) {
@@ -2728,6 +2739,7 @@ export default class Block extends cc.Component {
let flowerName = flowerReceiveArray[i] + "color" + i
petal.getComponent(cc.Sprite).spriteFrame = (this.flower_SpriteFrame._spriteFrames[flowerName]);
}
+
}
//花瓣转移
moveFlower() {
@@ -2739,6 +2751,10 @@ export default class Block extends cc.Component {
removeFlower() {
this.flowerType = 0;
+ this.resetFloor();
+ if (this.type == BlockType.粘合块) {
+ this.node.parent.getChildByName("Adhesive").opacity = 255;
+ }
if (this.block_Info.flowerSend != undefined) {
this.flowerType = 1;
}
diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts
index 4fb161d..40d5585 100644
--- a/assets/Script/JiaZai.ts
+++ b/assets/Script/JiaZai.ts
@@ -1114,7 +1114,7 @@ export default class JiaZai extends cc.Component {
cc.fx.GameConfig.LEVEL_INFO_init(true, 1000, true);
return;
}
- this.node.getChildByName("Career").active = false;
+ // this.node.getChildByName("Career").active = false;
if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
// if (version != "开发版" && version != "体验版") {
diff --git a/assets/Script/Map.ts b/assets/Script/Map.ts
index 5a3f530..4c69fa4 100644
--- a/assets/Script/Map.ts
+++ b/assets/Script/Map.ts
@@ -1885,6 +1885,10 @@ export default class MapConroler extends cc.Component {
if (child.getComponent("Block").block_Info.node != node && child.getComponent("Block").block_Info.colorChange != undefined && child.getComponent("Block").block_Info.colorChange != null)
return child
}
+ else if (child.getComponent("Block").type == 20 && child.getComponent("Block").block_Info && child != node) {
+ if (child.getComponent("Block").block_Info.node != node)
+ return child
+ }
}
});
if (colorBlock.length > 0) {
@@ -4490,6 +4494,7 @@ export default class MapConroler extends cc.Component {
//按下暂停按钮
usePause() {
+ debugger;
if (this.pause) {
if (this.iceTrue() == false) {
this.pause = false;
diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts
index 8b53c70..b3b7556 100644
--- a/assets/Script/module/Tool/GameTool.ts
+++ b/assets/Script/module/Tool/GameTool.ts
@@ -450,8 +450,8 @@ var GameTool = {
//关卡上限
maxLevel() {
let jg = false;
- if (cc.fx.GameConfig.GM_INFO.level > 1239) {
- cc.fx.GameConfig.GM_INFO.level = 1240;
+ if (cc.fx.GameConfig.GM_INFO.level > 1299) {
+ cc.fx.GameConfig.GM_INFO.level = 1300;
jg = true;
}
return jg;
diff --git a/assets/custom/Json/level1245.json b/assets/custom/Json/level1245.json
new file mode 100644
index 0000000..dbb3d3a
--- /dev/null
+++ b/assets/custom/Json/level1245.json
@@ -0,0 +1,165 @@
+{
+ "LEVEL_INFO": [
+ {
+ "risefall": [],
+ "id": "1250",
+ "map": [
+ 8,
+ 10
+ ],
+ "time": 300,
+ "gap": []
+ }
+ ],
+ "BLOCK_INFO": [
+ [
+ {
+ "block": 5,
+ "color": 1,
+ "type": 20,
+ "position": {
+ "x": -120,
+ "y": -360,
+ "z": 0
+ },
+ "colorArray": "0123456789",
+ "id": 210
+ },
+ {
+ "block": 1,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": 360,
+ "z": 0
+ },
+ "id": 220
+ },
+ {
+ "block": 2,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 360,
+ "y": -240,
+ "z": 0
+ },
+ "id": 230
+ },
+ {
+ "block": 8,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": 0,
+ "z": 0
+ },
+ "id": 240
+ },
+ {
+ "block": 4,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 360,
+ "y": 120,
+ "z": 0
+ },
+ "id": 250
+ },
+ {
+ "block": 0,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 360,
+ "y": -480,
+ "z": 0
+ },
+ "id": 260
+ },
+ {
+ "block": 21,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 240,
+ "y": -480,
+ "z": 0
+ },
+ "id": 270
+ },
+ {
+ "block": 22,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": -240,
+ "z": 0
+ },
+ "id": 280
+ },
+ {
+ "block": 19,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": -480,
+ "z": 0
+ },
+ "id": 290
+ },
+ {
+ "block": 2,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 240,
+ "y": 0,
+ "z": 0
+ },
+ "id": 300
+ },
+ {
+ "block": 11,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": 120,
+ "z": 0
+ },
+ "id": 310
+ }
+ ]
+ ],
+ "WALL_INFO": [
+ [
+ {
+ "id": 1251,
+ "num": 13,
+ "color": 1,
+ "special": 0,
+ "length": 3
+ },
+ {
+ "id": 1252,
+ "num": 15,
+ "color": 1,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1253,
+ "num": 17,
+ "color": 1,
+ "special": 0,
+ "length": 0
+ }
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/assets/custom/Json/level1245.json.meta b/assets/custom/Json/level1245.json.meta
new file mode 100644
index 0000000..68f60fb
--- /dev/null
+++ b/assets/custom/Json/level1245.json.meta
@@ -0,0 +1,6 @@
+{
+ "ver": "1.0.2",
+ "uuid": "2d036b58-0207-4ce3-8d21-b2e19b01d5af",
+ "importer": "json",
+ "subMetas": {}
+}
\ No newline at end of file
diff --git a/assets/custom/Json/level1258.json b/assets/custom/Json/level1258.json
new file mode 100644
index 0000000..0069fce
--- /dev/null
+++ b/assets/custom/Json/level1258.json
@@ -0,0 +1,413 @@
+{
+ "LEVEL_INFO": [
+ {
+ "risefall": [],
+ "id": "1258",
+ "map": [
+ 8,
+ 10
+ ],
+ "time": 110,
+ "gap": [
+ {
+ "x": 5,
+ "y": 1,
+ "z": 0
+ },
+ {
+ "x": 6,
+ "y": 1,
+ "z": 0
+ }
+ ]
+ }
+ ],
+ "BLOCK_INFO": [
+ [
+ {
+ "block": 23,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": -120,
+ "z": 0
+ },
+ "id": 210
+ },
+ {
+ "block": 23,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": -120,
+ "z": 0
+ },
+ "id": 220
+ },
+ {
+ "block": 23,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": -240,
+ "y": -120,
+ "z": 0
+ },
+ "id": 230
+ },
+ {
+ "block": 2,
+ "color": 2,
+ "type": 0,
+ "position": {
+ "x": -240,
+ "y": 0,
+ "z": 0
+ },
+ "id": 240
+ },
+ {
+ "block": 1,
+ "color": 5,
+ "type": 0,
+ "position": {
+ "x": 120,
+ "y": -480,
+ "z": 0
+ },
+ "id": 250
+ },
+ {
+ "block": 0,
+ "color": 10,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": -360,
+ "z": 0
+ },
+ "id": 260
+ },
+ {
+ "block": 0,
+ "color": 11,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": -480,
+ "z": 0
+ },
+ "id": 270
+ },
+ {
+ "block": 2,
+ "color": 7,
+ "type": 0,
+ "position": {
+ "x": 120,
+ "y": 0,
+ "z": 0
+ },
+ "id": 280
+ },
+ {
+ "block": 2,
+ "color": 2,
+ "type": 0,
+ "position": {
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "lock": false,
+ "id": 290
+ },
+ {
+ "block": 20,
+ "color": 3,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": 240,
+ "z": 0
+ },
+ "flowerSend": 455,
+ "id": 300
+ },
+ {
+ "block": 1,
+ "color": 3,
+ "type": 0,
+ "position": {
+ "x": 360,
+ "y": 240,
+ "z": 0
+ },
+ "flowerSend": 22,
+ "id": 310
+ },
+ {
+ "block": 1,
+ "color": 6,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": -240,
+ "z": 0
+ },
+ "flowerSend": 22,
+ "id": 320
+ },
+ {
+ "block": 2,
+ "color": 1,
+ "type": 9,
+ "position": {
+ "x": 240,
+ "y": 0,
+ "z": 0
+ },
+ "adhesiveTime": 2,
+ "flowerSend": 44,
+ "flowerColor": 2,
+ "flowerReceive": 2,
+ "floor": 3,
+ "floorTime": 1000,
+ "floorMove": true,
+ "id": 330
+ },
+ {
+ "block": 2,
+ "color": 9,
+ "type": 9,
+ "position": {
+ "x": 360,
+ "y": 0,
+ "z": 0
+ },
+ "adhesiveTime": 1,
+ "flowerSend": 4455,
+ "flowerColor": 2,
+ "flowerReceive": 2,
+ "floor": 3,
+ "floorTime": 1000,
+ "floorMove": true,
+ "id": 340
+ },
+ {
+ "block": 1,
+ "color": 6,
+ "type": 16,
+ "position": {
+ "x": 360,
+ "y": -120,
+ "z": 0
+ },
+ "floor": 3,
+ "floorTime": 1000,
+ "floorMove": true,
+ "questionTime": 7,
+ "flowerColor": 2,
+ "flowerReceive": 2,
+ "id": 350
+ },
+ {
+ "block": 1,
+ "color": 9,
+ "type": 0,
+ "position": {
+ "x": 120,
+ "y": 240,
+ "z": 0
+ },
+ "flowerColor": 4,
+ "flowerReceive": 4,
+ "id": 360
+ },
+ {
+ "block": 2,
+ "color": 7,
+ "type": 0,
+ "position": {
+ "x": -240,
+ "y": -480,
+ "z": 0
+ },
+ "floor": 2,
+ "floorTime": 1000,
+ "floorMove": true,
+ "flowerColor": 5,
+ "flowerReceive": 55,
+ "id": 370
+ },
+ {
+ "block": 0,
+ "color": 5,
+ "type": 0,
+ "position": {
+ "x": -120,
+ "y": -360,
+ "z": 0
+ },
+ "floor": 2,
+ "floorTime": 1000,
+ "floorMove": true,
+ "flowerColor": 5,
+ "flowerReceive": 55,
+ "id": 380
+ },
+ {
+ "block": 0,
+ "color": 5,
+ "type": 4,
+ "position": {
+ "x": 120,
+ "y": 360,
+ "z": 0
+ },
+ "freezeTime": 10,
+ "id": 390
+ },
+ {
+ "block": 2,
+ "color": 1,
+ "type": 0,
+ "position": {
+ "x": 120,
+ "y": -240,
+ "z": 0
+ },
+ "floor": 1,
+ "floorTime": 7,
+ "floorMove": true,
+ "flowerSend": 2,
+ "id": 400
+ },
+ {
+ "block": 9,
+ "color": 9,
+ "type": 16,
+ "position": {
+ "x": 360,
+ "y": -360,
+ "z": 0
+ },
+ "questionTime": 7,
+ "id": 410
+ }
+ ]
+ ],
+ "WALL_INFO": [
+ [
+ {
+ "id": 1259,
+ "num": 1,
+ "color": 3,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1260,
+ "num": 2,
+ "color": 3,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1261,
+ "num": 4,
+ "color": 9,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1262,
+ "num": 5,
+ "color": 9,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1263,
+ "num": 7,
+ "color": 10,
+ "special": 0,
+ "length": 1
+ },
+ {
+ "id": 1264,
+ "num": 11,
+ "color": 5,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1265,
+ "num": 13,
+ "color": 5,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1266,
+ "num": 18,
+ "color": 6,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1267,
+ "num": 20,
+ "color": 6,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1268,
+ "num": 26,
+ "color": 7,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1269,
+ "num": 27,
+ "color": 7,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1270,
+ "num": 8,
+ "color": 1,
+ "special": 0,
+ "length": 2
+ },
+ {
+ "id": 1271,
+ "num": 10,
+ "color": 1,
+ "special": 0,
+ "length": 0
+ },
+ {
+ "id": 1272,
+ "num": 21,
+ "color": 2,
+ "special": 3,
+ "length": 2,
+ "freeze": 5
+ },
+ {
+ "id": 1273,
+ "num": 22,
+ "color": 2,
+ "special": 3,
+ "length": 0,
+ "freeze": 5
+ }
+ ]
+ ]
+}
\ No newline at end of file
diff --git a/assets/custom/Json/level1258.json.meta b/assets/custom/Json/level1258.json.meta
new file mode 100644
index 0000000..4b1eb36
--- /dev/null
+++ b/assets/custom/Json/level1258.json.meta
@@ -0,0 +1,6 @@
+{
+ "ver": "1.0.2",
+ "uuid": "5f909272-bb19-4986-a336-a96704ec230e",
+ "importer": "json",
+ "subMetas": {}
+}
\ No newline at end of file
diff --git a/assets/shop/img/passCheck/bg.jpg b/assets/shop/img/passCheck/bg.jpg
index 6d67ec8..64d89e6 100644
Binary files a/assets/shop/img/passCheck/bg.jpg and b/assets/shop/img/passCheck/bg.jpg differ
diff --git a/assets/shop/img/passCheck/passCheck.plist b/assets/shop/img/passCheck/passCheck.plist
index 3eb0625..a9a8b41 100644
--- a/assets/shop/img/passCheck/passCheck.plist
+++ b/assets/shop/img/passCheck/passCheck.plist
@@ -456,7 +456,7 @@
size
{1248,2006}
smartupdate
- $TexturePacker:SmartUpdate:71a1134c7c277dc61c6d5750b9355d34$
+ $TexturePacker:SmartUpdate:fdb4f0da991b07b39fc13bb4ed4a399d$
textureFileName
passCheck.png
diff --git a/assets/shop/img/passCheck/passCheck.png b/assets/shop/img/passCheck/passCheck.png
index 4ed0417..292ae40 100644
Binary files a/assets/shop/img/passCheck/passCheck.png and b/assets/shop/img/passCheck/passCheck.png differ