diff --git a/config/Activity.xlsx b/config/Activity.xlsx
index 27c0ed15..388828d8 100644
Binary files a/config/Activity.xlsx and b/config/Activity.xlsx differ
diff --git a/config/AllLanguage.xlsx b/config/AllLanguage.xlsx
index 14a67dea..dfef6768 100644
Binary files a/config/AllLanguage.xlsx and b/config/AllLanguage.xlsx differ
diff --git a/config/BonusValue.xlsx b/config/BonusValue.xlsx
index d7972fe1..db3944cb 100644
Binary files a/config/BonusValue.xlsx and b/config/BonusValue.xlsx differ
diff --git a/config/Card.xlsx b/config/Card.xlsx
index 2ac8097f..bbf2259c 100644
Binary files a/config/Card.xlsx and b/config/Card.xlsx differ
diff --git a/config/Champship.xlsx b/config/Champship.xlsx
index b8d2041f..31a5b50d 100644
Binary files a/config/Champship.xlsx and b/config/Champship.xlsx differ
diff --git a/config/Constant.xlsx b/config/Constant.xlsx
index 4911e339..4aa2a38f 100644
Binary files a/config/Constant.xlsx and b/config/Constant.xlsx differ
diff --git a/config/DailyTask.xlsx b/config/DailyTask.xlsx
index 09ed5cba..2323457c 100644
Binary files a/config/DailyTask.xlsx and b/config/DailyTask.xlsx differ
diff --git a/config/DecorateCost.xlsx b/config/DecorateCost.xlsx
index d8bf1832..4821ee60 100644
Binary files a/config/DecorateCost.xlsx and b/config/DecorateCost.xlsx differ
diff --git a/config/DialogueData.xlsx b/config/DialogueData.xlsx
index 8eb2318c..ceffcfe2 100644
Binary files a/config/DialogueData.xlsx and b/config/DialogueData.xlsx differ
diff --git a/config/Item.xlsx b/config/Item.xlsx
index 2fbf1b0d..ebf42fda 100644
Binary files a/config/Item.xlsx and b/config/Item.xlsx differ
diff --git a/config/LevelData.xlsx b/config/LevelData.xlsx
index 026dc554..46c35de9 100644
Binary files a/config/LevelData.xlsx and b/config/LevelData.xlsx differ
diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx
index 1bea853a..06673552 100644
Binary files a/config/LimitedTimeEvent.xlsx and b/config/LimitedTimeEvent.xlsx differ
diff --git a/config/MergeData.xlsx b/config/MergeData.xlsx
index 690bd237..07b47b1a 100644
Binary files a/config/MergeData.xlsx and b/config/MergeData.xlsx differ
diff --git a/config/Music.xlsx b/config/Music.xlsx
index a5ef8929..a91faa2f 100644
Binary files a/config/Music.xlsx and b/config/Music.xlsx differ
diff --git a/config/NetAssetData.xlsx b/config/NetAssetData.xlsx
index 4772f93c..39f8b6f9 100644
Binary files a/config/NetAssetData.xlsx and b/config/NetAssetData.xlsx differ
diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx
index 8f8b4f22..ad2b5c8b 100644
Binary files a/config/Playroom.xlsx and b/config/Playroom.xlsx differ
diff --git a/config/SceneData.xlsx b/config/SceneData.xlsx
index 65680075..22790264 100644
Binary files a/config/SceneData.xlsx and b/config/SceneData.xlsx differ
diff --git a/config/StartMerge.xlsx b/config/StartMerge.xlsx
index f4335a22..b7568d89 100644
Binary files a/config/StartMerge.xlsx and b/config/StartMerge.xlsx differ
diff --git a/config/UIForm.xlsx b/config/UIForm.xlsx
index 40397394..8d20e2e5 100644
Binary files a/config/UIForm.xlsx and b/config/UIForm.xlsx differ
diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto
index 37511015..8b80c074 100644
--- a/proto/Gameapi.proto
+++ b/proto/Gameapi.proto
@@ -187,6 +187,7 @@ message ClientReq{   //客户都请求数据
   string userBase = 7;
 }
 
+// 玩家重连
 message ReqOfflineReconnect{
 	int64 dwUin = 1;
 	
@@ -195,6 +196,8 @@ message ResOfflineReconnect{
 	int64 dwUin = 1;
 	int32 Result = 2;
 }
+
+// 绑定facebook
 message ReqBindFacebookAccount{
 	int64 dwUin = 1;
 	string BindAccountId = 2;
@@ -205,7 +208,8 @@ message ResBindFacebookAccount{
 	string BindAccountId = 2;
 	int32 ResultCode = 3;
 }
-////请求强制绑定已绑过其他设备的fb并且不同步数据
+
+//请求强制绑定已绑过其他设备的fb并且不同步数据
 message ReqOnlyBindFacebook{
 	int64 dwUin = 1;
 	string BindAccountId = 2;
@@ -216,7 +220,8 @@ message ResOnlyBindFacebook{
 	string BindAccountId = 2;
 	int32 ResultCode = 3;
 }
-////请求接触绑定
+
+//请求接触绑定
 message ReqUnBindFacebook{
 	int64 dwUin = 1;
 	string BindAccountId = 2;
@@ -226,7 +231,8 @@ message ResUnBindFacebook{
 	int32 ResultCode = 1;
 	string BindAccountId = 2;
 }
-////请求强制绑定已绑过其他设备的fb并且同步数据
+
+//请求强制绑定已绑过其他设备的fb并且同步数据
 message ReqSynGameData{
 	int64 dwUin = 1;
 	string NewFBId = 2;
@@ -236,9 +242,9 @@ message ResSynGameData{
 	int64 dwUin = 1;
 	int32 ResultCode = 2;
 }
-message ForceKickOut{
-	
-}
+
+// 强制踢出
+message ForceKickOut{}
 message ResServerVersion{
 	int32 Version = 1;
 }
@@ -250,7 +256,8 @@ message ClientRes{   //客户都请求数据返回 和主动推送
   	string cid = 2;
   	bytes info = 3;
 }
-////请求注册账号
+
+//请求注册账号
 message ReqRegisterAccount{
 	string UserName = 1;
 	string UserPwd = 2;
@@ -258,11 +265,12 @@ message ReqRegisterAccount{
 	string Device = 4; // 设备标识
 }
 
-////响应注册账号
+//响应注册账号
 message ResRegisterAccount{
 	int32 ResultCode = 1;
 }
-////请求登录
+
+//请求登录
 message ReqLogin{
 	string UserName = 1;
 	string UserPwd = 2; 
@@ -271,6 +279,7 @@ message ReqLogin{
 	LOGIN_TYPE type = 5; // 登录方式
 }
 
+//验证码登录
 message ReqLoginCode{
  string TelPhone = 1; // 手机号码
 }
@@ -281,6 +290,7 @@ message ResLoginCode{
  string Code = 3; // 验证码 TODO 测试
 }
 
+// 身份证验证
 message ReqId2Verify{
  string Id = 1; // 身份证号码
  string Name = 2; // 姓名
@@ -291,7 +301,7 @@ message ResId2Verify{
 	string Msg = 2; // 错误信息
 }
 
-////响应登录
+//登录
 message ResLogin{
 	int32 ResultCode = 1;
 	int64 dwUin = 2;
@@ -300,6 +310,7 @@ message ResLogin{
 	string Msg = 5;	// 错误信息
 }
 
+//修改密码
 message ReqChangePassword{
 	string UserName = 1;
 	string OldPwd = 2; // -1表示不校验旧密码
@@ -310,7 +321,7 @@ message ResChangePassword{
 	int32 ResultCode = 1;
 }
 
-///请求玩家基本信息（玩家登入成功后，第一条请求信息）
+//请求玩家基本信息（玩家登入成功后，第一条请求信息）
 message ReqPlayerBaseInfo{
 	int64 dwUin = 1;
 }
@@ -342,7 +353,10 @@ message ResPlayerBaseInfo{
 	string FaceBookId = 23;
 	int32 register_time = 24;
 }
+
+// 请求玩家资产
 message ReqPlayerAsset{}
+
 // 玩家资产
 message ResPlayerAsset{
 	int64 dwUin = 1;
@@ -369,11 +383,12 @@ message NotifyRenewBuyEnergyCnt{
 	int32 CurCnt = 2;
 }
 
-///请求移除广告
+//请求移除广告
 message ReqRemoveAd {
   int64 dwUin = 1;
 }
-////响应移除广告
+
+//响应移除广告
 message ResRemoveAd {
   int32 ResultCode = 1;
 }
@@ -383,17 +398,18 @@ message NotifyAddEnergy{
 	int64 dwUin = 1;
 	int32 addCnt = 2;
 }
-///请求服务器时间
+
+//请求服务器时间
 message ReqServerTime {
   int64 dwUin = 1;
 }
-////响应服务器时间
+
+//响应服务器时间
 message ResServerTime {
   int32 ServerTime = 1;
 }
 
-/////////////请求棋盘数据
-
+//请求棋盘数据
 message ReqPlayerChessData{
   int64 dwUin = 1;
 }
@@ -415,6 +431,7 @@ message ResPlayerChessInfo{
 	repeated string RetireReward = 7; // 退役奖励
 }
 
+// 获取已退役的发射器
 message ReqGetChessRetireReward{
 	string Id = 1; // 发射器系列ID：A、B、C...
 }
@@ -434,6 +451,7 @@ message PartBagGrid{
 	int32 Count = 2; //数量
 }
 
+// 将棋子放入背包
 message ReqPutPartInBag{
 	int32 ChessId = 1; //零件ID
 	map<string, int32> mChessData = 2;
@@ -454,7 +472,7 @@ message ChessHandle{
 	repeated int32 ActType = 5; // 活动类型
 }
 
-/////同步棋盘数据
+//同步棋盘数据
 message UpdatePlayerChessData{
 	int64 dwUin = 1;
 	map<string, int32> mChessData = 2;
@@ -466,7 +484,7 @@ message ResUpdatePlayerChessData{
     string msg = 2;
 }
 
-// 分离器
+// 使用分离器
 message ReqSeparateChess{
 	int32 ChessId = 1;
 	map<string, int32> mChessData = 2;
@@ -477,7 +495,7 @@ message ResSeparateChess{
 	string msg = 2;
 }
 
-// 神奇魔术棒（升级器）
+// 使用神奇魔术棒（升级器）
 message ReqUpgradeChess{
 	int32 ChessId = 1;
 	map<string, int32> mChessData = 2;
@@ -506,6 +524,7 @@ enum CHESS_EX_TYPE {
 	CHESS_EX_QUICK_BUY = 3; // 快捷购买
 	CHESS_EX_EVENT = 4; // 限时事件气泡
 	CHESS_EX_EVENT_LITTLE_APPRENTICE = 5; // 限时事件小学徒
+	CHESS_EX_EMIT_ROLLBACK = 6; // 发射器回退
 }
 
 // 棋子转换
@@ -585,6 +604,16 @@ message ResTakeChessOutBag{
 	string msg = 2;
 }
 
+// 从背包中放入荣誉室
+message ReqTakeChessOutBagToHonor{
+	int32 BagId = 1;
+}
+
+message ResTakeChessOutBagToHonor{
+	RES_CODE code = 1;
+	string msg = 2;
+}
+
 // 购买棋盘格子
 message ReqBuyChessBagGrid{
 }
@@ -647,9 +676,9 @@ enum LANG_TYPE {
 	LANG_ES_LATAM = 3;// 西班牙语-拉丁美洲
 }
 
-// 设置能量倍数
+// 设置语言
 message ReqLang{
-	LANG_TYPE Lang = 1; // 语言 1 英文 0 中文
+	LANG_TYPE Lang = 1; // 语言 0 中文 1 英文 2 葡萄牙语 3 西班牙语-拉丁美洲
 }
 
 message ResLang{
@@ -720,6 +749,7 @@ message ResGetEnergyByAD{
 	string Msg = 2;
 }
 
+// 获取图鉴奖励
 message ReqGetHandbookReward {
 	int32 ChessId = 1;
 }
@@ -739,6 +769,7 @@ message Handbook {
 	repeated string Collect = 2;// 全收集奖励
 }
 
+// 领取系列全收集奖励
 message RegHandbookAllReward{
 	string Type = 1; // "棋子系列 A B C"
 }
@@ -748,7 +779,7 @@ message ResHandbookAllReward{
 	string Msg = 2;
 }
 
-
+// 领取订单奖励
 message ReqRewardOrder{
 	int32 OrderId = 1;
 	map<string, int32> mChessData = 2;
@@ -760,6 +791,7 @@ message ResRewardOrder{
 	string Msg = 2;
 }
 
+// 生成消耗品订单
 message ReqCreatePetOrder{}
 
 // 删除订单
@@ -817,15 +849,14 @@ message ResDecorate{
 }
 
 // 一键装饰
-message ReqDecorateAll{
-
-}
+message ReqDecorateAll{}
 
 message ResDecorateAll{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
 
+// 获取
 message ReqAreaReward{
  int32 AreaId = 1;
 }
@@ -848,6 +879,7 @@ message Card {
 	int32 Count = 2;
 }
 
+// 获取卡片详情
 message ReqCardInfo{}
 
 message ResCardInfo{
@@ -875,6 +907,7 @@ message ResNotifyCardTimes{
 	int32 GoldTimes = 5; //剩余金卡交换次数
 }
 
+// 获取卡牌第一赛季奖励
 message ReqCardSeasonFirstReward{}
 
 message ResCardSeasonFirstReward{
@@ -927,9 +960,7 @@ message ResExStarReward{
 }
 
 // 领取全收集奖励
-message ReqAllCollectReward{
-	
-}
+message ReqAllCollectReward{}
 
 message ResAllCollectReward{
 	RES_CODE Code = 1;
@@ -1016,6 +1047,7 @@ message ResAgreeCardExchange{
 	string Id = 3;
 	int32 Emoji = 4; // 表情Id
 }
+
 // 拒绝选择卡牌进行交换
 message ReqRefuseCardSelect{
 	string Id = 1;
@@ -1025,6 +1057,7 @@ message ResRefuseCardSelect{
 	string Msg = 2;
 	string Id = 3;
 }
+
 // 拒绝卡牌交换
 message ReqRefuseCardExchange{
 	string Id = 1;
@@ -1055,7 +1088,6 @@ message ResGetGoldCard{
     int32 Five = 2; // 五星金卡
 }
 
-
 // 领取引导奖励
 message ReqGuideReward{
 	int32 Id = 1;
@@ -1066,6 +1098,7 @@ message ResGuideReward{
 	string Msg = 2;
 }
 
+// playroom引导接口
 message ReqGuidePlayroom{
 	int32 Id = 1;
 }
@@ -1075,15 +1108,11 @@ message ResGuidePlayroom{
 	string Msg = 2;
 }
 
-message ResGuildInfo{
-	map<int32, int32> Reward = 1;
-}
 message ResGuideInfo{
 	map<int32, int32> Reward = 1;
 }
 
 // 弹窗
-
 message ResItemPop{
 	int32 Id = 1;
 	repeated ItemInfo Items = 2; // 道具
@@ -1091,10 +1120,6 @@ message ResItemPop{
 	string Lable = 4; // 标签
 }
 
-
-
-
-
 message ItemInfo{
 	int32 Id = 1;
 	int32 Num = 2;
@@ -1116,12 +1141,14 @@ message ResGuideTask{
 	int32 Active = 3; //活跃度
 	int32 UnlockTime = 4; // 功能解锁时间
 }
+
 message GuideTask{
 	int32 Status = 1;	//状态 0:未完成， 1已完成 2已领取
 	QuestProgress Progress = 2; //任务进度
 	int32 Id = 3; //任务id
 }
 
+// 获取新手任务奖励
 message ReqGetGuideTaskReward{
 	int32 Id = 1;// 任务id
 }
@@ -1132,6 +1159,7 @@ message ResGetGuideTaskReward{
 	int32 Id = 3;// 任务id
 }
 
+// 获取新手任务进度奖励
 message ReqGetGuideActiveReward{
 	int32 Id = 1;// 进度奖励id
 }
@@ -1151,8 +1179,6 @@ message ResDailyTask{
 	int32 WeekEnd = 5; //周结束时间戳
 }
 
-
-
 message DailyWeek{
 	repeated ItemInfo Items = 1; //奖励
 	bool Status = 2; //状态 0:未领取 1:已领取
@@ -1195,13 +1221,15 @@ message ResGetDailyWeekReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
+
+// 日常任务解锁
 message ReqDailyUnlock{}
 message ResDailyUnlock{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
-// 头像
 
+// 头像
 message ResFaceInfo{
 	repeated FaceInfo FaceList = 1;
 	int32 SetId = 2;
@@ -1212,6 +1240,7 @@ message FaceInfo{
 	int64 AddTime = 3; // 添加时间
 }
 
+// 设置头像
 message ReqSetFace{
 	int32 Face = 1;
 }
@@ -1222,7 +1251,6 @@ message ResSetFace{
 }
 
 // 头像框
-
 message ResAvatarInfo{
 	repeated AvatarInfo AvatarList = 1;
 	int32 SetId = 2;
@@ -1233,6 +1261,8 @@ message AvatarInfo{
 	int64 EndTime = 2; // 结束时间
 	int64 AddTime = 3; // 添加时间
 }
+
+// 设置头像框
 message ReqSetAvatar{
 	int32 Avatar = 1;
 }
@@ -1276,6 +1306,7 @@ message SevenLoginReward{
 	int32 Id = 5; //id
 	int32 NeedActive = 6; // 需要的进度
 }
+
 // 领取周奖励
 message ReqGetSevenLoginReward{
 	int32 Id = 1;
@@ -1336,9 +1367,7 @@ message ResActivityReward{
 }
 
 // 领取买一赠一奖励
-message ReqAddGiftReward{
-
-}
+message ReqAddGiftReward{}
 
 message ResAddGiftReward{
 	RES_CODE Code = 1;
@@ -1357,7 +1386,9 @@ message ResLimitEventProgress{
 	int32 Progress = 2; //进度
 	map<int32, int32> ProgressReward = 3; //奖励 可以选择的奖励 Id =》 RewardId
 }
-message ReqLimitEventReward{ // 领取限时事件奖励
+
+// 领取限时事件奖励
+message ReqLimitEventReward{ 
 	int32 Id = 1; 
 }
 
@@ -1366,6 +1397,7 @@ message ResLimitEventReward{
 	string Msg = 2;
 }
 
+// 选择限时事件
 message ReqSelectLimitEvent{
     int32 Id = 1;
 }
@@ -1401,6 +1433,7 @@ message LimitEventNotify {
 	int32 Cd = 4; //cd
 }
 
+// 领取幸运猫奖励
 message ReqLimitEventLuckyCat{
 	int32 ChessId = 1;
 	map<string, int32> mChessData = 2;
@@ -1411,7 +1444,7 @@ message ResLimitEventLuckyCat{
 	string Msg = 2;
 }
 
-
+// 领取场景冲刺奖励
 message ReqLimitSenceReward{}
 
 message ResLimitSenceReward{
@@ -1424,6 +1457,7 @@ message ResChessRainReward{
 	int32 Id = 2; // 转盘id
 }
 
+// 连击快手
 message ReqFastProduceInfo{}
 message ResFastProduceInfo{
 	int32 Energy = 1; // 快手能量
@@ -1443,6 +1477,7 @@ message ResFastProduceReward{
 	int32 Num = 4;
 }
 
+// 领取猫咪戏法奖励
 message ReqCatTrickReward{}
 
 message ResCatTrickReward{
@@ -1464,9 +1499,11 @@ message ResSearchPlayer{
 	repeated ResPlayerSimple List = 2;
 }
 
+// 获取好友详情
 message ReqFriendPlayerSimple{
 	int64 Uid = 1;
 }
+
 message ResFriendPlayerSimple{
 	int64 Uid = 1;
 	string Name = 2;
@@ -1531,8 +1568,6 @@ enum ActLogType {
 	ACT_LOG_TYPE_LOST_USER_RETURN = 23; // 流失用户回归
 }
 
-
-
 message ActLog {
 	int32 Type = 1;
 	int64 Time = 2;
@@ -1593,6 +1628,7 @@ message ResFriendCard{
 	int32 Emoji = 12; // 表情Id
 }
 
+// 设置kv
 message ReqKv{
 	int32 key = 1;
 	string value = 2;
@@ -1602,6 +1638,7 @@ message ResKv{
 	map<int32, string> kv = 1;
 }
 
+// 通过好友码获取玩家信息
 message ReqFriendByCode{
 	string Code = 1; // 邀请码
 }
@@ -1619,7 +1656,7 @@ message ResFriendRecommend{
 	repeated ResPlayerSimple List = 1;
 }
    
-   // 隐藏
+// 隐藏
 message ReqFriendIgnore{
 	int64 Uid = 1;
 }
@@ -1629,8 +1666,6 @@ message ResFriendIgnore{
 	string Msg = 2;   
 }
    
-
-
 // 好友基础信息
 message ReqFriendList{}
 message ResFriendList{
@@ -1640,33 +1675,41 @@ message ResFriendList{
 	int32 Sponsor = 4; // 今日赞助次数
 }
 
+// 添加NPC好友
 message ReqAddNpc{
 	int32 NpcId = 1;
 }
+
 message ResAddNpc{
 	RES_CODE Code = 1;
 	string Msg = 2;
 	int32 NpcId = 3;
 }
+
 // 好友申请列表
 message ReqFriendApply{
 	int32 Type = 1; // 玩家通过x途径添加好友：0.默认途径；1.好友码
 }
+
 message ResFriendApply{
 	repeated ResFriendApplyInfo ApplyList = 1; 
 }
+
 message ResFriendApplyInfo{
 	ResPlayerSimple Player = 1;
 	int32 Time = 2;
 }
+
 // 好友卡牌交换列表
 message ReqFriendCardMsg{}
+
 message ResFriendCardMsg{
 	repeated ResFriendCard MsgList = 1;
 }
 
 // 好友心愿单请求列表
 message ReqWishApplyList{}
+
 message ResWishApplyList{
 	repeated ResFriendApplyInfo ApplyList = 1;
 }
@@ -1684,6 +1727,7 @@ message ResWishApply{
 
 // 好友时间线
 message ReqFriendTimeLine{}
+
 message ResFriendTimeLine{
 	repeated ResFriendLog Log = 1;
 	repeated ResFriendReply Reply = 2;
@@ -1845,9 +1889,11 @@ message ResRank{
 
 // 邮件列表
 message ReqMailList{}
+
 message ResMailList{
 	map<int32, MailInfo> MailList = 1;
 }
+
 message MailInfo{
 	int32 Id = 1; // 邮件id
 	string Title = 2; // 标题
@@ -1867,9 +1913,11 @@ message MailInfo{
 	string SubTitleEsLa = 16; // 西班牙语子标题
 	string ContentEsLa = 17;// 西班牙语内容
 }
+
 message MailNotify {
     MailInfo Info = 1;
 }
+
 // 读邮件
 message ReqReadMail{
 	int32 Id = 1;
@@ -1904,7 +1952,6 @@ message ResDeleteMail{
 }
 
 // 充值
-
 message ResCharge{
 	float Charge = 1; // 总充值金额
 	int32 Total = 2; // 总充值次数
@@ -1955,6 +2002,7 @@ message ResAddWish{
 
 // 领取心愿单奖励
 message ReqGetWish{}
+
 message ResGetWish{
 	RES_CODE Code = 1;
 	string Msg = 2;
@@ -2003,10 +2051,12 @@ message ReqBuyChessShop2{
 	int32 Id = 1;
 	map<string, int32> mChessData = 2;
 }
+
 message ResBuyChessShop2{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
+
 // 刷新棋子商店
 message ReqRefreshChessShop{}
 
@@ -2015,6 +2065,7 @@ message ResRefreshChessShop{
 	string Msg = 2;
 }
 
+// 无尽礼包详情
 message ReqEndless{}
 
 message ResEndless{
@@ -2028,8 +2079,8 @@ message ResEndlessInfo{
 	repeated ItemInfo Items = 3;
 }
 
-message ReqEndlessReward{
-}
+// 领取无尽礼包奖励
+message ReqEndlessReward{}
 
 message ResEndlessReward{
 	RES_CODE Code = 1;
@@ -2043,7 +2094,8 @@ message ResPiggyBank{
 	int32 EndTime = 4; // 结束时间 当前存钱罐结束时间
 }
 
-message ReqPiggyBankReward{} // 领取猪猪银行奖励
+// 领取猪猪银行奖励
+message ReqPiggyBankReward{} 
 
 message ResPiggyBankReward{
 	RES_CODE Code = 1;
@@ -2060,6 +2112,7 @@ message ResChargeReceive{
 	string Msg = 2;
 }
 
+// 创建订单
 message ReqCreateOrderSn{
 	int32 ChargeId = 1;
 	string PlatForm = 2; // 平台标识 测试用test
@@ -2072,6 +2125,7 @@ message ResCreateOrderSn{
 	string OrderSn = 1; // 订单号
 }
 
+// 发货
 message ReqShippingOrder{
 	string OrderSn = 1; // 订单号
 	string ProduceId = 2; // 商品Id
@@ -2084,6 +2138,7 @@ message ResShippingOrder{
 	string Msg = 2;
 }
 
+// 获取锦标赛详情
 message ReqChampship{}
 
 message ResChampship{
@@ -2098,26 +2153,34 @@ message ResChampship{
 	int32 YesterdayActivityId = 9;//昨日生效的活动类型
 }
 
+// 获取锦标赛奖励
 message ReqChampshipReward{}
 
 message ResChampshipReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
+
+// 获取锦标赛排行奖励
 message ReqChampshipRankReward{}
+
 message ResChampshipRankReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
 
+// 获取锦标赛详情
 message ReqChampshipRank{}
+
 message ResChampshipRank{
  	map<int32, ResPlayerRank> RankList = 1; // 榜单数据
  	int32 MyRank = 2; // 我的排行
  	float MyScore = 3; //我的积分
 }
 
+// 获取锦标赛昨日排行
 message ReqChampshipPreRank{}
+
 message ResChampshipPreRank{
  	map<int32, ResPlayerRank> RankList = 1; // 榜单数据
  	int32 MyRank = 2; // 我的排行
@@ -2131,6 +2194,7 @@ message ResNotifyCard{
 	map<int32, int32> Handbook = 4; // 图鉴
 }
 
+// 设置facebook链接
 message ReqSetFacebookUrl{
 	string Url = 1;
 }
@@ -2144,11 +2208,13 @@ message ResSetFacebookUrl{
 message ReqInviteFriendData{
 	int64 dwUin = 1;
 }
+
 message ResInviteFriendData{
 	repeated int32 IdLists = 1;
 	int32 GetIndex = 2;
 }
 
+// 自动邀请好友
 message ReqSelfInvited{
 	int64 InviterId = 1;
 }
@@ -2161,6 +2227,7 @@ message NotifyInvitedSuccess{
 	repeated int32 IdLists = 2;
 }
 
+// 获取邀请好友奖励
 message ReqGetInviteReward{
 	int32 GetIndex = 1;
 }
@@ -2169,18 +2236,20 @@ message ResGetInviteReward{
 	int32 ResultCode = 1;
 }
 
-///请求自动添加facebook好友
-
+// 请求自动添加facebook好友
 message ReqAutoAddInviteFriend{
 	int64 id = 1; // uid
 }
+
 message ResAutoAddInviteFriend{
 	int32 ResultCode = 1;
 }
 
+// 请求自动添加facebook好友
 message ReqAutoAddInviteFriend2{
 	string id = 1; // facebook id
 }
+
 message ResAutoAddInviteFriend2{
 	int32 ResultCode = 1;
 }
@@ -2198,15 +2267,20 @@ message ResMining{
 	int32 Mining = 8; // 本关挖矿次数
 	map<int32 , ItemList>  PassReward = 9 ;// 每个关卡的奖励
 }
+// 挖矿
 message ReqMiningTake{
 	map<int32, string> Map = 1; // 地图
 	int32 Gem = 2; // 解锁的宝石
 }
+
 message ResMiningTake{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
+
+// 领取挖矿奖励
 message ReqMiningReward{}
+
 message ResMiningReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
@@ -2225,8 +2299,8 @@ message ResActPass{
 	bool HighPass = 9; // 是否购买高级通行证
 }
 
-message ReqActPassReward{
-}
+// 获取通行证奖励
+message ReqActPassReward{}
 
 message ResActPassReward{
 	RES_CODE Code = 1;
@@ -2237,11 +2311,13 @@ message ResActPassReward{
 message ResActRed{
 	map<int32, int32> Red = 1; // 活动红点
 }
+
 // 活动红点通知
 message NotifyActRed{
 	int32 Id = 1;
 	int32 Red = 2;
 }
+
 // 活动更新通知
 message ActivityNotify {
     ActivityInfo Info = 1;
@@ -2299,6 +2375,7 @@ message ResGuessColorReward{
 	string Msg = 2;
 }
 
+// 赛跑
 message ReqRace{}
 message ResRace{
 	int32 Id = 1; // 活动id
@@ -2321,7 +2398,7 @@ message raceopponent{
 	int32 Progress = 5;
 }
 
-
+// 开始游戏
 message ReqRaceStart{}
 message ResRaceStart{
 	RES_CODE Code = 1;
@@ -2400,6 +2477,11 @@ message NotifyPlayroomTask{
 	repeated int32 DailyTaskReward = 2; // 任务大奖励
 }
 
+// playroom小游戏破产通知
+message NotifyPlayroomBroken{
+	ResPlayerSimple Player = 1;
+}
+
 
 // 领取任务奖励
 message ReqPlayroomTask{
@@ -2423,6 +2505,7 @@ message ResPlayroomTaskReward{
 	int32 Type = 4; // 领奖类型 1 2
 }
 
+// 解锁房间
 message ReqPlayroomUnlock{
 	int32 Id = 1; // 房间id
 }
@@ -2433,6 +2516,7 @@ message ResPlayroomUnlock{
 	int32 Id = 3; // 房间id
 }
 
+// 点赞playroom
 message ReqPlayroomUpvote{
 	int64 Id = 1; // 对手id
 }
@@ -2468,6 +2552,7 @@ message PlayroomCollectInfo{
 	string Label = 4; // 标签
 }
 
+// 设置宠物服装
 message ReqPlayroomDressSet{
 	map<int32, int32> DressSet = 1; // 服装装饰 位置 =》 服装id
 }
@@ -2477,6 +2562,7 @@ message ResPlayroomDressSet{
 	string Msg = 2;
 }
 
+// 设置空气背包
 message ReqPlayroomPetAirSet{
 	int32 PetAirSet = 1; // 宠物背包设置
 }
@@ -2486,7 +2572,8 @@ message ResPlayroomPetAirSet{
 	string Msg = 2;
 }
 
-message ReqPlayroomWrokOutline{} // 处理离线打工
+// 处理离线打工
+message ReqPlayroomWrokOutline{} 
 message ResPlayroomWrokOutline{
 	RES_CODE Code = 1;
 	string Msg = 2;
@@ -2569,7 +2656,9 @@ message ResPlayroomInfo{
 	map<int32, int32> DressSet = 16; // 服装装饰 位置 =》 服装id
 	int32 Kiss = 17; // 亲吻次数
 	int32 Fur = 18; //宠物毛皮
+	int32 Star = 19; //玩家宠物币
 }
+
 // 请求翻牌
 message ReqPlayroomFlip{
 	int32 Id = 1; // 翻牌位置
@@ -2600,6 +2689,7 @@ message ReqPlayroomFlipReward{
 message ResPlayroomFlipReward{
 	RES_CODE Code = 1;
 	string Msg = 2;
+	bool Broken = 3;
 }
 
 message ReqPlayroomGame{
@@ -2645,8 +2735,6 @@ message ResPlayroomSetRoom{
 	string Msg = 2;
 }
 
-
-
 message ReqPlayroomSelectReward{
 	int32 Id = 1; // 奖励id
 	int32 EmojiId = 2; // 表情id
@@ -2737,6 +2825,7 @@ message TreasureInfo{
 	string NickName = 7; // 昵称	
 }
 
+// 开始游戏
 message ReqFriendTreasureStart{
     repeated TreasureInfo List = 1; // 列表
 	repeated int32 List2 = 2;
@@ -2747,14 +2836,15 @@ message ResFriendTreasureStart{
 	string Msg = 2;
 }
 
-message ReqFriendTreasureEnd{
-}
+// 结束游戏
+message ReqFriendTreasureEnd{}
 
 message ResFriendTreasureEnd{
 	RES_CODE Code = 1;
 	string Msg = 2;
 }
 
+// 翻牌
 message ReqFriendTreasureFilp{
 	int32 Pos = 1;
 }
@@ -2785,6 +2875,7 @@ message CollectItem{
 	repeated ItemInfo Items = 2; // 领奖道具
 }
 
+// 领取收集奖励
 message ReqCollect{
 	int32 Id = 1; // 领奖id
 }
@@ -3002,6 +3093,18 @@ message ResActivityCfgReload{
 	string Msg = 2;
 }
 
+message ReqOrderShipping{
+	string OrderSn = 1; // 订单号
+	int32 Status = 2; // 1:支付成功 2:支付失败
+	string ChannelOrderSn = 3; // 渠道订单号
+}
+
+message ResOrderShipping{
+	int32 Code = 1;
+	string Msg = 2;
+}
+
 service Backend {
 	rpc ReloadActivity(ReqActivityCfgReload) returns (ResActivityCfgReload); 
+	rpc OrderShipping(ReqOrderShipping) returns (ResOrderShipping);
 }
\ No newline at end of file
diff --git a/tool/cfg/cfg_txt.json b/tool/cfg/cfg_txt.json
index 0c23e8a3..c0eda7f3 100644
--- a/tool/cfg/cfg_txt.json
+++ b/tool/cfg/cfg_txt.json
@@ -130,18 +130,7 @@
             "string"
          ]
       },
-      {
-         "in_file": "LimitedTimeEvent.xlsx",
-         "out_file": "CatTrickData.txt",
-         "sheet_name": "CatTrick",
-         "coloum_type": [
-            "int",
-            "int",
-            "int",
-            "int",
-            "int"
-         ]
-      },
+
       {
          "in_file": "Champship.xlsx",
          "out_file": "ChampshipCfg.txt",
@@ -1264,6 +1253,16 @@
             "int",
             "string"
          ]
+      },
+            {
+         "in_file": "LimitedTimeEvent.xlsx",
+         "out_file": "LimitedTimeEventConst.txt",
+         "sheet_name": "Const",
+         "coloum_type": [
+            "int",
+            "string",
+            "string"
+         ]
       }
    ]
 }
\ No newline at end of file
diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json
index 74d352da..d697053f 100644
--- a/tool/cfg/cfg_xlsx.json
+++ b/tool/cfg/cfg_xlsx.json
@@ -390,13 +390,6 @@
             "sheet_name" :"Const",
             "fields" :["Value"]
         },
-        {
-            "in_file": "LimitedTimeEvent.xlsx",
-            "out_file": "LimitedTimeEventCatTrick.json",
-            "key": "Type",
-            "sheet_name" :"CatTrick",
-            "fields" :["Duration","Diamond", "Energy"]
-        },
         {
             "in_file": "LimitedTimeEvent.xlsx",
             "out_file": "LimitedTimeEventDecorateOff.json",