diff --git a/game-server/app/services/gvg/gvgRecService.ts b/game-server/app/services/gvg/gvgRecService.ts index f7856d0b3..eb1fbc97f 100644 --- a/game-server/app/services/gvg/gvgRecService.ts +++ b/game-server/app/services/gvg/gvgRecService.ts @@ -136,12 +136,12 @@ export function getGuildCodeString(myLeague: GVGLeagueType) { } export async function addTechActivateMessage(roleId: string, roleName: string, myLeague: GVGLeagueType, techId: number) { - const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_LV_UP, JSON.stringify({ leagueCode: myLeague.leagueCode, name: myLeague.name, techId }), '', '', getGuildCodeString(myLeague)); + const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_TECH_ACTIVATE, JSON.stringify({ leagueCode: myLeague.leagueCode, name: myLeague.name, techId }), '', '', getGuildCodeString(myLeague)); await pushGroupMsgToRoom(msgData); } export async function addTechUnlockMessage(roleId: string, roleName: string, myLeague: GVGLeagueType, techId: number) { - const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_LV_UP, JSON.stringify({ leagueCode: myLeague.leagueCode, name: myLeague.name, techId }), '', '', getGuildCodeString(myLeague)); + const msgData = await createGroupMsg(roleId, roleName, CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_TECH_UNLOCK, JSON.stringify({ leagueCode: myLeague.leagueCode, leaderName: roleName, techId }), '', '', getGuildCodeString(myLeague)); await pushGroupMsgToRoom(msgData); } @@ -151,12 +151,12 @@ export async function addVestigeRankMessage(ranks: { rank: number, field: string for(let { rank, field: leagueCode } of ranks) { let league = leagues.find(cur => cur.leagueCode == leagueCode); if(!league) continue; - const msgData = await createGroupMsg('', '', CHANNEL_PREFIX.LEAGUE, leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_LV_UP, JSON.stringify({ leagueCode: league.leagueCode, name: league.name, rank }), '', '', getGuildCodeString(league)); + const msgData = await createGroupMsg('', '', CHANNEL_PREFIX.LEAGUE, leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_VESTIGE_ACCOUNT, JSON.stringify({ leagueCode: league.leagueCode, name: league.name, rank }), '', '', getGuildCodeString(league)); await pushGroupMsgToRoom(msgData); } } export async function addCityGuardMessage(myLeague: GVGLeagueType, cityId: number) { - const msgData = await createGroupMsg('', '', CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_LV_UP, JSON.stringify({ leagueCode: myLeague.leagueCode, name: myLeague.name, cityId }), '', '', getGuildCodeString(myLeague)); + const msgData = await createGroupMsg('', '', CHANNEL_PREFIX.LEAGUE, myLeague.leagueCode, MSG_TYPE.RICH_TEXT, MSG_SOURCE.GVG_OCCUPY_CITY, JSON.stringify({ leagueCode: myLeague.leagueCode, name: myLeague.name, cityId }), '', '', getGuildCodeString(myLeague)); await pushGroupMsgToRoom(msgData); } \ No newline at end of file diff --git a/shared/resource/jsons/dic_zyz_chat_system.json b/shared/resource/jsons/dic_zyz_chat_system.json index 949c24143..77ed35d5a 100644 --- a/shared/resource/jsons/dic_zyz_chat_system.json +++ b/shared/resource/jsons/dic_zyz_chat_system.json @@ -324,7 +324,7 @@ "name": "GVG_TECH_ACTIVATE", "mean": "联军千机阁激活", "type": "7&", - "template": "恭喜百家传人,联军%d已成功激活千机阁%d神机", + "template": "恭喜百家传人,联军%d已成功激活千机阁%d神机:%d", "worldchat": "恭喜各位百家传人,联军%d已成功激活千机阁%d神机:%d", "bubble": "恭喜各位百家传人,联军%d已成功激活千机阁%d神机", "comments": "1:%d(联军名);2:%d(激活的神机名); 3:%d(激活的神机内容)" @@ -337,7 +337,7 @@ "template": "各位百家传人,联军管理%d已解锁千机阁%d神机,可进行捐献激活", "worldchat": "各位百家传人,联军管理%d已解锁千机阁%d神机,可进行捐献激活", "bubble": "各位百家传人,%d神机已解锁", - "comments": "1:%d(激活的神机名)" + "comments": "1.%d(联军管理名) 2:%d(激活的神机名)" }, { "id": 34,