diff --git a/game-server/app/servers/role/handler/taskHandler.ts b/game-server/app/servers/role/handler/taskHandler.ts index 0d71476ef..98cc8efc8 100644 --- a/game-server/app/servers/role/handler/taskHandler.ts +++ b/game-server/app/servers/role/handler/taskHandler.ts @@ -195,7 +195,7 @@ export class ShopHandler { tasks.push(task); } let task = getRandEelm(tasks, 1)[0]; - await checkTask(roleId, sid, funcs, task.taskType, task.condition, false, { isDebug: true }); + await checkTask(roleId, sid, [1,2,3,4,5], task.taskType, task.condition, false, { isDebug: true }); return resResult(STATUS.SUCCESS, { task }); diff --git a/shared/resource/jsons/dic_army_trainJuDian.json b/shared/resource/jsons/dic_army_trainJuDian.json old mode 100755 new mode 100644 index ae0925c44..2cd66839e --- a/shared/resource/jsons/dic_army_trainJuDian.json +++ b/shared/resource/jsons/dic_army_trainJuDian.json @@ -4,8 +4,8 @@ "id_1": 1, "name": "试炼1-初出茅庐", "count": 4, - "heroid": "1&3&5&4", - "gkid": "1&8501&800|3&8502&800|5&8503&800|7&8504&800", + "heroid": "1&44&5&4", + "gkid": "1&8501&800|44&8502&800|5&8503&800|7&8504&800", "shilianReward": "40005&6000|20001&60|21008&30|42008&10", "soloRewardRatio": 1, "jinjieReward": "40005&2000|31002&3000" @@ -15,8 +15,8 @@ "id_1": 2, "name": "试炼2-过关斩将", "count": 4, - "heroid": "2&3&5&7", - "gkid": "2&8505&800|3&8506&800|5&8507&800|7&8508&800", + "heroid": "2&44&5&7", + "gkid": "2&8505&800|44&8506&800|5&8507&800|7&8508&800", "shilianReward": "40005&4000|20001&60|21008&30|42008&11", "soloRewardRatio": 1.1, "jinjieReward": "40005&3000|31002&3000" diff --git a/web-server/config/config.default.ts b/web-server/config/config.default.ts index 3a18f5912..20f432b36 100644 --- a/web-server/config/config.default.ts +++ b/web-server/config/config.default.ts @@ -47,6 +47,12 @@ export default (appInfo: EggAppInfo) => { dir: path.join(appInfo.baseDir, '/app/public'), }; + config.xtransit = { + server: 'ws://172.26.117.35:9092', + appId: 3, + appSecret: 'a48ad5ca44e2d02cbd7f4c0326fa3101', + error_log: [ '/root/logs/zyz/zyz-web.log', '/root/logs/zyz/common-error.log', '/root/logs/zyz/egg-agent.log' ], + }; // add your special config in here const bizConfig = {