xinyuxi/ZYZ
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

✨ feat(gvg): 添加联军频道

Browse Source
This commit is contained in:
luying
2023-02-21 17:15:15 +08:00
parent 22b3dbc551
commit 3eb6a1045f
19 changed files with 218 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
shared/consts/constModules/chatConst.ts
View File

@@ -26,6 +26,7 @@ export const CHANNEL_PREFIX = {
GVG_AREAS: 'gvgAreas', // 大地图界面
GVG_AREA_BY_TEAM: 'gvgTeam', // 选中玩家队伍后加入频道
GVG_CITY: 'gvgCity', // 玩家进入城池
LEAGUE: 'league', // 联军
}
export const getChannelType = function(prefix: string) {
@@ -42,6 +43,8 @@ export const getChannelType = function(prefix: string) {
return 5;
case CHANNEL_PREFIX.GVG:
return 6;
case CHANNEL_PREFIX.LEAGUE:
return 7;
}
}
@@ -90,6 +93,12 @@ export const MSG_SOURCE = {
LADDER_FIRST_CHANGE: 27,
GET_UR_HERO: 28,
GVG_RECURIT: 29,
GVG_LV_UP: 30,
GVG_NOTICE: 31,
GVG_TECH_ACTIVATE: 32,
GVG_TECH_UNLOCK: 33,
GVG_VESTIGE_ACCOUNT: 34,
GVG_OCCUPY_CITY: 35,
}
export const DEFAULT_MSG_PER_PAGE = 10;

1
shared/consts/statusCode.ts
View File

@@ -344,6 +344,7 @@ export const STATUS = {
GVG_USER_NOT_IN_CITY: { code: 21338, simStr: '您不在该城池中' },
GVG_NOT_BATTLE_PERIOD: { code: 21339, simStr: '您只能在激战期进行此操作' },
GVG_FIELD_HAS_PLANT: { code: 21340, simStr: '该田已种植' },
GVG_NOT_JOIN_LEAGUE: { code: 21341, simStr: '您未加入联军' },
// GVG征战中原
GVG_VESTIGE_ERR: { code: 21350, simStr: '今日未开放该遗迹' },

5
shared/db/GVGLeague.ts
View File

@@ -120,6 +120,11 @@ export default class GVGLeague extends BaseModel {
return leagues
}
public static async findByCodesWithoutPopulate(leagueCodes: string[], select = '') {
const leagues: GVGLeagueType[] = await GVGLeagueModel.find({ leagueCode: { $in: leagueCodes }, status: 1 }).select(select).lean();
return leagues
}
public static async joinGuild(leagueCode: string, guild: GuildType) {
const { code, memberCnt, leader, members } = guild;
let _leader = <RoleType>leader;

7
shared/db/GVGRec.ts
View File

@@ -49,10 +49,15 @@ export default class GVGRec extends BaseModel {
// 查询城池战报
public static async findBattleRecByCity(configId: number, groupKey: string, cityId: number) {
const result: GVGRecType[] = await GVGRecModel.find({ cityId, configId, groupKey, type: GVG_REC_TYPE.BATTLE_BY_CITY }, { _id: 0, recId: 1, params: 1, createTime: 1 }).sort({ createTime: -1 }).limit(50).lean();
const result: GVGRecType[] = await GVGRecModel.find({ configId, groupKey, type: GVG_REC_TYPE.BATTLE_BY_CITY, cityId }, { _id: 0, recId: 1, params: 1, createTime: 1 }).sort({ createTime: -1 }).limit(50).lean();
return result;
}
public static async findBattleRecByGroup(configId: number, groupKey: string) {
const result: GVGRecType[] = await GVGRecModel.find({ configId, groupKey, type: GVG_REC_TYPE.BATTLE_BY_CITY }, { _id: 0, recId: 1, params: 1, createTime: 1 }).sort({ createTime: -1 }).limit(50).lean();
return result;
}
public static async findBattleRecByLeague(configId: number, leagueCode: string) {
const result: GVGRecType[] = await GVGRecModel.find({ configId, leagueCode, type: GVG_REC_TYPE.BATTLE_BY_LEAGUE }, { _id: 0, recId: 1, params: 1, createTime: 1 }).sort({ createTime: -1 }).limit(50).lean();
return result;

3
shared/db/GroupMessage.ts
View File

@@ -42,6 +42,9 @@ export default class GroupMessage extends BaseModel {
@prop({ required: true, default: '' })
content: string; // 消息内容
@prop({ required: true, default: '' })
otherInfo: string; // 其他信息
public static async createMsg(data: GroupMessageParam) {
const result = await GroupMessageModel.findOneAndUpdate({ msgCode: data.msgCode }, {...data}, {upsert: true, new: true}).lean();
return result;

4
shared/resource/jsons/dic_zyz_GVGPeriod.json
View File

@@ -14,7 +14,7 @@
{
"periodType": 3,
"day": "6&",
"startTime": "20:55:00",
"endTime": "23:00:00"
"startTime": "17:00:00",
"endTime": "20:00:00"
}
]

74
shared/resource/jsons/dic_zyz_chat_system.json
View File

@@ -3,7 +3,7 @@
"id": 0,
"name": "ROLE_SEND_TEXT",
"mean": "玩家发送消息",
"type": "2&3&4&5",
"type": "2&3&4&5&6&7",
"template": "<color=#e6a0fb>%d</color>",
"worldchat": "<color=#e6a0fb>%d</color>",
"bubble": "<outline color=#1c1613 width=2><color=#e6a0fb>%d</color></outline>",
@@ -74,9 +74,9 @@
"name": "GUILD_STRUCTURE_LV_UP",
"mean": "军团升级建筑",
"type": "3&",
"template": "<color=#2e190a>恭喜主公，军团</color><color=#e36c31>%d</color><color=#2e190a>已升至</color><color=#cf7515>%d</color><color=#2e190a>级</color>",
"worldchat": "<color=#faf3e0>恭喜各位小主公，军团</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位小主公，军团</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color></outline>",
"template": "<color=#2e190a>恭喜百家传人，军团</color><color=#e36c31>%d</color><color=#2e190a>已升至</color><color=#cf7515>%d</color><color=#2e190a>级</color>",
"worldchat": "<color=#faf3e0>恭喜各位百家传人，军团</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位百家传人，军团</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color></outline>",
"comments": "1:%d(军团名)；2:%d(军团升级后的等级数)"
},
{
@@ -94,9 +94,9 @@
"name": "GUILD_BOSS_SUC",
"mean": "军团BOSS胜利",
"type": "3&",
"template": "<color=#2e190a>恭喜主公，军团BOSS</color><color=#e36c31>%d</color><color=#2e190a>被成功压制,海量拍品已加入拍卖行</color>",
"worldchat": "<color=#faf3e0>恭喜各位小主公，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制,海量拍品已加入拍卖行</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位小主公，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制，拍卖行即将开启</color></outline>",
"template": "<color=#2e190a>恭喜百家传人，军团BOSS</color><color=#e36c31>%d</color><color=#2e190a>被成功压制,海量拍品已加入拍卖行</color>",
"worldchat": "<color=#faf3e0>恭喜各位百家传人，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制,海量拍品已加入拍卖行</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位百家传人，军团BOSS</color><color=#d57e53>%d</color><color=#faf3e0>被成功压制，拍卖行即将开启</color></outline>",
"comments": "1:%d(BOSS名)"
},
{
@@ -298,5 +298,65 @@
"worldchat": "<color=#3bbb7e>%d</color><color=#2e190a>正在扩充兵马：%d，欢迎各军团加入建设</color><color=#308909>",
"bubble": "<outline color=#1c1613 width=2><color=#7feebd>%d</color><color=#faf3e0>正在扩充兵马：%d，欢迎各军团加入建设</color></outline>",
"comments": "1:%d(联军名)；2:%d(联军招募内容)"
},
{
"id": 30,
"name": "GVG_LV_UP",
"mean": "联军升级",
"type": "7&",
"template": "<color=#2e190a>恭喜百家传人，联军</color><color=#e36c31>%d</color><color=#2e190a>已升至</color><color=#cf7515>%d</color><color=#2e190a>级</color>",
"worldchat": "<color=#faf3e0>恭喜各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>已升至</color><color=#ffc600>%d</color><color=#faf3e0>级</color></outline>",
"comments": "1:%d(联军名)；2:%d(联军升级后的等级数)"
},
{
"id": 31,
"name": "GVG_NOTICE",
"mean": "联军修改公告",
"type": "7&",
"template": "<color=#2e190a>公告：%d</color>",
"worldchat": "<color=#faf3e0>公告：%d</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>公告：%d</color></outline>",
"comments": "%d：玩家发送的消息内容"
},
{
"id": 32,
"name": "GVG_TECH_ACTIVATE",
"mean": "联军千机阁激活",
"type": "7&",
"template": "<color=#2e190a>恭喜百家传人，联军</color><color=#e36c31>%d</color><color=#2e190a>已成功激活千机阁</color><color=#cf7515>%d</color><color=#2e190a>神机</color>",
"worldchat": "<color=#faf3e0>恭喜各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>已成功激活千机阁</color><color=#cf7515>%d</color><color=#faf3e0>神机：%d</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>恭喜各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>已成功激活千机阁</color><color=#ffc600>%d</color><color=#faf3e0>神机</color></outline>",
"comments": "1:%d(联军名)；2:%d(激活的神机名); 3:%d(激活的神机内容)"
},
{
"id": 33,
"name": "GVG_TECH_UNLOCK",
"mean": "联军千机阁解锁",
"type": "7&",
"template": "<color=#2e190a>各位百家传人，联军管理</color><color=#e36c31>%d</color><color=#2e190a>已解锁千机阁</color><color=#cf7515>%d</color><color=#2e190a>神机，可进行捐献激活</color>",
"worldchat": "<color=#faf3e0>各位百家传人，联军管理</color><color=#d57e54>%d</color><color=#faf3e0>已解锁千机阁</color><color=#cf7515>%d</color><color=#faf3e0>神机，可进行捐献激活</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>各位百家传人，</color><color=#d57e54>%d</color><color=#faf3e0>神机已解锁</color></outline>",
"comments": "1:%d(激活的神机名)"
},
{
"id": 34,
"name": "GVG_VESTIGE_ACCOUNT",
"mean": "联军遗迹每日22：00结算",
"type": "7&",
"template": "<color=#2e190a>各位百家传人，联军</color><color=#e36c31>%d</color><color=#2e190a>今日遗迹驻扎排名：</color><color=#cf7515>%d</color><color=#2e190a>，奖励已发送至遗迹奖励宝箱</color>",
"worldchat": "<color=#faf3e0>各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>今日遗迹驻扎排名：</color><color=#cf7515>%d</color><color=#faf3e0>，奖励已发送至遗迹奖励宝箱</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>各位百家传人，联军</color><color=#d57e54>%d</color><color=#faf3e0>今日遗迹驻扎排名：</color><color=#ffc600>%d</color>",
"comments": "1:%d(联军名)；2:%d(第X名/未上榜)"
},
{
"id": 35,
"name": "GVG_OCCUPY_CITY",
"mean": "联军城池占领",
"type": "6&7&",
"template": "<color=#2e190a>联军</color><color=#e36c31>%d</color><color=#2e190a>上下一心，成功占领</color><color=#cf7515>%d</color>",
"worldchat": "<color=#faf3e0>联军</color><color=#d57e54>%d</color><color=#faf3e0>上下一心，成功占领</color><color=#cf7515>%d</color>",
"bubble": "<outline color=#1c1613 width=2><color=#faf3e0>联军</color><color=#d57e54>%d</color><color=#faf3e0>上下一心，成功占领</color><color=#ffc600>%d</color>",
"comments": "1:%d(联军名)；2:%d(城池名)"
}
]