Merge branch 'master' of gitlab.trgame.cn:zyztech/zyz_server

shared/consts/constModules/guildConst.ts

@@ -124,6 +124,10 @@ export enum GUILD_DATA_NAME {
     GUILD = 'Guild',
     GUILD_REFINE = 'GuildRefine',
     GUILD_ASSIST_REFINE = 'GuildAssistRefine',
+    UP_STRUCTURE = 'GuildStructure',
+    JOIN_GUILD = 'JoinGuild',
+    REFRESH_ACTIVE = 'GuildRefActive',
+    WEEKLY_GUILD_SUM = 'WeeklyGuildSum',   // 每周结算活跃和奖励
 }
 
 export const GUILD_REPORT_NUM = 40;

shared/consts/statusCode.ts

@@ -147,6 +147,7 @@ export const STATUS = {
     GUILD_ACTIVE_BOX_NOT_FOUND: { code: 20918, simStr: '未找到该活跃宝箱' },
     GUILD_ACTIVE_POINT_NOT_REACH: { code: 20919, simStr: '军团活跃值不足' },
     GUILD_ACTIVE_BOX_HAS_RECEIVED: { code: 20920, simStr: '该活跃宝箱已领取' },
+    GUILD_WEEKLY_SUM: { code: 20921, simStr: '正在周结算中' },
 
     GUILD_SCRIPT_IS_OPENED_TODAY: { code: 20950, simStr: '今日演武场已开启' },
     GUILD_SCRIPT_NOT_OPENED: { code: 20951, simStr: '演武场未开启' },