军团活动：排行榜&军功上报

shared/consts/constModules/guildConst.ts

@@ -134,4 +134,18 @@ export enum GUILD_POINT_WAYS {
     TRAIN = 2,             // 训练场
     BOSS_WAR = 3,          // 演武台
     ACTIVITY = 4,          // 军团活动 
+}
+
+// 军团活动id
+export enum GUILD_ACTIVITY_TYPE {
+    GATE_ACTIVITY = 1,      // 蛮夷入侵
+    CITY_ACTIVITY = 2,      // 诸侯混战
+    RACE_ACTIVITY = 3       // 粮草先行
+}
+
+// 军团活动状态
+export enum GUILD_ACTIVITY_STATUS {
+    WAITING = 0,
+    START = 1,
+    END = 2
 }

shared/consts/constModules/sysConst.ts

@@ -231,14 +231,18 @@ export const REDIS_KEY = {
   GUILD_ACTIVE_RANK: "guildActiveRank", // 公会周活跃排行榜
   DB_GAME: 'db_game',                // 服务器列表
   ONLINE_USERS: 'onlineUsers',        // 在线用户情况
-  CHANNEL_SERVERS: 'chat:channelServers',        // 渠道对应的 chat 服务器 Id
+  CHANNEL_SERVERS: 'chat:channelServers',        // 渠道对应的 chat 服务器 Id,
+  USER_GUILD_ACTIVITY: 'usrGuildAct',
+  GUILD_ACTIVITY: 'guildAct',
 }
 
 // 各排行榜对应hash的key
 export const REDIS_RANK_TO_INFO = new Map([
     [REDIS_KEY.TOWER_RANK, REDIS_KEY.USER_INFO],
     [REDIS_KEY.PVP_RANK, REDIS_KEY.USER_INFO],
-    [REDIS_KEY.GUILD_ACTIVE_RANK, REDIS_KEY.GUILD_INFO]
+    [REDIS_KEY.GUILD_ACTIVE_RANK, REDIS_KEY.GUILD_INFO],
+    [REDIS_KEY.GUILD_ACTIVITY, REDIS_KEY.GUILD_INFO],
+    [REDIS_KEY.USER_GUILD_ACTIVITY, REDIS_KEY.USER_INFO]
 ]);
 
 export const FUNC_OPT_TYPE = {
@@ -335,7 +339,9 @@ export const FILENAME = {
     DIC_ARMY_BOSS_RANK_REWARD: 'dic_army_bossrankReward',
     DIC_ARMY_DONATE_BOX_REWARD: 'dic_army_donateBoxReward',
     DIC_ROLE_FRIEND: 'dic_zyz_friends',
-    DIC_ROLE_FRIEND_LEVEL: 'dic_zyz_closelevel'
+    DIC_ROLE_FRIEND_LEVEL: 'dic_zyz_closelevel',
+    DIC_GUILD_ACTIVITY: 'dic_zyz_guildActivity',
+    DIC_GATE_ACTIVITY_POINT: 'dic_zyz_gateActivityPoint'
 }
 
 export const WAR_RELATE_TABLES = [

shared/consts/statusCode.ts

@@ -192,9 +192,12 @@ export const STATUS = {
     GUILD_TRAIN_BOX_INDEX_IS_GOT:{ code: 20972, simStr: '该位置试炼宝箱已经领取过，请重新选择' },
     GUILD_TRAIN_BOX_IS_GOT: { code: 20973, simStr: '玩家已经领取该试炼宝箱' },
 
-    // 军团拍卖
     GUILD_LOT_NOT_FOUND: { code: 21001, simStr: '拍品未找到' },
     LOT_OFFER_SERIAL: { code: 21002, simStr: '不能连续出价' },
+
+    // 军团活动 21100-21199
+    GUILD_ACTIVITY_NOT_OPEN: { code: 21100, simStr: '活动未开放' },
+
     // 通用 30000 - 30099
     DIC_DATA_NOT_FOUND: { code: 30000, simStr: '数据表未找到' },
     ROLE_MATERIAL_NOT_ENOUGH: { code: 30001, simStr: '材料数量不足' },