diff --git a/config/Item.xlsx b/config/Item.xlsx index b98bd5ff..af21505a 100644 Binary files a/config/Item.xlsx and b/config/Item.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 0ea57b5b..7d59447b 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -367,12 +367,20 @@ message ResGetChessFromBuff{ string msg = 2; } +enum CHESS_EX_TYPE { + CHESS_EX_NONE = 0; // 无 + CHESS_EX_BUBBLE = 1; // 气泡 + CHESS_EX_BOX = 2; // 宝箱解锁 + CHESS_EX_QUICK_BUY = 3; // 快捷购买 + CHESS_EX_EVENT = 4; // 限时事件气泡 +} + // 棋子转换 message ReqChessEx{ int32 OldChessId = 1; int32 NewChessId = 2; int32 CostDia = 3; - int32 Type = 4; //1 气泡 2 宝箱解锁 3 快捷购买 4 限时事件气泡 + CHESS_EX_TYPE Type = 4; //1 气泡 2 宝箱解锁 3 快捷购买 4 限时事件气泡 map mChessData = 5; } @@ -1731,17 +1739,20 @@ message ResRace{ int32 Template = 4; // 模板 int32 Pass = 5; // 关卡 int32 GameStartTime = 6; // 游戏开始时间 - int32 GameEndTime = 7; // 游戏结束时间 + int32 GameEndTime = 7; // 游戏结束时间 int32 Progress = 8; // 进度 repeated raceopponent Opponent = 9; // 对手 } message raceopponent{ int32 Id = 1; - int32 Image = 2; - int32 Progress = 3; + int32 Face = 2; + int32 Avatar = 3; + string Name = 4; + int32 Progress = 5; } + message ReqRaceStart{} message ResRaceStart{ RES_CODE Code = 1;