diff --git a/config/Activity.xlsx b/config/Activity.xlsx index c0c1818c..878aee68 100644 Binary files a/config/Activity.xlsx and b/config/Activity.xlsx differ diff --git a/config/GuessColor.xlsx b/config/GuessColor.xlsx new file mode 100644 index 00000000..0150207b Binary files /dev/null and b/config/GuessColor.xlsx differ diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index 3d23aac3..f50222d7 100644 Binary files a/config/LimitedTimeEvent.xlsx and b/config/LimitedTimeEvent.xlsx differ diff --git a/makedown/optimization.md b/makedown/optimization.md index 0e0576cf..0dd90de2 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -1225,6 +1225,45 @@ message ResMiningReward{ ``` +### 猜颜色 + +```protobuf +//猜颜色 +message ReqGuessColor{} +message ResGuessColor{ + int32 Id = 1; // 活动id + int32 Status = 2; // 0 未开始 1 进行中 2 已结束 + int32 EndTime = 3; // 结束时间 + int32 Template = 4; // 模板 + int32 Pass = 5; // 关卡 + repeated int32 Color = 6; // 剩余的颜色 + repeated int32 Pos = 7; // 已猜中的颜色 位置从左到右 从1开始 + opponent Opponent = 8; // 对手 +} + +message opponent{ + string Name = 2; + int32 Face = 3; + int32 Avatar = 4; + int32 Progress = 5; +} + +message ReqGuessColorTake{ + map Map = 1; // 颜色 pos => color +} + +message ResGuessColorTake{ + RES_CODE Code = 1; + string Msg = 2; +} + +message ReqGuessColorReward{} +message ResGuessColorReward{ + RES_CODE Code = 1; + string Msg = 2; +} +``` + ## 玩家日志 ## 支付订单处理 diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 1649226d..c6a108d9 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -3275,4 +3275,39 @@ message ResItem{ message ItemNotify{ map Item = 1; // 道具id =》 变化的数量 +} + +//猜颜色 +message ReqGuessColor{} +message ResGuessColor{ + int32 Id = 1; // 活动id + int32 Status = 2; // 0 未开始 1 进行中 2 已结束 + int32 EndTime = 3; // 结束时间 + int32 Template = 4; // 模板 + int32 Pass = 5; // 关卡 + repeated int32 Color = 6; // 剩余的颜色 + repeated int32 Pos = 7; // 已猜中的颜色 位置从左到右 从1开始 + opponent Opponent = 8; // 对手 +} + +message opponent{ + string Name = 2; + int32 Face = 3; + int32 Avatar = 4; + int32 Progress = 5; +} + +message ReqGuessColorTake{ + map Map = 1; // 颜色 pos => color +} + +message ResGuessColorTake{ + RES_CODE Code = 1; + string Msg = 2; +} + +message ReqGuessColorReward{} +message ResGuessColorReward{ + RES_CODE Code = 1; + string Msg = 2; } \ No newline at end of file diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index ee172400..ae88a2ec 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -380,6 +380,34 @@ "key": "Id", "sheet_name" :"Gem", "fields" :["Area"] + }, + { + "in_file": "GuessColor.xlsx", + "out_file": "GuessColorTemplate.json", + "key": "Id", + "sheet_name" :"template", + "fields" :["Template", "PassNum", "ItemCost", "ItemId", "FirstPass", "FirstItem"] + }, + { + "in_file": "GuessColor.xlsx", + "out_file": "GuessColorReward.json", + "key": "Id", + "sheet_name" :"Reward", + "fields" :["Template", "Items"] + }, + { + "in_file": "GuessColor.xlsx", + "out_file": "GuessColorPass.json", + "key": "Id", + "sheet_name" :"Pass", + "fields" :["Min", "Max", "Num"] + }, + { + "in_file": "GuessColor.xlsx", + "out_file": "GuessColorJackpot.json", + "key": "Id", + "sheet_name" :"Jackpot", + "fields" :["Icon"] } ] } \ No newline at end of file