军团：添加邮件

shared/consts/constModules/sysConst.ts

@@ -307,7 +307,8 @@ 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_ACTIVE_WEEK_REWARD: 'dic_army_activeWeekReward',
+  DIC_MAIL: 'dic_email_army'
 }
 
 export const WAR_RELATE_TABLES = [
@@ -329,4 +330,16 @@ export const EQUIP_STRENGTHEN_TYPE = {
   SINGLE: 1, // 单件单级强化
   SINGLE_QUICK: 2, // 单件一键强化
   ALL_QUICK: 3 // 武将全部装备栏一键强化
-}
+}
+
+// 邮件内容类型
+export const MAIL_TYPE = {
+  SEND_MAIL: 0,
+  GUILD_APPLY_REFUSE: 1,
+  GUILD_BE_IMPEACH: 2,
+  GUILD_BE_SET_LEADER: 3,
+  GUILD_BE_KICK: 4,
+  GUILD_ACTIVE_REWARD: 5,
+  GUILD_BE_SET_MANAGER: 6,
+  GUILD_BE_SET_MEMBER: 7
+};

shared/db/UserGuild.ts

@@ -79,7 +79,7 @@ export default class UserGuild extends BaseModel {
     public static async getListByGuild(guildCode: string, select?: string, sort: { auth?: number, honourWeekly?: number, honourUpdateTime?: number } = {auth: 1}) {
         const userGuilds: UserGuildType[] = await UserGuildModel.find({ guildCode, status: USER_GUILD_STATUS.ON })
         .select(select)
-        .sort({ auth: 1 })
+        .sort(sort)
         .populate('role', 'roleId roleName ce headHid sHid lv title loginTime', 'Role')
         .lean();
         return userGuilds;

shared/pubUtils/data.ts

@@ -48,6 +48,7 @@ import { dicCenterBase, dicEquipPriduceBase, dicBossBase, dicTrainBase, dicDonat
 import { dicGuildActiveDayReward } from './dictionary/DicGuildActiveDayReward';
 import { dicGuildActiveWeekReward } from './dictionary/DicGuildActiveWeekReward';
 import { dicGuildPosition } from "./dictionary/DicGuildPosition";
+import { dicMail } from "./dictionary/DicMail";
 
 export const gameData = {
     blurprtCompose: dicBlueprtCompose,
@@ -119,7 +120,8 @@ export const gameData = {
     structureConsume: dicStructureConsume,
     guildActiveDayReward: dicGuildActiveDayReward,
     guildActiveWeekReward: dicGuildActiveWeekReward,
-    guildPosition: dicGuildPosition
+    guildPosition: dicGuildPosition,
+    mail: dicMail
 };
 
 // 在此提供一些原先在gamedata中提供的方法，以便更方便获取gameData数据

shared/pubUtils/dicParam.ts

@@ -35,6 +35,16 @@ export const PVP = {
   PVP_OPPONENT_FREEREFRESH: 3, // pvp挑战对手每日免费刷新次数
   PVP_WINREWARD_UPLIMIT: 10, // 连胜奖励军功加成上限
 };
-export const GUILD = {
-  GUILD_CREATE_COST: 10, // 创建公会消耗元宝
+export const ARMY = {
+  ARMY_CREAT_COST: 188, // 创建军团需要的元宝
+  ARMY_POSITION_SELL: 30, // 拍卖行职位额外分成占比（%）
+  ARMY_POSITION_WEEKREWARD: 30, // 周奖励职位额外分成占比（%）
+  ARMY_IMPEACH_COST: 30, // 弹劾需要消耗的元宝数量
+  ARMY_DEVELOPMENT_SPEED: 30, // 碎片研发单次加速时间（分钟）
+  ARMY_DEVELOPMENT_SPEEDCOST: 50, // 单次助力加速消耗的元宝
+  ARMY_DEVELOPMENT_SPEEDTMES: 10, // 单个碎片可助力加速的最大次数
+};
+export const TREASURE = {
+  CAPTAIN_DROP: 5, // 普通套装图纸队长必掉落次数
+  TEAMMATE_DROP: 10, // 普通套装图纸队员必掉落次数
 };

shared/pubUtils/dictionary/DicMail.ts

@@ -0,0 +1,20 @@
+// 邮件内容
+import {readJsonFile} from '../util'
+import { FILENAME } from '../../consts'
+
+export interface DicMail {
+    // id MAIL_TYPE
+    readonly id: number;
+    // 内容 %d 替换
+    readonly content: string;
+}
+
+const str = readJsonFile(FILENAME.DIC_MAIL);
+let arr = JSON.parse(str);
+
+export const dicMail = new Map<number, string>();
+
+arr.forEach(o => {
+    dicMail.set(o.id, o.content);
+});
+arr = undefined;

shared/pubUtils/util.ts

@@ -8,7 +8,7 @@ import { DicRandomEffectPool } from './dictionary/DicRandomEffectPool';
 import { HERO_CE_RATIO, ABI_STAGE } from '../consts';
 
 import { findIndex } from 'underscore';
-import { getCurWeekDate, getWeekDate } from './timeUtil';
+import { getWeekDate } from './timeUtil';
 const randomName = require("chinese-random-name");
 const moment = require('moment');
 

shared/resource/jsons/dic_email_army.json

@@ -0,0 +1,30 @@
+[
+    {
+        "id": 1,
+        "content": "您对军团%d的申请被拒绝"
+    },
+    {
+        "id": 2,
+        "content": "由于被弹劾，您在军团%d的大将军职务已卸任"
+    },
+    {
+        "id": 3,
+        "content": "您被任命为军团%d的大将军"
+    },
+    {
+        "id": 4,
+        "content": "您被军团%d踢出"
+    },
+    {
+        "id": 5,
+        "content": "周活跃分成奖励"
+    },
+    {
+        "id": 6,
+        "content": "您被任命为军团%d的管理"
+    },
+    {
+        "id": 7,
+        "content": "您已卸任军团%d的管理"
+    }
+]