yangzhao/cb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

暂存

Browse Source
This commit is contained in:
COMPUTER\EDY 2026-04-14 11:01:35 +08:00
parent 77e60e648c
commit 414725cb21
3 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
assets/Script/Block.ts
View File

@ -417,7 +417,7 @@ export default class Block extends cc.Component {
this.setMapBlock(); this.setMapBlock();
this.level = 50 + this.posX - this.posY * 3; this.level = 50 + this.posX - this.posY * 3;
if (this.type != BlockType.单色地块) this.node.zIndex = this.level; if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
else this.node.zIndex = 1000; // else this.node.zIndex = 1000;
this.node.x = mapInfo[i].x + 65; this.node.x = mapInfo[i].x + 65;
this.node.y = mapInfo[i].y - 60; this.node.y = mapInfo[i].y - 60;
this.startPos = this.node.position; this.startPos = this.node.position;
@ -1086,7 +1086,7 @@ export default class Block extends cc.Component {
this.setMapBlock(); this.setMapBlock();
this.level = 50 + this.posX - this.posY * 3; this.level = 50 + this.posX - this.posY * 3;
if (this.type != BlockType.单色地块) this.node.zIndex = this.level; if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
else this.node.zIndex = 1000; // else this.node.zIndex = 1000;
//console.log("方块层级", this.node.zIndex); //console.log("方块层级", this.node.zIndex);
this.node.x = mapBlock.x + 65; this.node.x = mapBlock.x + 65;
this.node.y = mapBlock.y - 60; this.node.y = mapBlock.y - 60;
@ -1513,7 +1513,7 @@ export default class Block extends cc.Component {
else else
cc.fx.AudioManager._instance.playEffect("hit", null); cc.fx.AudioManager._instance.playEffect("hit", null);
if (this.type != BlockType.单色地块) this.node.zIndex = 200; if (this.type != BlockType.单色地块) this.node.zIndex = 200;
else this.node.zIndex = 1000; // else this.node.zIndex = 1000;
if (this.type == 9) { if (this.type == 9) {
if (this.block_Info.node) { if (this.block_Info.node) {
@ -1677,7 +1677,7 @@ export default class Block extends cc.Component {
MapConroler._instance.removeOneBlock(); MapConroler._instance.removeOneBlock();
this.isTouch = false; this.isTouch = false;
if (this.type != BlockType.单色地块) this.node.zIndex = this.level; if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
else this.node.zIndex = 1000; // else this.node.zIndex = 1000;
this.hit.active = false; this.hit.active = false;
let otherBlocks = null; let otherBlocks = null;
if (this.type == 9) { if (this.type == 9) {
@ -1758,7 +1758,7 @@ export default class Block extends cc.Component {
MapConroler._instance.removeOneBlock(); MapConroler._instance.removeOneBlock();
this.isTouch = false; this.isTouch = false;
if (this.type != BlockType.单色地块) this.node.zIndex = this.level; if (this.type != BlockType.单色地块) this.node.zIndex = this.level;
else this.node.zIndex = 1000; // else this.node.zIndex = 1000;
this.hit.active = false; this.hit.active = false;
if (this.type == 9) { if (this.type == 9) {
if (this.block_Info.node) { if (this.block_Info.node) {

27
assets/Script/Map.ts
View File

@ -4948,6 +4948,19 @@ export default class MapConroler extends cc.Component {
// MiniGameSdk.API.showToast("魔法棒数量不足,自动购买魔法棒"); // MiniGameSdk.API.showToast("魔法棒数量不足,自动购买魔法棒");
} }
else { else {
if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value < cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
cc.fx.GameConfig.GM_INFO.tasks.useProp.value += 1;
cc.fx.GameTool.setDailyQuestInfo();
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value == cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
let data = {
id: 3,
status: "complete"
}
cc.fx.GameTool.shushu_Track("daily_task", data);
}
}
}
const timestamp = Date.now(); const timestamp = Date.now();
cc.fx.GameConfig.GM_INFO.magicAmount -= 1; cc.fx.GameConfig.GM_INFO.magicAmount -= 1;
if (cc.fx.GameConfig.GM_INFO.magicAmount < 0) if (cc.fx.GameConfig.GM_INFO.magicAmount < 0)
@ -4976,19 +4989,7 @@ export default class MapConroler extends cc.Component {
//使用魔法棒随机消除两个方块 //使用魔法棒随机消除两个方块
runMagic() { runMagic() {
let magicBtn = this.node.parent.getChildByName("Bottom").getChildByName("magicBtn"); let magicBtn = this.node.parent.getChildByName("Bottom").getChildByName("magicBtn");
if (cc.fx.GameConfig.GM_INFO.otherLevel == 0) {
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value < cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
cc.fx.GameConfig.GM_INFO.tasks.useProp.value += 1;
cc.fx.GameTool.setDailyQuestInfo();
if (cc.fx.GameConfig.GM_INFO.tasks.useProp.value == cc.fx.GameConfig.GM_INFO.tasks.useProp.target) {
let data = {
id: 3,
status: "complete"
}
cc.fx.GameTool.shushu_Track("daily_task", data);
}
}
}
const timestamp = Date.now(); const timestamp = Date.now();
this.magicMask.active = true; this.magicMask.active = true;
setTimeout(() => { setTimeout(() => {

13
assets/action_bundle/img/hammer.meta
View File

@ -1,13 +0,0 @@
{
"ver": "1.1.3",
"uuid": "87056b96-7f04-4f1f-a3bb-a13a087d1ff5",
"importer": "folder",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}