diff --git a/assets/FrameWork/Config/AppConfig.ts b/assets/FrameWork/Config/AppConfig.ts index 13614f6c..99579234 100644 --- a/assets/FrameWork/Config/AppConfig.ts +++ b/assets/FrameWork/Config/AppConfig.ts @@ -19,13 +19,13 @@ export default class AppConfig { public static APP_Version = "1.0.1";// 每次任务大版本更新需要更改 //--设置各自游戏的appId - public static readonly TT_APP_ID_custom = "tte9e19f5c76d507d202";//抖音 app id + public static readonly TT_APP_ID_custom = "tt670f11b2f83aef4202";//抖音 app id - public static readonly WX_APP_ID_custom = "tte9e19f5c76d507d202";//微信 app id - public static readonly QQ_APP_ID_custom = "tte9e19f5c76d507d202";//QQ app id - public static readonly VIVO_APP_ID_custom = "tte9e19f5c76d507d202";//vivo app id - public static readonly OPPO_APP_ID_custom = "tte9e19f5c76d507d202";//opop app id - public static readonly APK_APP_ID_custom = "tte9e19f5c76d507d202";//Android app id + public static readonly WX_APP_ID_custom = "tt670f11b2f83aef4202";//微信 app id + public static readonly QQ_APP_ID_custom = "tt670f11b2f83aef4202";//QQ app id + public static readonly VIVO_APP_ID_custom = "tt670f11b2f83aef4202";//vivo app id + public static readonly OPPO_APP_ID_custom = "tt670f11b2f83aef4202";//opop app id + public static readonly APK_APP_ID_custom = "tt670f11b2f83aef4202";//Android app id //--设置各自游戏的gameid public static readonly TT_gameid_custom: number = -1; @@ -98,10 +98,10 @@ export default class AppConfig { //头条 广告 public static readonly tt_adUnitId_custom = "17dif14i521c125g1i" public static readonly tt_bannerAdUnitId_custom = "of6a5i4oi6rqecpnp4" - public static readonly tt_InsAdUnitId_custom = "916bg53bd40rc691f1" + public static readonly tt_InsAdUnitId_custom = "a0a6jhc515f5hvreil" public static readonly tt_templateId_custom = "1rnq03gjb7j3k91jfv" //分享素材id - public static readonly tt_adUnitIdArr_custom = ["1gj5fjd6be61a2e428", "2lgwu5h87n03dt39rd", "d4e499g56cgooa69fn"];//头条视频列表 + public static readonly tt_adUnitIdArr_custom = ["3bg3i49k46e6a83ern", "34nca34j859k4abd50", "1o5wfwf002p2vdu8u2"];//头条视频列表 //QQ广告 public static readonly qq_adUnitId_custom = "5b57820f7aff1c8c238e450d22d468e6" //激励视频Id public static readonly qq_bannerAdUnitId_custom = "4f66f2f5b95a75f49166da22da1e85ae" //banner广告Id diff --git a/assets/FrameWork/Mgr/GEMgr.ts b/assets/FrameWork/Mgr/GEMgr.ts index c4ca45a8..bc94b3a5 100644 --- a/assets/FrameWork/Mgr/GEMgr.ts +++ b/assets/FrameWork/Mgr/GEMgr.ts @@ -1,5 +1,5 @@ const config = { - accessToken: "SEoqDFTNcaZOCt5fzuhzr0BWmJswebs8", // 项目通行证，在：网站后台-->设置-->应用列表中找到Access Token列 复制（首次使用可能需要先新增应用） + accessToken: "lnnab9tjzvr6qIwVuqWdhecTp2CLBiMr", // 项目通行证，在：网站后台-->设置-->应用列表中找到Access Token列 复制（首次使用可能需要先新增应用） clientId: "your_client_id", // 用户唯一标识，如产品为小游戏，则必须填用户openid（注意，不是小游戏的APPID！！！） autoTrack: { appLaunch: true, // 自动采集 $MPLaunch diff --git a/assets/Scripts/Manager/LevelUpManager.ts b/assets/Scripts/Manager/LevelUpManager.ts index f27cd3e6..0b06e85b 100644 --- a/assets/Scripts/Manager/LevelUpManager.ts +++ b/assets/Scripts/Manager/LevelUpManager.ts @@ -169,12 +169,12 @@ export default class LevelUpManager { ] public static adRewardArray2 = [ - 6, 6, 6, 4, 4, 4, 3, 3, 3, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, - 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, ] //宝箱 diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts index cfe43f31..22405aea 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts @@ -146,6 +146,17 @@ export default class ZaoCanDian extends cc.Component { } }, this) + //每次进界面自动播一次制作 + //制作动画名 + let animation_names1 = ['蒸', '煮', '', '', ''] + for (let i = 0; i < 5; i++) { + let name = ZaoCanManager.getCurNameByType(i) + if (i <= 3) { + this.setTanWeiSpine(i, `${animation_names1[i]}${name}`, 3) + }else{ + // 豆浆不用播 + } + } } RefreshJieDao() { diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts b/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts index d3103754..40654e59 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts @@ -202,6 +202,9 @@ export default class ZaoCanDianNpc extends cc.Component { }) ) .start() + cc.tween(this.node.getChildByName(qipao)) + .to(0.5, { scaleX: 1.2, scaleY: 1.2 }) + .start() // }) }, 1) diff --git a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 index 40ac2e6a..378c823f 100644 Binary files a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 and b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 differ diff --git a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta index 70532f05..71c7a20f 100644 --- a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta +++ b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta @@ -3,6 +3,6 @@ "uuid": "5e2a5e67-8f06-47bc-b74c-03de299accd2", "importer": "audio-clip", "downloadMode": 0, - "duration": 2.377143, + "duration": 2.821224, "subMetas": {} } \ No newline at end of file diff --git a/assets/zy_dysdk/zy.sdk.js b/assets/zy_dysdk/zy.sdk.js index 1cdf6c76..c0bad8b9 100644 --- a/assets/zy_dysdk/zy.sdk.js +++ b/assets/zy_dysdk/zy.sdk.js @@ -1,7 +1,7 @@ //游戏配置 let gameCfg = { //游戏标识 - gid: "tt_tzrsdf", + gid: "tt_xydfj", wx_gid: 'wx_11', //微信 ks_gid: 'ks_11', //快手 bl_gid: "bl_11", diff --git a/settings/builder.json b/settings/builder.json index 6f69a026..58083266 100644 --- a/settings/builder.json +++ b/settings/builder.json @@ -1,5 +1,5 @@ { - "title": "tzrsdf", + "title": "xianyudefanji", "packageName": "org.cocos2d.demo", "startScene": "ef0db577-f93f-48b6-8964-d71aa93071d3", "excludeScenes": [ diff --git a/settings/bytedance.json b/settings/bytedance.json index ad209d36..3809ee7f 100644 --- a/settings/bytedance.json +++ b/settings/bytedance.json @@ -1,8 +1,8 @@ { - "appid": "tte9e19f5c76d507d202", + "appid": "tt670f11b2f83aef4202", "orientation": "portrait", "separate_engine": false, - "REMOTE_SERVER_ROOT": "https://dycdn.ioe-times.com/tzrsdf/1.0.29", + "REMOTE_SERVER_ROOT": "https://dycdn.ioe-times.com/xianyudefanji/1.0.2", "subContext": "", "startSceneAssetBundle": false } diff --git a/settings/project.json b/settings/project.json index aab19e81..dc66d955 100644 --- a/settings/project.json +++ b/settings/project.json @@ -108,7 +108,7 @@ "enable": false } }, - "last-module-event-record-time": 1737367491086, + "last-module-event-record-time": 1740130076872, "migrate-history": [ "cloud-function" ]