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

更新修复BUG

Browse Source
This commit is contained in:
YZ\249929363 2025-07-10 11:06:09 +08:00
parent e7184691eb
commit 919eab701b
16 changed files with 2836 additions and 2363 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4116
assets/Scene/GameScene.fire
View File

File diff suppressed because it is too large Load Diff

15
assets/Script/Block.ts
View File

@ -186,7 +186,6 @@ export default class Block extends cc.Component {
this.initColor();
this.initType();
this.initBlocks();
if(this.type != BlockType.叠加块上){
this.node.on(cc.Node.EventType.TOUCH_START, this.touchStart, this);
this.node.on(cc.Node.EventType.TOUCH_MOVE, this.touchMove, this);
@ -745,7 +744,7 @@ export default class Block extends cc.Component {
eliminate(){
//锤子状态消失
MapConroler._instance.pause = true;
MapConroler._instance.hammer = false;
if(MapConroler._instance.hammer == true) MapConroler._instance.hammer = false;
//如果方块是有特殊状态，则特殊处理
if(this.type == BlockType.冻结块){
this.node.getChildByName("freeze").getComponent("Freeze").reduce(2);
@ -789,7 +788,7 @@ export default class Block extends cc.Component {
setVibrate(type, count){
// return;
console.log("最新:",cc.fx.GameConfig.GM_INFO.vibrateOpen,type);
// console.log("最新:",cc.fx.GameConfig.GM_INFO.vibrateOpen,type);
if(!cc.fx.GameConfig.GM_INFO.vibrateOpen){
return;
}
@ -1268,9 +1267,13 @@ export default class Block extends cc.Component {
}
if(this.type == BlockType.叠加块上 && this.moveStack == true){
if(this.stacking.x != 0 || this.stacking.y!= 0){
this.node.x = this.block_Info.node.x + this.stacking.x;
this.node.y = this.block_Info.node.y + this.stacking.y;
if((this.stacking.x != 0 || this.stacking.y!= 0) && this.block_Info.node!= null){
this.isTouch = false;
// this.node.x = this.block_Info.node.x + this.stacking.x;
// this.node.y = this.block_Info.node.y + this.stacking.y;
this.node.x = Math.round(this.block_Info.node.x + this.stacking.x);
this.node.y = Math.round(this.block_Info.node.y + this.stacking.y);
console.log("跟随移动",dt);
}
}
if(this.block_Info){

2
assets/Script/GameManager.ts
View File

@ -686,6 +686,8 @@ export default class GameManager extends cc.Component {
this.load1 = this.load2 = false;
MiniGameSdk.API.shushu_Login();
MiniGameSdk.API.yinli_Init();
MiniGameSdk.API.yinli_Login();
cc.fx.GameTool.setWechatGameGroup(2);
this.startGame();
}
}

14
assets/Script/Load.ts
View File

@ -36,12 +36,22 @@ export default class NewClass extends cc.Component {
//@ts-ignore
cc.internal.inputManager._maxTouches = 1
cc.debug.setDisplayStats(false);
let manager = cc.director.getCollisionManager();
manager.enabled = true;
this.setWX();
cc.debug.setDisplayStats(false);
// let version = cc.fx.GameTool.getWechatGameVersion();
// if(version == "开发版" || version == "体验版"){
// cc.debug.setDisplayStats(false);
// }
// else if(version == "正式版"){
// cc.debug.setDisplayStats(false);
// }
// else{
// cc.debug.setDisplayStats(false);
// }
cc.tween(this.node1)

135
assets/Script/Map.ts
View File

@ -1391,6 +1391,7 @@ export default class MapConroler extends cc.Component {
}
winLevel() {
MiniGameSdk.API.showToast(cc.fx.GameConfig.GM_INFO.level);
if(this.node.parent.parent.getChildByName("Win").
getChildByName("nextBtn").getComponent("btnControl")._touch == false){
return;
@ -1408,9 +1409,6 @@ export default class MapConroler extends cc.Component {
}, 500);
}
else if (cc.fx.GameConfig.GM_INFO.level == 249) {
MiniGameSdk.API.showToast("每周更新，敬请期待！");
}
else {
// console.log("下一关");
if (this.new_mode == 3) {
@ -1561,11 +1559,10 @@ export default class MapConroler extends cc.Component {
//判断游戏失败
failLevel(type) {
this.stopTimeCutDown();
if (this.gameOver == true || this.gameWin == true) {
return;
}
this.stopTimeCutDown();
let time = 0;
this.gameOver = true;
if (type == "boom") {
@ -1670,7 +1667,7 @@ export default class MapConroler extends cc.Component {
//使用时间道具
useTimeProp() {
if (this.node.parent.getChildByName("Ice").active == true || this.hammer == true
|| this.magicMask.active == true || this.timeNumber <= 1) {
|| this.magicMask.active == true || this.timeNumber <= 1 || this.gameOver || this.gameWin) {
return;
}
let freezeBtn = this.node.parent.getChildByName("Bottom").getChildByName("timeBtn");
@ -1799,7 +1796,7 @@ export default class MapConroler extends cc.Component {
//使用锤子道具
useHammer() {
if (this.node.parent.getChildByName("Ice").active == true || this.hammer == true
|| this.magicMask.active == true || this.timeNumber <= 1) {
|| this.magicMask.active == true || this.timeNumber <= 1 || this.gameOver || this.gameWin) {
return;
}
let hammerBtn = this.node.parent.getChildByName("Bottom").getChildByName("destroyBtn");
@ -1899,7 +1896,7 @@ export default class MapConroler extends cc.Component {
//使用魔法棒随机消除两个方块
useMagic() {
if (this.node.parent.getChildByName("Ice").active == true || this.hammer == true
|| this.magicMask.active == true || this.timeNumber <= 1) {
|| this.magicMask.active == true || this.timeNumber <= 1 || this.gameOver || this.gameWin) {
return;
}
let magicBtn = this.node.parent.getChildByName("Bottom").getChildByName("magicBtn");
@ -1933,6 +1930,7 @@ export default class MapConroler extends cc.Component {
this.setPropNum();
// this.magicLabel.string = cc.fx.GameConfig.GM_INFO.magicAmount.toString();
let propInfo = cc.fx.StorageMessage.getStorage("prop");
if(propInfo){
propInfo.magicAmount = cc.fx.GameConfig.GM_INFO.magicAmount;
propInfo.timestamp = timestamp;
cc.fx.StorageMessage.setStorage("prop", propInfo);
@ -1943,6 +1941,8 @@ export default class MapConroler extends cc.Component {
num: -1
}
cc.fx.GameTool.shushu_Track("resource_cost", data);
}
let nomalArray = [];
// this.magicBtn.node.active = false;
for (let i = 0; i < this.blocks.length; i++) {
@ -1957,7 +1957,7 @@ export default class MapConroler extends cc.Component {
if (this.blocks[i].getComponent("Block").block_Info.node) {
nomalArray.push(this.blocks[i].getComponent("Block").block_Info.node);
}
else nomalArray.push(this.blocks[i]);
// else nomalArray.push(this.blocks[i]);
}
else {
nomalArray.push(this.blocks[i]);
@ -1970,67 +1970,68 @@ export default class MapConroler extends cc.Component {
if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) {
time = 200;
}
if (time > 0) {
setTimeout(() => {
nomalArray[1].getComponent("Block").eliminate();
}, time);
return;
}
else {
nomalArray[1].getComponent("Block").eliminate();
return;
}
}
else if (nomalArray.length == 1) {
nomalArray[0].getComponent("Block").eliminate();
let time = 0;
if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) {
time = 200;
}
setTimeout(() => {
if (this.freezeArray.length == 0 && this.loackArray.length == 0) {
// console.log("只剩下一个块道具使用完毕");
}
else {
if (this.loackArray.length != 0) {
// console.log("消除一个普通块后，消除一个带锁块");
this.loackArray[0].getComponent("Block").eliminate();
return;
}
else if (this.freezeArray.length != 0) {
// console.log("消除一个普通块后，消除一个冻结块");
this.freezeArray[0].getComponent("Block").eliminate();
return;
}
}
}, 200 + time);
}
else {
let count = 2;
if (this.loackArray.length != 0) {
for (let i = 0; i < this.loackArray.length; i++) {
// console.log("没有普通快，魔法消除一个带锁块");
this.loackArray[i].getComponent("Block").eliminate();
count -= 1;
if (count == 0) {
break;
}
}
// if (time > 0) {
// setTimeout(() => {
// nomalArray[1].getComponent("Block").eliminate();
// }, time);
// return;
// }
// else {
// nomalArray[1].getComponent("Block").eliminate();
// return;
// }
}
// else if (nomalArray.length == 1) {
// nomalArray[0].getComponent("Block").eliminate();
// let time = 0;
// if (nomalArray[0].getComponent("Block").type == 1 || nomalArray[0].getComponent("Block").type == 9) {
// time = 200;
// }
// setTimeout(() => {
// if (this.freezeArray.length == 0 && this.loackArray.length == 0) {
// // console.log("只剩下一个块道具使用完毕");
// }
// else {
// if (this.loackArray.length != 0) {
// // console.log("消除一个普通块后，消除一个带锁块");
// this.loackArray[0].getComponent("Block").eliminate();
// return;
// }
// else if (this.freezeArray.length != 0) {
// // console.log("消除一个普通块后，消除一个冻结块");
// this.freezeArray[0].getComponent("Block").eliminate();
// return;
// }
// }
// }, 200 + time);
// }
// else {
// let count = 2;
// if (this.loackArray.length != 0) {
// for (let i = 0; i < this.loackArray.length; i++) {
// // console.log("没有普通快，魔法消除一个带锁块");
// this.loackArray[i].getComponent("Block").eliminate();
// count -= 1;
// if (count == 0) {
// break;
// }
// }
// }
setTimeout(() => {
if (count != 0) {
for (let i = 0; i < this.freezeArray.length; i++) {
// console.log("没有普通快，魔法消除一个冻结块");
// this.freezeArray[i].getComponent("Block").eliminate();
count -= 1;
if (count == 0) {
break;
}
}
}
}, 100);
}
// setTimeout(() => {
// if (count != 0) {
// for (let i = 0; i < this.freezeArray.length; i++) {
// // console.log("没有普通快，魔法消除一个冻结块");
// // this.freezeArray[i].getComponent("Block").eliminate();
// count -= 1;
// if (count == 0) {
// break;
// }
// }
// }
// }, 100);
// }
}
}
}

16
assets/Script/SceneManager.ts
View File

@ -297,14 +297,14 @@ export default class SceneManager extends cc.Component {
propWindow.getChildByName("magic").active = false;
propWindow.getChildByName("buy_Btn").getComponent("btnControl").setTouch(true);
propWindow.getChildByName(name).active = true;
if(name == "hammer"){
propWindow.getChildByName("buy_Btn").getChildByName("hammer").active = true;
propWindow.getChildByName("buy_Btn").getChildByName("nomal").active = false;
}
else{
propWindow.getChildByName("buy_Btn").getChildByName("hammer").active = false;
propWindow.getChildByName("buy_Btn").getChildByName("nomal").active = true;
}
// if(name == "hammer"){
// propWindow.getChildByName("buy_Btn").getChildByName("hammer").active = true;
// propWindow.getChildByName("buy_Btn").getChildByName("nomal").active = false;
// }
// else{
// propWindow.getChildByName("buy_Btn").getChildByName("hammer").active = false;
// propWindow.getChildByName("buy_Btn").getChildByName("nomal").active = true;
// }
}
clickBtn() {

32
assets/Script/Sdk/MiniGameSdk.ts
View File

@ -1260,6 +1260,12 @@ export namespace MiniGameSdk {
maxRetries: 3, // 网络请求失败时的重试次数，1 表示不重试。默认值是 3
enablePersistence: true, // 是否使用本地缓存，主实例默认为 true，子实例默认为 false
asyncPersistence: false, // 是否使用异步存储，默认为 false
enable_sync_attribution: true, // 是否开启渠道归因，默认为 false
autoTrack: {
appLaunch: true, // 自动采集 $MPLaunch
appShow: false, // 自动采集 $MPShow
appHide: false, // 自动采集 $MPHide
},
};
API._ge = new GravityAnalyticsAPI(configYinli);
API._ge .setupAndStart();
@ -1286,6 +1292,32 @@ export namespace MiniGameSdk {
}
}
static yinli_Register(){
if (typeof wx!== 'undefined' && wx!== null) {
API._ge.registerEvent();
}
}
/**
* 上报付费事件
* @param payAmount 付费金额 单位为分
* @param payType 货币类型 按照国际标准组织ISO 4217中规范的3位字母，例如CNY人民币、USD美金等
* @param orderId 订单号
* @param payReason 付费原因 例如：购买钻石、办理月卡
* @param payMethod 付费方式 例如：支付宝、微信、银联等
*/
static yinli_Pay(payAmount,orderId,payReason){
if (typeof wx!== 'undefined' && wx!== null) {
API._ge.payEvent(payAmount, "CNY", orderId, payReason, "微信");
}
}
static yinli_Login(){
if (typeof wx!== 'undefined' && wx!== null) {
API._ge.loginEvent();
}
}
}
}

2
assets/Script/module/Config/GameConfig.ts
View File

@ -222,7 +222,7 @@ export class GameConfig {
min_Time:0, //体力恢复的剩余时间
freezeAmount:0, //冻结道具次数
hammerAmount:0, //锤子道具次数
magicAmount:0, //魔法棒道具次数
magicAmount:99, //魔法棒道具次数
musicOpen: true, //音乐
effectOpen: true, //音效
vibrateOpen: true, //震动

1
assets/Script/module/Music/AudioManager.ts
View File

@ -177,6 +177,7 @@ export default class AudioManager extends cc.Component {
return this.play(this[name], false, callback, this.mEffectSwitch);
}
playMusic(key, callback, loop) {
console.log("音频开关________________________________________");
if (!cc.fx.GameConfig.GM_INFO.musicOpen) {
return;
}

39
assets/Script/module/Tool/GameTool.ts
View File

@ -664,6 +664,8 @@ var GameTool = {
}
console.log("____________即将上传Shop_buy",buyData);
cc.fx.GameTool.shushu_Track("shop_buy",buyData);
callback();
}
},
@ -896,7 +898,7 @@ var GameTool = {
removeAllLister:function () {
},
//上报数据
shushu_Track: function(name,data){
let eventData = {}
switch(name){
@ -983,6 +985,7 @@ var GameTool = {
MiniGameSdk.API.shushu_Track(name, eventData);
},
//获取微信小游戏版本号
getWechatGameVersion: function(){
//@ts-ignore
if (typeof wx!== 'undefined' && wx!== null) {
@ -1002,5 +1005,39 @@ var GameTool = {
}
},
//微信小游戏根据openId将用户分组，有可能会两分，三分，六分
setWechatGameGroup: function(type: 2 | 3 | 6) {
//@ts-ignore
if (typeof wx!== 'undefined' && wx!== null) {
//@ts-ignore
if(cc.fx.GameConfig.GM_INFO.openid) {
const openid = cc.fx.GameConfig.GM_INFO.openid;
const lastChar = openid[openid.length - 1];
const charCode = lastChar.charCodeAt(0);
let groupNumber: number;
console.log("openid尾数____________________:",charCode);
// 根据 type 参数计算分组编号
switch(type) {
case 2:
groupNumber = charCode % 2;
break;
case 3:
groupNumber = charCode % 3;
break;
case 6:
groupNumber = charCode % 6;
break;
default:
console.log('type 参数值无效，必须为 2、3 或 6');
return;
}
console.log("type____________________:",type);
console.log("分组编号____________________:",groupNumber);
}
}
}
};
export { GameTool };

3
assets/Script/prop/Boom.ts
View File

@ -55,6 +55,7 @@ export default class Boom extends cc.Component {
NumberToImage.numberToImageNodes(this.time,20,8,"lock_",this.node.getChildByName("time"),false);
if(this.time <= 0){
this.unschedule(this.updateTime);
MapConroler._instance.failLevel("boom");
this.node.getChildByName("zhandan").active = true;
this.node.getChildByName("bg").active = false;
const skeleton = this.node.getChildByName("zhandan").getComponent(sp.Skeleton);
@ -64,7 +65,7 @@ export default class Boom extends cc.Component {
// 动画播放完成后销毁节点
this.node.destroy();
});
MapConroler._instance.failLevel("boom");
// this.node.destroy();
}
}

2
assets/Script/prop/Freeze.ts
View File

@ -61,7 +61,7 @@ export default class Freeze extends cc.Component {
this.node.parent.getComponent("Block").resetFreeze();
this.node.destroy();
this.node.removeFromParent();
}, 600);
}, 500);
}
}

388
assets/resources/Json/level220.json Normal file
View File

@ -0,0 +1,388 @@
{
"LEVEL_INFO": [
{
"id": "220",
"map": [
9,
12
],
"time": 120,
"gap": [
{
"x": 3,
"y": 1,
"z": 0
},
{
"x": 4,
"y": 1,
"z": 0
},
{
"x": 5,
"y": 1,
"z": 0
},
{
"x": 3,
"y": 10,
"z": 0
},
{
"x": 4,
"y": 10,
"z": 0
},
{
"x": 5,
"y": 10,
"z": 0
}
]
}
],
"BLOCK_INFO": [
[
{
"block": 23,
"color": 1,
"type": 0,
"position": {
"x": 420,
"y": -240,
"z": 0
},
"id": 210
},
{
"block": 23,
"color": 1,
"type": 0,
"position": {
"x": 420,
"y": 0,
"z": 0
},
"id": 220
},
{
"block": 23,
"color": 1,
"type": 0,
"position": {
"x": -300,
"y": 0,
"z": 0
},
"id": 230
},
{
"block": 23,
"color": 1,
"type": 0,
"position": {
"x": -300,
"y": -240,
"z": 0
},
"id": 240
},
{
"block": 2,
"color": 5,
"type": 0,
"position": {
"x": 300,
"y": -600,
"z": 0
},
"id": 250
},
{
"block": 2,
"color": 5,
"type": 0,
"position": {
"x": -300,
"y": 360,
"z": 0
},
"id": 260
},
{
"block": 10,
"color": 5,
"type": 0,
"position": {
"x": 60,
"y": 120,
"z": 0
},
"id": 270
},
{
"block": 2,
"color": 7,
"type": 0,
"position": {
"x": -180,
"y": 360,
"z": 0
},
"id": 280
},
{
"block": 5,
"color": 3,
"type": 9,
"position": {
"x": 60,
"y": -240,
"z": 0
},
"adhesiveTime": 2,
"id": 290
},
{
"block": 2,
"color": 3,
"type": 9,
"position": {
"x": 180,
"y": -240,
"z": 0
},
"adhesiveTime": 1,
"id": 300
},
{
"block": 1,
"color": 3,
"type": 9,
"position": {
"x": -60,
"y": -480,
"z": 0
},
"adhesiveTime": 2,
"id": 310
},
{
"block": 1,
"color": 3,
"type": 9,
"position": {
"x": -180,
"y": -600,
"z": 0
},
"adhesiveTime": 1,
"id": 320
},
{
"block": 13,
"color": 3,
"type": 7,
"position": {
"x": -60,
"y": 120,
"z": 0
},
"id": 330
},
{
"block": 2,
"color": 10,
"type": 2,
"position": {
"x": 300,
"y": 360,
"z": 0
},
"id": 340
},
{
"block": 0,
"color": 10,
"type": 2,
"position": {
"x": 60,
"y": -360,
"z": 0
},
"id": 350
},
{
"block": 0,
"color": 8,
"type": 2,
"position": {
"x": 60,
"y": -480,
"z": 0
},
"id": 360
},
{
"block": 2,
"color": 1,
"type": 2,
"position": {
"x": 420,
"y": 360,
"z": 0
},
"id": 370
},
{
"block": 3,
"color": 8,
"type": 3,
"position": {
"x": 180,
"y": 0,
"z": 0
},
"lockTime": 4,
"id": 380
},
{
"block": 2,
"color": 8,
"type": 0,
"position": {
"x": 420,
"y": -600,
"z": 0
},
"id": 390
},
{
"block": 2,
"color": 9,
"type": 6,
"position": {
"x": -180,
"y": -120,
"z": 0
},
"boomTime": 20,
"id": 400
},
{
"block": 2,
"color": 2,
"type": 6,
"position": {
"x": 300,
"y": -120,
"z": 0
},
"boomTime": 15,
"id": 410
}
]
],
"WALL_INFO": [
[
{
"id": 1,
"num": 11,
"color": 10,
"special": 0,
"length": 1
},
{
"id": 2,
"num": 13,
"color": 1,
"special": 0,
"length": 1
},
{
"id": 3,
"num": 10,
"color": 5,
"special": 0,
"length": 2
},
{
"id": 4,
"num": 12,
"color": 5,
"special": 0,
"length": 0
},
{
"id": 5,
"num": 24,
"color": 9,
"special": 0,
"length": 2
},
{
"id": 6,
"num": 26,
"color": 9,
"special": 0,
"length": 0
},
{
"id": 7,
"num": 1,
"color": 2,
"special": 0,
"length": 2
},
{
"id": 8,
"num": 2,
"color": 2,
"special": 0,
"length": 0
},
{
"id": 9,
"num": 29,
"color": 7,
"special": 0,
"length": 2
},
{
"id": 10,
"num": 30,
"color": 7,
"special": 0,
"length": 0
},
{
"id": 11,
"num": 6,
"color": 8,
"special": 0,
"length": 2
},
{
"id": 12,
"num": 7,
"color": 8,
"special": 0,
"length": 0
},
{
"id": 13,
"num": 34,
"color": 3,
"special": 0,
"length": 2
},
{
"id": 14,
"num": 35,
"color": 3,
"special": 0,
"length": 0
}
]
]
}

6
assets/resources/Json/level220.json.meta Normal file
View File

@ -0,0 +1,6 @@
{
"ver": "1.0.2",
"uuid": "c711910f-ab6a-48d5-90d6-90d1f95a862e",
"importer": "json",
"subMetas": {}
}

409
assets/resources/Json/level243.json
View File

@ -6,21 +6,11 @@
9,
12
],
"time": 215,
"time": 220,
"gap": [
{
"x": 1,
"y": 1,
"z": 0
},
{
"x": 7,
"y": 1,
"z": 0
},
{
"x": 1,
"y": 9,
"y": 10,
"z": 0
},
{
@ -28,25 +18,35 @@
"y": 10,
"z": 0
},
{
"x": 7,
"y": 10,
"z": 0
},
{
"x": 6,
"y": 10,
"z": 0
},
{
"x": 7,
"y": 10,
"z": 0
},
{
"x": 1,
"y": 10,
"y": 9,
"z": 0
},
{
"x": 7,
"y": 9,
"z": 0
},
{
"x": 1,
"y": 1,
"z": 0
},
{
"x": 7,
"y": 1,
"z": 0
}
]
}
@ -54,49 +54,71 @@
"BLOCK_INFO": [
[
{
"block": 23,
"color": 1,
"block": 2,
"color": 2,
"type": 0,
"position": {
"x": -180,
"y": -120,
"y": 240,
"z": 0
},
"id": 210
},
{
"block": 23,
"color": 1,
"block": 1,
"color": 2,
"type": 0,
"position": {
"x": 300,
"y": -120,
"x": 420,
"y": -240,
"z": 0
},
"id": 220
},
{
"block": 21,
"color": 4,
"block": 22,
"color": 2,
"type": 0,
"position": {
"x": -300,
"y": 0,
"x": -180,
"y": -480,
"z": 0
},
"id": 230
},
{
"block": 2,
"color": 10,
"color": 5,
"type": 0,
"position": {
"x": -60,
"y": -600,
"x": 300,
"y": 240,
"z": 0
},
"id": 240
},
{
"block": 1,
"color": 5,
"type": 0,
"position": {
"x": -180,
"y": -240,
"z": 0
},
"id": 250
},
{
"block": 21,
"color": 5,
"type": 0,
"position": {
"x": 300,
"y": -480,
"z": 0
},
"id": 260
},
{
"block": 2,
"color": 3,
@ -106,7 +128,29 @@
"y": -600,
"z": 0
},
"id": 250
"id": 270
},
{
"block": 2,
"color": 10,
"type": 0,
"position": {
"x": -60,
"y": -600,
"z": 0
},
"id": 280
},
{
"block": 21,
"color": 4,
"type": 0,
"position": {
"x": -300,
"y": 0,
"z": 0
},
"id": 290
},
{
"block": 22,
@ -117,92 +161,48 @@
"y": 0,
"z": 0
},
"id": 260
},
{
"block": 21,
"color": 5,
"type": 0,
"position": {
"x": 300,
"y": -480,
"z": 0
},
"id": 270
},
{
"block": 2,
"color": 5,
"type": 0,
"position": {
"x": 300,
"y": 240,
"z": 0
},
"id": 280
},
{
"block": 1,
"color": 5,
"type": 0,
"position": {
"x": -180,
"y": -240,
"z": 0
},
"id": 290
},
{
"block": 2,
"color": 2,
"type": 0,
"position": {
"x": -180,
"y": 240,
"z": 0
},
"id": 300
},
{
"block": 22,
"color": 2,
"type": 0,
"block": 0,
"color": 5,
"type": 2,
"position": {
"x": -180,
"y": -480,
"x": -60,
"y": 360,
"z": 0
},
"id": 310
},
{
"block": 1,
"block": 0,
"color": 2,
"type": 0,
"type": 2,
"position": {
"x": 420,
"y": -240,
"x": 180,
"y": 360,
"z": 0
},
"id": 320
},
{
"block": 0,
"color": 2,
"color": 9,
"type": 2,
"position": {
"x": 60,
"y": -480,
"x": -180,
"y": 0,
"z": 0
},
"id": 330
},
{
"block": 0,
"color": 3,
"color": 1,
"type": 2,
"position": {
"x": -300,
"y": -360,
"x": 300,
"y": 0,
"z": 0
},
"id": 340
@ -218,6 +218,17 @@
},
"id": 350
},
{
"block": 0,
"color": 2,
"type": 2,
"position": {
"x": 60,
"y": -480,
"z": 0
},
"id": 360
},
{
"block": 0,
"color": 5,
@ -227,7 +238,7 @@
"y": -600,
"z": 0
},
"id": 360
"id": 370
},
{
"block": 0,
@ -238,62 +249,52 @@
"y": -480,
"z": 0
},
"id": 370
},
{
"block": 0,
"color": 9,
"type": 2,
"position": {
"x": -180,
"y": 0,
"z": 0
},
"id": 380
},
{
"block": 0,
"color": 5,
"block": 23,
"color": 10,
"type": 2,
"position": {
"x": -60,
"y": 360,
"x": 300,
"y": -120,
"z": 0
},
"id": 390
},
{
"block": 0,
"color": 2,
"block": 23,
"color": 10,
"type": 2,
"position": {
"x": 180,
"y": 360,
"x": -180,
"y": -120,
"z": 0
},
"id": 400
},
{
"block": 0,
"color": 1,
"type": 2,
"block": 3,
"color": 8,
"type": 9,
"position": {
"x": 300,
"y": 0,
"x": 180,
"y": 240,
"z": 0
},
"adhesiveTime": 2,
"id": 410
},
{
"block": 18,
"color": 6,
"type": 3,
"block": 2,
"color": 3,
"type": 9,
"position": {
"x": 60,
"y": -360,
"y": 0,
"z": 0
},
"lockTime": 8,
"adhesiveTime": 1,
"id": 420
},
{
@ -319,28 +320,16 @@
"id": 440
},
{
"block": 3,
"color": 8,
"type": 9,
"position": {
"x": 180,
"y": 240,
"z": 0
},
"adhesiveTime": 2,
"id": 450
},
{
"block": 2,
"color": 3,
"type": 9,
"block": 18,
"color": 6,
"type": 3,
"position": {
"x": 60,
"y": 0,
"y": -360,
"z": 0
},
"adhesiveTime": 1,
"id": 460
"lockTime": 8,
"id": 450
}
]
],
@ -348,95 +337,97 @@
[
{
"id": 1,
"num": 28,
"color": 4,
"special": 0,
"length": 2
},
{
"id": 2,
"num": 29,
"color": 4,
"special": 0,
"length": 0
},
{
"id": 3,
"num": 5,
"color": 10,
"special": 0,
"length": 2
},
{
"id": 4,
"num": 6,
"color": 10,
"special": 0,
"length": 0
},
{
"id": 5,
"num": 32,
"color": 3,
"special": 0,
"length": 2
},
{
"id": 6,
"num": 33,
"color": 3,
"special": 0,
"length": 0
},
{
"id": 7,
"num": 1,
"color": 8,
"special": 0,
"length": 2
},
{
"id": 8,
"num": 2,
"color": 8,
"special": 0,
"length": 0
},
{
"id": 9,
"num": 15,
"color": 6,
"special": 0,
"length": 3
},
{
"id": 10,
"id": 2,
"num": 17,
"color": 6,
"special": 0,
"length": 0
},
{
"id": 11,
"id": 3,
"num": 19,
"color": 6,
"special": 0,
"length": 0
},
{
"id": 12,
"id": 4,
"num": 5,
"color": 10,
"special": 0,
"length": 2
},
{
"id": 5,
"num": 6,
"color": 10,
"special": 0,
"length": 0
},
{
"id": 6,
"num": 3,
"color": 5,
"special": 2,
"length": 2,
"lock": true
},
{
"id": 7,
"num": 4,
"color": 5,
"special": 2,
"length": 0,
"lock": true
},
{
"id": 8,
"num": 1,
"color": 8,
"special": 0,
"length": 2
},
{
"id": 9,
"num": 2,
"color": 8,
"special": 0,
"length": 0
},
{
"id": 10,
"num": 14,
"color": 1,
"special": 0,
"length": 1
},
{
"id": 13,
"id": 11,
"num": 18,
"color": 9,
"special": 0,
"length": 1
},
{
"id": 12,
"num": 28,
"color": 4,
"special": 0,
"length": 2
},
{
"id": 13,
"num": 29,
"color": 4,
"special": 0,
"length": 0
},
{
"id": 14,
"num": 30,
@ -455,19 +446,17 @@
},
{
"id": 16,
"num": 3,
"color": 5,
"special": 2,
"length": 2,
"lock": true
"num": 32,
"color": 3,
"special": 0,
"length": 2
},
{
"id": 17,
"num": 4,
"color": 5,
"special": 2,
"length": 0,
"lock": true
"num": 33,
"color": 3,
"special": 0,
"length": 0
}
]
]

5
assets/shop/script/shop.ts
View File

@ -278,7 +278,8 @@ protected update(dt: number): void {
type:systemType,
fail_reason:"用户取消支付",
}
cc.fx.GameTool.shushu_Track("payment_fail",dataFail2);
cc.fx.GameTool.shushu_Track("payment_fail",name);
}
else if(data.data.pay_state == 2){
this.btn_Touch = true;
@ -296,6 +297,8 @@ protected update(dt: number): void {
type:systemType,
}
cc.fx.GameTool.shushu_Track("payment",dataSuccess);
let name = "购买金币道具:"+ productId;
MiniGameSdk.API.yinli_Pay(price,Utils.outTradeNo,name)
}
else{
MiniGameSdk.API.showToast("网络异常，充值奖励将在登录后再次发放");