diff --git a/shared/db/GroupMail.ts b/shared/db/GroupMail.ts
index 8616bb73f..df4f7b2f2 100644
--- a/shared/db/GroupMail.ts
+++ b/shared/db/GroupMail.ts
@@ -2,9 +2,9 @@
  * 多人邮件
  */
 import MailTemp from './MailTemp';
-import { index, getModelForClass, prop, DocumentType, Ref, mongoose } from '@typegoose/typegoose';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
-import { MAIL_STATUS, MAIL_TYPE } from '../consts/constModules/mailConst';
+import { MAIL_STATUS } from '../consts/constModules/mailConst';
 import { findWhere } from 'underscore';
 
 class RoleStatus {
diff --git a/shared/db/Mail.ts b/shared/db/Mail.ts
index d21469a09..ac14ad6b5 100644
--- a/shared/db/Mail.ts
+++ b/shared/db/Mail.ts
@@ -1,7 +1,7 @@
 import MailTemp from './MailTemp';
-import { index, getModelForClass, prop, DocumentType, Ref, mongoose } from '@typegoose/typegoose';
+import { index, getModelForClass, prop, DocumentType } from '@typegoose/typegoose';
 import { nowSeconds } from '../pubUtils/timeUtil';
-import { MAIL_STATUS, MAIL_TYPE } from '../consts/constModules/mailConst';
+import { MAIL_STATUS } from '../consts/constModules/mailConst';
 
 @index({ roleId: 1 })
 
diff --git a/shared/domain/roleField/mail.ts b/shared/domain/roleField/mail.ts
index 2a2d3487e..110af3173 100644
--- a/shared/domain/roleField/mail.ts
+++ b/shared/domain/roleField/mail.ts
@@ -1,9 +1,8 @@
-import { GM_MAIL_TYPE, MAIL_TYPE, MAIL_STATUS, SEND_NAME } from "../../consts";
+import { GM_MAIL_TYPE, MAIL_STATUS, SEND_NAME } from "../../consts";
 import { ItemReward } from '../dbGeneral';
 import { MailType } from "../../db/Mail";
 import { GroupMailType } from "../../db/GroupMail";
 import { ServerMailType } from '../../db/ServerMail';
-import { GMMailType } from "../../db/GMMail";
 import { gameData } from "../../pubUtils/data";
 
 export class MailParam {
diff --git a/shared/resource/jsons/dic_zyz_activityType.json b/shared/resource/jsons/dic_zyz_activityType.json
index 5ed093510..c24abda4f 100644
--- a/shared/resource/jsons/dic_zyz_activityType.json
+++ b/shared/resource/jsons/dic_zyz_activityType.json
@@ -2,7 +2,7 @@
     {
         "id": 1,
         "activityType": 1,
-        "name": "DAILY_DISCOUNT_GIFT",
+        "name": " DAILY_DISCOUNT_GIFT",
         "string": "七天乐活动"
     },
     {
@@ -27,7 +27,7 @@
         "id": 5,
         "activityType": 5,
         "name": "SIGN_IN_VIP",
-        "string": "活动-高级签到（RMB购买）"
+        "string": "活动-高级（RMB购买）"
     },
     {
         "id": 6,
@@ -128,7 +128,7 @@
     {
         "id": 22,
         "activityType": 22,
-        "name": "DAY_PURCHASE",
+        "name": "DAILY_RMB_GIFTS",
         "string": "活动-每日特惠礼包，一次性购买7天礼包"
     },
     {
@@ -140,70 +140,97 @@
     {
         "id": 24,
         "activityType": 24,
-        "name": "POP_GIFT",
-        "string": "弹出礼包"
+        "name": "POP_UP_SHOP",
+        "string": "弹出商店"
     },
-	{
+    {
         "id": 25,
         "activityType": 25,
         "name": "NEW_PLAYER_SIGN_IN",
         "string": "新手签到活动"
     },
-	{
+    {
         "id": 26,
         "activityType": 26,
         "name": "VIP_RECHARGE_MONEY",
         "string": "vip累计充值RMB活动"
     },
-	{
+    {
         "id": 27,
         "activityType": 27,
         "name": "SEVEN_DAY",
-        "string": "7天乐活动(每日特惠礼包,成长任务活动,今日挑战活动)"
+        "string": "七天乐活动(每日特惠礼包,成长任务活动,今日挑战活动)"
     },
-	{
+    {
+        "id": 28,
         "activityType": 28,
         "name": "FOURTEEN_DAY",
-        "string": "14天乐活动"
+        "string": "十四天乐活动"
     },
-	{
+    {
+        "id": 29,
         "activityType": 29,
         "name": "COMMON_SEVEN_DAY",
         "string": "通用七天乐活动"
     },
-	{
+    {
+        "id": 30,
         "activityType": 30,
         "name": "DAILY_MEAL",
         "string": "每日领取免费午饭、晚饭活动"
     },
-	{
+    {
+        "id": 31,
         "activityType": 31,
         "name": "DAILY_COIN",
         "string": "每日兑换铜钱"
     },
-	{
-		"activityType": 32,
+    {
+        "id": 32,
+        "activityType": 32,
         "name": "DAILY_GK",
         "string": "每日关卡（每日开启一关）"
-	},
-	{
-		"activityType": 33,
+    },
+    {
+        "id": 33,
+        "activityType": 33,
         "name": "REFRESH_SHOP",
         "string": "通用的刷新商店（分页，可刷新，限制购买次数，支持rmb与资源兑换）"
-	},
-	{
-		"activityType": 34,
+    },
+    {
+        "id": 34,
+        "activityType": 34,
         "name": "REFRESH_TASK",
         "string": "通用的刷新任务（分页，可刷新，限制领取次数）"
-	},
-	{
-		"activityType": 35,
+    },
+    {
+        "id": 35,
+        "activityType": 35,
         "name": "MONOPOLY",
         "string": "大富翁游戏"
-	},
-	{
-		"activityType": 36,
+    },
+    {
+        "id": 36,
+        "activityType": 36,
         "name": "COMMON_SIGN_IN",
         "string": "通用签到"
-	}
+    },
+    {
+        "id": 37,
+        "activityType": 37,
+        "name": "NEW_HERO_GIFTS",
+        "string": "新将好礼(很多红包，用积分兑换一遍结束)"
+    },
+    {
+        "id": 38,
+        "activityType": 38,
+        "name": "NEW_HERO_GK",
+        "string": "新将演绎 (配置N个武将，每个武将有X个关卡；活动期间，*天(时间自定义)开启每个武将对应的一个关卡，只有第一次通关会获得奖励)"
+    },
+    {
+        "id": 39,
+        "activityType": 39,
+        "name": "NEW_HERO_GACHA",
+        "string": "新将擢迁（新武将抽取）"
+    }
 ]
\ No newline at end of file