diff --git a/game-server/app/services/guildTrainService.ts b/game-server/app/services/guildTrainService.ts index f39d1853c..d24175dbc 100644 --- a/game-server/app/services/guildTrainService.ts +++ b/game-server/app/services/guildTrainService.ts @@ -165,7 +165,7 @@ export async function resetTrain(code: string, serverId: number) { if (!guild) {//不满足重置条件，结束并解锁 return trainId; } - const userGuildList = await UserGuildModel.getListByGuild(code, 'trainRewards', {}); + const userGuildList = await UserGuildModel.getListByGuild(code, 'trainRewards roleId', {}); const guildTrains = await GuildTrainModel.getGuildTrainBoxs(code); //结算未领取的宝箱奖励发送到邮件中 diff --git a/game-server/app/services/rankService.ts b/game-server/app/services/rankService.ts index c7f7a403e..6b2300dcf 100644 --- a/game-server/app/services/rankService.ts +++ b/game-server/app/services/rankService.ts @@ -1173,7 +1173,7 @@ export async function getRankInHandler(redisKey: REDIS_KEY, type: RANK_TYPE, key } else if (type == RANK_TYPE.GUILD_LV) { if(role.hasGuild) { let guild = await GuildModel.findByCode(guildCode, serverId); - myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.lvUpdateTime, guild.activeWeekly, guild); + myRank = await r.generMyRankWithGuild2(roleId, guild.lv, guild.activeWeekly, guild.lvUpdateTime, guild); } } else if (type == RANK_TYPE.GUILD_FUND) { if(role.hasGuild) { diff --git a/game-server/app/services/redisService.ts b/game-server/app/services/redisService.ts index 2f6d14f60..82d271720 100644 --- a/game-server/app/services/redisService.ts +++ b/game-server/app/services/redisService.ts @@ -110,7 +110,7 @@ export async function initSingleRank(key: string) { if(key == REDIS_KEY.PVP_RANK) { await setRankRedisFromDb(key, {}); } else { - const serverList = await GameModel.getAllServerList(); + const serverList = await ServerlistModel.findByEnv(pinus.app.get('env')); for(let { id } of serverList) { await setRankRedisFromDb(key, { serverId: id }); } diff --git a/shared/consts/constModules/sysConst.ts b/shared/consts/constModules/sysConst.ts index f43c4cc78..bf7b8f9c9 100644 --- a/shared/consts/constModules/sysConst.ts +++ b/shared/consts/constModules/sysConst.ts @@ -463,6 +463,7 @@ export const FILENAME = { DIC_GUILD_STORE_BASE: 'dic_army_storeBase', DIC_GUILD_POSITION: 'dic_army_position', DIC_ACTIVE_DAY_REWARD: 'dic_army_activeDayReward', + DIC_ACTIVE_WEEK_REWARD: 'dic_army_activeWeekReward', DIC_MAIL: 'dic_email_content', DIC_ARMY_TRAIN_JU_DIAN: 'dic_army_trainJuDian', DIC_ARMY_TRAIN_SOLO_REWARD: 'dic_army_trainSoloReward', diff --git a/shared/resource/jsons/dic_zyz_gk_activity_sztm.json b/shared/resource/jsons/dic_zyz_gk_activity_sztm.json index 6f6723f2e..c4055f004 100644 --- a/shared/resource/jsons/dic_zyz_gk_activity_sztm.json +++ b/shared/resource/jsons/dic_zyz_gk_activity_sztm.json @@ -6,13 +6,13 @@ "bg_img": 50001, "mapid": 50001, "script_id": "S_50001", - "fixReward": "17041&1|40003&50", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘1", + "gk_name": "神州探秘&五行开关", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&机关顺序错误", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -33,13 +33,13 @@ "bg_img": 50001, "mapid": 50001, "script_id": "S_50002", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘2", + "gk_name": "神州探秘&五行开关", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&机关顺序错误", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -60,13 +60,13 @@ "bg_img": 50001, "mapid": 50001, "script_id": "S_50003", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘3", + "gk_name": "神州探秘&五行开关", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&机关顺序错误", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -85,15 +85,15 @@ "war_id": 50004, "dispatchJsonId": 50004, "bg_img": 50002, - "mapid": 50002, + "mapid": 50004, "script_id": "S_50004", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘4", + "gk_name": "神州探秘&险境求生", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&未逃出洞窟", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -114,13 +114,13 @@ "bg_img": 50002, "mapid": 50002, "script_id": "S_50005", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘5", + "gk_name": "神州探秘&险境求生", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&未逃出洞窟", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -141,13 +141,13 @@ "bg_img": 50002, "mapid": 50002, "script_id": "S_50006", - "fixReward": "17041&1|40003&51", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘6", + "gk_name": "神州探秘&险境求生", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&未逃出洞窟", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -168,13 +168,13 @@ "bg_img": 50003, "mapid": 50003, "script_id": "S_50007", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘7", + "gk_name": "神州探秘&搬山卸岭", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&两名以上盗贼逃跑", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -195,13 +195,13 @@ "bg_img": 50003, "mapid": 50003, "script_id": "S_50008", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘8", + "gk_name": "神州探秘&搬山卸岭", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&两名以上盗贼逃跑", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘", @@ -222,13 +222,13 @@ "bg_img": 50003, "mapid": 50003, "script_id": "S_50009", - "fixReward": "42002&10|40009&200|17047&1", + "fixReward": "11002&10|40009&30|71009&5", "jackpotReward": "17002&1|17003&1|17004&1|17005&1|17006&1|17007&1|17008&1|17009&2", "warType": 15, - "gk_name": "神州探秘9", + "gk_name": "神州探秘&搬山卸岭", "lvLimted": 1, "victoryInfoInUI": "消灭所有敌军", - "loseInfoInUI": "我方全部阵亡", + "loseInfoInUI": "我方全部阵亡&两名以上盗贼逃跑", "cost": 0, "iconInMap": "zixunbao1&", "iconName": "神州探秘",