Merge branch 'main' into sdk

proto/Gameapi.proto

@@ -79,6 +79,8 @@ enum ITEM_POP_LABEL { // item弹窗标签
 	PetTheif = 71; // 宠物小偷奖励
 	GuideTaskReward = 72; // 新手任务奖励
 	GuideActiveReward = 73; // 新手任务活跃度奖励
+	PassCharge = 74; // 通行证充值
+	ActPassReward = 75; // 通行证奖励
 }
 enum HANDLE_TYPE {
 	ADD = 0;
@@ -339,6 +341,7 @@ message ResPlayerBaseInfo{
 	int32 ChampshipsGroupID = 21;
 	int32 LastChampGroupID = 22;
 	string FaceBookId = 23;
+	int32 register_time = 24;
 }
 message ReqPlayerAsset{}
 // 玩家资产
@@ -1417,6 +1420,28 @@ message ResSearchPlayer{
 	repeated ResPlayerSimple List = 2;
 }
 
+message ReqFriendPlayerSimple{
+	int64 Uid = 1;
+}
+message ResFriendPlayerSimple{
+	int64 Uid = 1;
+	string Name = 2;
+	int32 Face = 3;
+	int32 Avatar = 4;
+	int32 Level = 5;
+	int32 Decorate = 6;
+	int32 login = 7; 
+	int32 loginout = 8;
+	string Facebook = 9;
+	map<int32, int32> Emoji = 10; // 表情
+	int64 AddTime = 11; // 添加时间
+	int64 Interact = 12; // 最后一次互动的时间
+	map<int32, int32> Playroom = 13; // 空间装饰 位置 =》 装饰id
+	map<int32, int32> DressSet = 14; // 服装装饰 位置 =》 服装id
+	repeated int32 Friend = 15; // 好友列表
+	ActLog Last = 16; // 最后一次动态
+}
+
 message ResPlayerSimple{
 	int64 Uid = 1;
 	string Name = 2;
@@ -1432,6 +1457,39 @@ message ResPlayerSimple{
 	int64 Interact = 12; // 最后一次互动的时间
 }
 
+enum ActLogType {
+	ACT_LOG_TYPE_NONE = 0; // 默认
+	ACT_LOG_TYPE_FIRST_LOGIN = 1; // 首次登入游戏
+	ACT_LOG_TYPE_COMPLETE_RESTROOM = 2; // 完成休息室
+	ACT_LOG_TYPE_COMPLETE_RESTAURANT = 3; // 完成餐厅
+	ACT_LOG_TYPE_COMPLETE_BATHROOM = 4; // 完成浴室
+	ACT_LOG_TYPE_COMPLETE_CLOAKROOM = 5; // 完成衣帽间
+	ACT_LOG_TYPE_GET_NEW_AVATAR = 6; // 获得新头像
+	ACT_LOG_TYPE_GET_NEW_AVATAR_FRAME = 7; // 获得新头像框
+	ACT_LOG_TYPE_GET_NEW_EMOTION = 8; // 获得新表情
+	ACT_LOG_TYPE_GET_NEW_DECORATION = 9; // 获得新装饰品
+	ACT_LOG_TYPE_GET_NEW_COSTUME = 10; // 获得新服装
+	ACT_LOG_TYPE_COMPLETE_CARD_ALBUM = 11; // 完成卡册收集
+	ACT_LOG_TYPE_COMPLETE_ALL_CARDS = 12; // 完成全卡牌收集
+	ACT_LOG_TYPE_GET_CHAMPIONSHIP_RANK = 13; // 获得锦标赛名次
+	ACT_LOG_TYPE_GET_CHAMPIONSHIP_PRIZE = 14; // 获得锦标赛大奖
+	ACT_LOG_TYPE_GET_LIMITED_ACTIVITY_PRIZE = 15; // 获得限时活动大奖
+	ACT_LOG_TYPE_JOIN_FRIEND_COOP_ACTIVITY = 16; // 参加好友合作类活动
+	ACT_LOG_TYPE_GET_VISIT_GAME_PRIZE = 17; // 获得拜访小游戏大奖（翻牌）
+	ACT_LOG_TYPE_GET_VISIT_GAME_PRIZE_1 = 18; // 获得拜访小游戏大奖（除翻牌）
+	ACT_LOG_TYPE_OPEN_PET_TREASURE = 19; // 打开宠物宝藏
+	ACT_LOG_TYPE_VISIT_UPVOTE = 20; // 拜访时点赞
+	ACT_LOG_TYPE_COMPLETE_HANDBOOK_ACHIEVEMENT = 21; // 完成图鉴收集成就
+	ACT_LOG_TYPE_COMPLETE_CHAPTER_SCENES = 22; // 完成第X章所有场景
+	ACT_LOG_TYPE_LOST_USER_RETURN = 23; // 流失用户回归
+}
+
+message ActLog {
+	int32 Type = 1;
+	int64 Time = 2;
+	string Param = 3;
+}
+
 message ResPlayerRank{
 	int64 Uid = 1;
 	string Name = 2;
@@ -1732,6 +1790,20 @@ message ResCharge{
 	float TodayCharge = 12; // 今日充值金额
 	float MonthCharge = 13; // 本月充值金额
 	int64 AdEndTime = 14; // 广告礼包结束时间
+	map<int32, WeeklyDiscountInfo> WeeklyDiscount = 15; // 每周优惠 id -> 限购次数
+	int64 PetWorkRemainTime = 16; // 剩余时间
+	int64 WeeklyEndTime = 17; // 每周优惠结束时间
+}
+
+message LogoutPetWork{
+	int64 WorkTime = 1; // 工作时间
+	int64 RemainTime = 2; // 剩余时间
+}
+
+message WeeklyDiscountInfo{
+	int32 Id = 1; // 每周优惠id
+	int32 Count = 2; // 剩余购买次数
+	int32 Discount = 3; // 折扣百分比
 }
 
 message WishList {
@@ -2007,6 +2079,28 @@ message ResMiningReward{
 	string Msg = 2;
 }
 
+// 活动通行证
+message ReqActPass{}
+message ResActPass{
+	int32 Id = 1;  // 活动id
+	int32 Status = 2; // 0 未开始 1 进行中 2 已结束
+	int32 EndTime = 3; // 结束时间
+	int32 Template = 4; // 模板
+	int32 Score = 6; // 经验
+	repeated int32 Reward = 7; // 奖励 已领取的奖励 Id 
+	bool LowPass = 8; // 是否购买低级通行证
+	bool HighPass = 9; // 是否购买高级通行证
+}
+
+message ReqActPassReward{
+}
+
+message ResActPassReward{
+	RES_CODE Code = 1;
+	string Msg = 2;
+	repeated int32 RewardLevel  = 3; // 已领取的奖励 Id
+}
+
 message ResActRed{
 	map<int32, int32> Red = 1; // 活动红点
 }
@@ -2140,6 +2234,7 @@ message ResPlayroom{
 	int64 Revenge = 27; // 复仇Uid
 	repeated AdItem AdItem = 28; // 广告奖励信息
 	FriendRoom Target = 29; // 目标房间
+	map<int32, WeeklyDiscountInfo> WeeklyDiscount = 30; // 每周优惠 id -> 限购次数
 }
 
 message NotifyPlayroomTask{

tool/cfg/cfg_xlsx.json

@@ -535,6 +535,20 @@
             "sheet_name" :"Game",
             "fields" :["Template", "Need", "Items"]
         },
+        {
+            "in_file": "Pass.xlsx",
+            "out_file": "PassTemplate.json",
+            "key": "Id",
+            "sheet_name" :"template",
+            "fields" :["Template", "ProductLv", "LowChargeId", "ItemId","HighChargeId"]
+        },
+        {
+            "in_file": "Pass.xlsx",
+            "out_file": "Pass.json",
+            "key": "Id",
+            "sheet_name" :"Pass",
+            "fields" :["Template", "Level", "NeedScore", "TotalScore", "UnlockDiamond", "FreeReward", "LowReward", "HighReward"]
+        },
         {
             "in_file": "Mining.xlsx",
             "out_file": "MiningTemplate.json",
@@ -638,7 +652,7 @@
             "out_file": "PlayroomShop.json",
             "key": "Id",
             "sheet_name" :"Shop",
-            "fields" :["Type", "ItemId", "Cost","Wish", "Cooldown", "Dailystorage"]
+            "fields" :["Type", "ItemId", "Cost","Wish", "Cooldown", "Dailystorage", "Discount", "Limit"]
         },
         {
             "in_file": "Playroom.xlsx",