diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx index 03ce7026..b6fd5b29 100644 Binary files a/config/Playroom.xlsx and b/config/Playroom.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index cccd9c2e..cb22469c 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -147,7 +147,7 @@ enum TIME_LINE_TYPE { LOG_TYPE_CARD_EX_SUCCESS_1 = 10; // 卡牌交换成功 LOG_TYPE_CARD_EX_SUCCESS_2 = 11; // 卡牌交换成功 LOG_TYPE_FRIEND_DELETE = 14; // 删除好友 - LOG_TYPE_PLAYROOM_VISIT = 15; // 拜访玩家 + LOG_TYPE_PLAYROOM_VISIT = 15; // 非小猫游戏,他人偷走了玩家的猫币 LOG_TYPE_HANDBOOK = 16; // 图鉴收集 LOG_TYPE_HANDBOOK_UPVOTE = 17; // 图鉴点赞 LOG_TYPE_CHARGE_SEND = 18; // 充值赠送 @@ -157,6 +157,11 @@ enum TIME_LINE_TYPE { LOG_TYPE_PLAYROOM_UPVOTE = 22; // playroom点赞 LOG_TYPE_PLAYROOM_CHAMPSHIP = 23; // 竞标赛排名 LOG_TYPE_TREASURE = 24; // 宠物宝藏 + LOG_TYPE_CARD_SEND_ACCEPT = 25; // 收到赠送卡牌 + LOG_TYPE_PLAYROOM_CAT_WIN = 26; // 小猫游戏,给小猫成功装箱 + LOG_TYPE_PLAYROOM_CAT_LOSE = 27; // 小猫游戏,装箱小猫未成功 + LOG_TYPE_CARD_GIVE_ACCEPT = 28; // 接受卡牌请求 + LOG_TYPE_FRIEND_INVITE = 29; // 邀请注册 } diff --git a/proto/protoToCS.bat b/proto/protoToCS.bat index c2c577f1..598f3f07 100644 --- a/proto/protoToCS.bat +++ b/proto/protoToCS.bat @@ -1,4 +1,4 @@ @echo off REM 设置cs文件的输出目录 -set outDir=F:\Github\aplus-b_-pet_-c_nation\Assets\GameMain\Scripts\Hotfix\CS\Proto +set outDir=D:\Github\aplus-b_-pet_-c_nation\Assets\GameMain\Scripts\Hotfix\CS\Proto protoc.exe --csharp_out=%outDir% *.proto \ No newline at end of file