diff --git a/assets/Scene/FirstScene.fire b/assets/Scene/FirstScene.fire deleted file mode 100644 index 67c8df9..0000000 --- a/assets/Scene/FirstScene.fire +++ /dev/null @@ -1,414 +0,0 @@ -[ - { - "__type__": "cc.SceneAsset", - "_name": "", - "_objFlags": 0, - "_native": "", - "scene": { - "__id__": 1 - } - }, - { - "__type__": "cc.Scene", - "_objFlags": 0, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [], - "_prefab": null, - "_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, - "y": 0 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_is3DNode": true, - "_groupIndex": 0, - "groupIndex": 0, - "autoReleaseAssets": false, - "_id": "2de37ca5-4d32-4e18-88c6-c12770e085e9" - }, - { - "__type__": "cc.Node", - "_name": "Canvas", - "_objFlags": 0, - "_parent": { - "__id__": 1 - }, - "_children": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__id__": 9 - }, - { - "__id__": 10 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 1920 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 540, - 960, - 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": "a5esZu+45LA5mBpvttspPD" - }, - { - "__type__": "cc.Node", - "_name": "Main Camera", - "_objFlags": 0, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 4 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 960, - "height": 640 - }, - "_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": "e1WoFrQ79G7r4ZuQE3HlNb" - }, - { - "__type__": "cc.Camera", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 3 - }, - "_enabled": true, - "_cullingMask": 4294967295, - "_clearFlags": 7, - "_backgroundColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_depth": -1, - "_zoomRatio": 1, - "_targetTexture": null, - "_fov": 60, - "_orthoSize": 10, - "_nearClip": 1, - "_farClip": 4096, - "_ortho": true, - "_rect": { - "__type__": "cc.Rect", - "x": 0, - "y": 0, - "width": 1, - "height": 1 - }, - "_renderStages": 1, - "_alignWithScreen": true, - "_id": "81GN3uXINKVLeW4+iKSlim" - }, - { - "__type__": "cc.Node", - "_name": "bg", - "_objFlags": 0, - "_parent": { - "__id__": 2 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 6 - }, - { - "__id__": 7 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 1080, - "height": 1920 - }, - "_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": "bamjmtl+9JBLvttSbcUIUc" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 5 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "c09e129e-5195-4054-b8a5-65e1bd675c3f" - }, - "_type": 0, - "_sizeMode": 0, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "6cv6fGyBBAOYM+uXqjsz6L" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 5 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 45, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 1080, - "_originalHeight": 2340, - "_id": "88HvMSl+ZE7IIgTo9f2WQ/" - }, - { - "__type__": "cc.Canvas", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "_designResolution": { - "__type__": "cc.Size", - "width": 1080, - "height": 1920 - }, - "_fitWidth": true, - "_fitHeight": false, - "_id": "59Cd0ovbdF4byw5sbjJDx7" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 45, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_id": "29zXboiXFBKoIV4PQ2liTe" - }, - { - "__type__": "ab8c1lSf45Hn6L4rRQLdffj", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "_id": "b11VsVgj1BL7J/i0jhJAHs" - } -] \ No newline at end of file diff --git a/assets/Scene/FirstScene.fire.meta b/assets/Scene/FirstScene.fire.meta deleted file mode 100644 index 82c5278..0000000 --- a/assets/Scene/FirstScene.fire.meta +++ /dev/null @@ -1,8 +0,0 @@ -{ - "ver": "1.3.2", - "uuid": "2de37ca5-4d32-4e18-88c6-c12770e085e9", - "importer": "scene", - "asyncLoadAssets": false, - "autoReleaseAssets": false, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/Scene/HomeScene.fire.meta b/assets/Scene/HomeScene.fire.meta index 95c8227..19d9b58 100644 --- a/assets/Scene/HomeScene.fire.meta +++ b/assets/Scene/HomeScene.fire.meta @@ -2,7 +2,7 @@ "ver": "1.3.2", "uuid": "66281f32-0047-4af8-8237-90c93fc4b0e8", "importer": "scene", - "asyncLoadAssets": true, + "asyncLoadAssets": false, "autoReleaseAssets": false, "subMetas": {} } \ No newline at end of file diff --git a/assets/Script/GameManager.ts b/assets/Script/GameManager.ts index f627199..0283911 100644 --- a/assets/Script/GameManager.ts +++ b/assets/Script/GameManager.ts @@ -172,35 +172,35 @@ export default class GameManager extends cc.Component { console.log("进入场景之前_____________", cc.fx.GameConfig.GM_INFO.first); console.log(cc.fx.GameConfig.GM_INFO.level); // 加载成功后进入 HomeScene - cc.assetManager.loadBundle('music', (err, bundle) => { - if (err) { - console.error('加载 music bundle 失败:', err); - // 加载失败时仍尝试进入 HomeScene - cc.director.loadScene("HomeScene"); - } else { - console.log('music bundle 加载成功'); - } - cc.director.loadScene("HomeScene"); - }); - // cc.assetManager.loadBundle('shop', (err, bundle) => { + // cc.assetManager.loadBundle('music', (err, bundle) => { // if (err) { - // console.error('加载 shop 失败:', err); + // console.error('加载 music bundle 失败:', err); + // // 加载失败时仍尝试进入 HomeScene + // cc.director.loadScene("HomeScene"); // } else { - // console.log('shop加载成功'); - // // 加载成功后进入 HomeScene - // cc.assetManager.loadBundle('music', (err, bundle) => { - // if (err) { - // console.error('加载 music bundle 失败:', err); - // // 加载失败时仍尝试进入 HomeScene - // cc.director.loadScene("HomeScene"); - // } else { - // console.log('music bundle 加载成功'); - // } - // cc.director.loadScene("HomeScene"); - // }); - + // console.log('music bundle 加载成功'); // } + // cc.director.loadScene("HomeScene"); // }); + cc.assetManager.loadBundle('shop', (err, bundle) => { + if (err) { + console.error('加载 shop 失败:', err); + } else { + console.log('shop加载成功'); + // 加载成功后进入 HomeScene + cc.assetManager.loadBundle('music', (err, bundle) => { + if (err) { + console.error('加载 music bundle 失败:', err); + // 加载失败时仍尝试进入 HomeScene + cc.director.loadScene("HomeScene"); + } else { + console.log('music bundle 加载成功'); + } + cc.director.loadScene("HomeScene"); + }); + + } + }); // 加载 music bundle } @@ -727,10 +727,10 @@ export default class GameManager extends cc.Component { }) //laf云函数 - Utils.getUserData((data) => { + // Utils.getUserData((data) => { - }) + // }) } setUserData() { diff --git a/assets/Script/JiaZai.ts b/assets/Script/JiaZai.ts index 3134806..ae52c0f 100644 --- a/assets/Script/JiaZai.ts +++ b/assets/Script/JiaZai.ts @@ -75,6 +75,7 @@ export default class JiaZai extends cc.Component { // LIFE-CYCLE CALLBACKS: onLoad() { + this.getShareInfo(); cc.game.setFrameRate(63); LQCollideSystem.is_enable = true; // //console.log("加载关卡配置2"); @@ -125,42 +126,27 @@ export default class JiaZai extends cc.Component { }); }); } - - if (cc.fx.GameConfig.GM_INFO.first) { - //console.log("————————准备注册事件", cc.fx.GameConfig.GM_INFO.openid); - const group = cc.fx.GameTool.setWechatGameGroup(2); - if (group == 0) { - cc.fx.GameConfig.GM_INFO.musicOpen = true; - } - else if (group == 1) { - cc.fx.GameConfig.GM_INFO.musicOpen = false; - } - const audioInfo = { - "musicOpen": cc.fx.GameConfig.GM_INFO.musicOpen, //音乐 - "effectOpen": cc.fx.GameConfig.GM_INFO.effectOpen, //音效 - "vibrateOpen": cc.fx.GameConfig.GM_INFO.vibrateOpen, //震动 - } - cc.fx.StorageMessage.setStorage("music", audioInfo); - - if (cc.fx.GameConfig.GM_INFO.openid != "") { - console.log("————————发送注册事件"); - const time = cc.fx.GameTool.formatDate(new Date()); - let data = { - register_time: time, // 注册时间 - } - console.log("注册时间:", time); - cc.fx.GameTool.shushu_Track("register", data); - MiniGameSdk.API.shushu_SetSuperProperties(time, false); - } - cc.fx.AudioManager._instance.playEffect("zhuan1", null); - this.node.getChildByName("zhuanchang").active = true; - this.node.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false); - setTimeout(() => { + if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) { + if (cc.fx.GameConfig.GM_INFO.first) { + this.setFirstInfo(); cc.fx.GameConfig.GM_INFO.first = false; - cc.director.loadScene("GameScene"); - }, 1000); - + } + cc.fx.GameConfig.LEVEL_INFO_init(true, 1000); } + else { + if (cc.fx.GameConfig.GM_INFO.first) { + //console.log("————————准备注册事件", cc.fx.GameConfig.GM_INFO.openid); + this.setFirstInfo(); + cc.fx.AudioManager._instance.playEffect("zhuan1", null); + this.node.getChildByName("zhuanchang").active = true; + this.node.getChildByName("zhuanchang").getComponent(sp.Skeleton).setAnimation(1, "up", false); + setTimeout(() => { + cc.fx.GameConfig.GM_INFO.first = false; + cc.director.loadScene("GameScene"); + }, 1000); + } + } + //console.log("音乐开关", cc.fx.GameConfig.GM_INFO.musicOpen); AudioManager._instance.playMusicGame(); // this.openMonthCard(); @@ -201,8 +187,8 @@ export default class JiaZai extends cc.Component { // //打开heath弹窗 // this.openHeath(); this.uploadToCloud(cc.fx.GameConfig.GM_INFO.level + 1); - this.rewarded(); - this.getMonthlyCardValidityDays(); + // this.rewarded(); + // this.getMonthlyCardValidityDays(); Utils.getMonthlyCard((data) => { if (data.code == 1) { cc.fx.GameConfig.GM_INFO.hp_Max = 7; @@ -703,9 +689,14 @@ export default class JiaZai extends cc.Component { payment_num: 1, type: systemType, } - cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "补发充值成功" + productId; - MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); + cc.fx.GameTool.shushu_Track("payment", dataSuccess); + let version = cc.fx.GameTool.getWechatGameVersion(); + if (version == "正式版") { + MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); + } + + } else { // 如果当前订单不处理，直接处理下一个订单 processOrder(index + 1); @@ -862,6 +853,7 @@ export default class JiaZai extends cc.Component { } //缓存弹窗 monthH() { + // return; //如果没有充值月卡，每天弹一次月卡弹窗用缓存实现 Utils.getMonthlyCard((data) => { if (data.msg == "不在有效期") { @@ -915,5 +907,52 @@ export default class JiaZai extends cc.Component { } + //获取有没有分享信息 + getShareInfo() { + // 检查微信小游戏启动参数 + if (cc.sys.platform === cc.sys.WECHAT_GAME) { + //@ts-ignore + const launchOptions = wx.getLaunchOptionsSync(); + const query = launchOptions.query; + if (query.level && query.uid) { + const level = parseInt(query.level, 10); + const uid = query.uid; + cc.fx.GameConfig.GM_INFO.otherUid = uid; + cc.fx.GameConfig.GM_INFO.otherLevel = level - 1; + console.log('从分享链接获取到的关卡信息:', level); + console.log('从分享链接获取到的 UID:', uid); + // 可以在这里处理关卡信息和 UID + } + } + } + + //第一次进游戏用户处理信息 + setFirstInfo() { + const group = cc.fx.GameTool.setWechatGameGroup(2); + if (group == 0) { + cc.fx.GameConfig.GM_INFO.musicOpen = true; + } + else if (group == 1) { + cc.fx.GameConfig.GM_INFO.musicOpen = false; + } + const audioInfo = { + "musicOpen": cc.fx.GameConfig.GM_INFO.musicOpen, //音乐 + "effectOpen": cc.fx.GameConfig.GM_INFO.effectOpen, //音效 + "vibrateOpen": cc.fx.GameConfig.GM_INFO.vibrateOpen, //震动 + } + cc.fx.StorageMessage.setStorage("music", audioInfo); + + if (cc.fx.GameConfig.GM_INFO.openid != "") { + console.log("————————发送注册事件"); + const time = cc.fx.GameTool.formatDate(new Date()); + let data = { + register_time: time, // 注册时间 + } + console.log("注册时间:", time); + cc.fx.GameTool.shushu_Track("register", data); + MiniGameSdk.API.shushu_SetSuperProperties(time, false); + } + } + // update (dt) {} } diff --git a/assets/Script/Load.ts b/assets/Script/Load.ts index c2bef2f..f74d3ff 100644 --- a/assets/Script/Load.ts +++ b/assets/Script/Load.ts @@ -31,7 +31,7 @@ export default class NewClass extends cc.Component { //@ts-ignore cc.internal.inputManager._maxTouches = 1 - cc.debug.setDisplayStats(true); + cc.debug.setDisplayStats(false); let manager = cc.director.getCollisionManager(); manager.enabled = true; this.setWX(); @@ -92,13 +92,6 @@ export default class NewClass extends cc.Component { if (typeof wx !== 'undefined' && wx !== null) { // 判断是否在微信环境 wx.setPreferredFramesPerSecond(60); // // 设置转发按钮点击后的回调 - // wx.onShareAppMessage(() => { - // return { - // title: '你想玩上怎样的游戏？', - // imageUrl: '', - // query: '' - // }; - // }); wx.onShareAppMessage(function () { // 用户点击了“转发”按钮 diff --git a/assets/Script/Sdk/MiniGameSdk.ts b/assets/Script/Sdk/MiniGameSdk.ts index 688348b..321fc80 100644 --- a/assets/Script/Sdk/MiniGameSdk.ts +++ b/assets/Script/Sdk/MiniGameSdk.ts @@ -1346,6 +1346,28 @@ export namespace MiniGameSdk { API._ge.loginEvent(); } } + + //分享 + shareGame() { + if (typeof wx !== 'undefined' && wx !== null) { + // 获取关卡信息和 UID + const level = cc.fx.GameConfig.GM_INFO.level + 1; + const uid = cc.fx.GameConfig.GM_INFO.uid; + + // 构建分享参数 + const shareParams = { + title: '快来和我一起玩游戏吧！', // 分享标题 + path: `/pages/index/index?level=${level}&uid=${uid}`, // 分享路径，带上关卡信息和 UID + imageUrl: 'https://example.com/share-image.png' // 分享图片链接 + }; + + // 调用微信分享 API + if (cc.sys.platform === cc.sys.WECHAT_GAME) { + //@ts-ignore + wx.shareAppMessage(shareParams); + } + } + } } } \ No newline at end of file diff --git a/assets/Script/module/Config/GameConfig.ts b/assets/Script/module/Config/GameConfig.ts index 0a42812..6602f08 100644 --- a/assets/Script/module/Config/GameConfig.ts +++ b/assets/Script/module/Config/GameConfig.ts @@ -105,9 +105,11 @@ export class GameConfig { hammerFirst: boolean; //锤子道具第一次 magicAFirst: boolean; //魔法棒道具第一次 hp_Max: number; //体力最大值 - doubleCoin: number;//是否翻倍 - monthTime: number;//月卡时间 - revive: number; //复活次数 + doubleCoin: number; //是否双倍 + monthTime: number; //月卡时间 + revive: number; //复活礼包购买次数 + otherUid: string; //其他被帮助用户id + otherLevel: number; }; @@ -116,6 +118,8 @@ export class GameConfig { + + //游戏内信息 static get Instance() { @@ -260,6 +264,8 @@ export class GameConfig { doubleCoin: 1, //是否双倍 monthTime: 0, //月卡时间 revive: 0, //复活礼包购买次数 + otherUid: "", //其他被帮助用户id + otherLevel: 0, //其他被帮助用户等级 }; // this.setCode(this.getKey("scode")); // this.GM_INFO.level = 0; @@ -300,7 +306,10 @@ export class GameConfig { cc.fx.GameConfig.GM_INFO.level = 323; } let name = "Json/level" + (cc.fx.GameConfig.GM_INFO.level + 1); - + if (cc.fx.GameConfig.GM_INFO.otherLevel > 0) { + console.log("进入特殊帮助关卡，可越过自己关卡等级"); + name = "Json/level" + (cc.fx.GameConfig.GM_INFO.otherLevel + 1); + } // //console.log("关卡名称:",name); // name = "Json/level" + 68; // cc.fx.StorageMessage.setStorage("level",cc.fx.GameConfig.GM_INFO.level.toString()); diff --git a/assets/StartScene/LoadScene.fire b/assets/StartScene/LoadScene.fire index b2021fc..34eb2db 100644 --- a/assets/StartScene/LoadScene.fire +++ b/assets/StartScene/LoadScene.fire @@ -795,19 +795,6 @@ "_atlas": null, "_id": "1cgewKbYRMtIgKEetpfwI+" }, - { - "__type__": "669f4SuSl9ORqawBcbwCNpG", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 2 - }, - "_enabled": true, - "fontUI": { - "__uuid__": "fa9a438e-1f24-47fe-bbcd-b75abcff2ea8" - }, - "_id": "e4QjzhztFAl4p0+5kRotxl" - }, { "__type__": "df248lSLllOZpCHwGqQ5Ye3", "_name": "", @@ -822,5 +809,18 @@ "Wall_Prefab": [], "Block_Color": [], "_id": "de33dd/4JKb4L0+kEatmTv" + }, + { + "__type__": "669f4SuSl9ORqawBcbwCNpG", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 2 + }, + "_enabled": true, + "fontUI": { + "__uuid__": "fa9a438e-1f24-47fe-bbcd-b75abcff2ea8" + }, + "_id": "e4QjzhztFAl4p0+5kRotxl" } ] \ No newline at end of file diff --git a/assets/StartScene/loadBg.jpg b/assets/StartScene/loadBg.jpg new file mode 100644 index 0000000..e6760f1 Binary files /dev/null and b/assets/StartScene/loadBg.jpg differ diff --git a/assets/StartScene/loadBg.jpg.meta b/assets/StartScene/loadBg.jpg.meta new file mode 100644 index 0000000..b75dff7 --- /dev/null +++ b/assets/StartScene/loadBg.jpg.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "bab5c3aa-3360-4c72-9a4a-443fa2448dab", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 1080, + "height": 2340, + "platformSettings": {}, + "subMetas": { + "loadBg": { + "ver": "1.0.6", + "uuid": "d67ccd6d-dd37-4d08-93d0-18ba9b6127bd", + "importer": "sprite-frame", + "rawTextureUuid": "bab5c3aa-3360-4c72-9a4a-443fa2448dab", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 1080, + "height": 2340, + "rawWidth": 1080, + "rawHeight": 2340, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/resources/Json/level280.json b/assets/resources/Json/level280.json index 6a4f0ec..05b8441 100644 --- a/assets/resources/Json/level280.json +++ b/assets/resources/Json/level280.json @@ -369,13 +369,6 @@ "special": 0, "length": 0 }, - { - "id": 13, - "num": 24, - "color": 9, - "special": 0, - "length": 0 - }, { "id": 14, "num": 24, diff --git a/assets/resources/Json/level297.json b/assets/resources/Json/level297.json index 864b99a..1fbc532 100644 --- a/assets/resources/Json/level297.json +++ b/assets/resources/Json/level297.json @@ -1,26 +1,17 @@ { "LEVEL_INFO": [ { + "risefall": [], "id": "243", "map": [ 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 +19,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 +55,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 +129,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 +162,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 +219,17 @@ }, "id": 350 }, + { + "block": 0, + "color": 2, + "type": 2, + "position": { + "x": 60, + "y": -480, + "z": 0 + }, + "id": 360 + }, { "block": 0, "color": 5, @@ -227,7 +239,7 @@ "y": -600, "z": 0 }, - "id": 360 + "id": 370 }, { "block": 0, @@ -238,62 +250,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 +321,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 +338,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 +447,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 } ] ] diff --git a/assets/shop.meta b/assets/shop.meta index e98b29d..5957283 100644 --- a/assets/shop.meta +++ b/assets/shop.meta @@ -3,8 +3,8 @@ "uuid": "28d9b746-520c-4ddc-95f8-401692d28ffc", "importer": "folder", "isBundle": true, - "bundleName": "shop", - "priority": 10, + "bundleName": "", + "priority": 8, "compressionType": { "wechatgame": "subpackage" }, diff --git a/assets/shop/script/shop.ts b/assets/shop/script/shop.ts index f1bd6b7..574c7a6 100644 --- a/assets/shop/script/shop.ts +++ b/assets/shop/script/shop.ts @@ -207,7 +207,11 @@ export default class NewClass extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + this.iosProductId; - MiniGameSdk.API.yinli_Pay(this.iosPrice, iosOutTradeNo, name) + let version = cc.fx.GameTool.getWechatGameVersion(); + if (version == "正式版") { + MiniGameSdk.API.yinli_Pay(this.iosPrice, iosOutTradeNo, name) + } + Utils.setPayInfo( (res) => { this.closeLoad(); @@ -519,7 +523,11 @@ export default class NewClass extends cc.Component { } cc.fx.GameTool.shushu_Track("payment", dataSuccess); let name = "购买金币道具:" + productId; - MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); + let version = cc.fx.GameTool.getWechatGameVersion(); + if (version == "正式版") { + MiniGameSdk.API.yinli_Pay(price, Utils.outTradeNo, name); + } + console.log("7.14_______________充值成功，轮训成功，准备发货"); Utils.setPayInfo( (res) => {