Merge branch 'main' of gitea.bywaystudios.com:wuminzhe/docs

# Conflicts:
#	config/Charge.xlsx

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;
@@ -1734,6 +1736,7 @@ message ResCharge{
 	float MonthCharge = 13; // 本月充值金额
 	int64 AdEndTime = 14; // 广告礼包结束时间
 	map<int32, WeeklyDiscountInfo> WeeklyDiscount = 15; // 每周优惠 id -> 限购次数
+	int64 PetWorkRemainTime = 16; // 剩余时间
 }
 
 message LogoutPetWork{
@@ -2020,6 +2023,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; // 活动红点
 }

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",