diff --git a/config/Base.xlsx b/config/Base.xlsx index 5bc44e19..d5e00369 100644 Binary files a/config/Base.xlsx and b/config/Base.xlsx differ diff --git a/config/Charge.xlsx b/config/Charge.xlsx index 9092bb87..2f8a41a4 100644 Binary files a/config/Charge.xlsx and b/config/Charge.xlsx differ diff --git a/config/DecorateCost.xlsx b/config/DecorateCost.xlsx index d0e6d21f..a3db4c0b 100644 Binary files a/config/DecorateCost.xlsx and b/config/DecorateCost.xlsx differ diff --git a/config/Handbook.xlsx b/config/Handbook.xlsx index 0e5d23aa..07544387 100644 Binary files a/config/Handbook.xlsx and b/config/Handbook.xlsx differ diff --git a/config/IndoorProgress.xlsx b/config/IndoorProgress.xlsx index fae54f1e..9951aa4e 100644 Binary files a/config/IndoorProgress.xlsx and b/config/IndoorProgress.xlsx differ diff --git a/config/LevelData.xlsx b/config/LevelData.xlsx index ff9c2939..c87305c1 100644 Binary files a/config/LevelData.xlsx and b/config/LevelData.xlsx differ diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index 06673552..8680a596 100644 Binary files a/config/LimitedTimeEvent.xlsx and b/config/LimitedTimeEvent.xlsx differ diff --git a/config/PromotionPack.xlsx b/config/PromotionPack.xlsx index 5755ea57..bb2c051d 100644 Binary files a/config/PromotionPack.xlsx and b/config/PromotionPack.xlsx differ diff --git a/config/UserData.xlsx b/config/UserData.xlsx index bc697d2a..385ca8c3 100644 Binary files a/config/UserData.xlsx and b/config/UserData.xlsx differ diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index fbe847cb..d7e6d33a 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -2256,9 +2256,7 @@ message ResAutoAddInviteFriend2{ int32 ResultCode = 1; } // 猫猫回礼活动 -message ReqCatReturnGift{ - -} +message ReqCatReturnGift{} message CatReturnGiftCfg{ int32 Skin = 1; // 皮肤id @@ -2282,6 +2280,15 @@ message ResCatReturnGift{ CatReturnGiftCfg Cfg = 6; // 活动配置 } +message ReqCatReturnGiftScore{ + int32 Score = 1; // 本次增加的分数 +} + +message ResCatReturnGiftScore{ + RES_CODE Code = 1; + string Msg = 2; +} + message ReqCatReturnGiftReward{} message ResCatReturnGiftReward{ diff --git a/tool/cfg/cfg_txt.json b/tool/cfg/cfg_txt.json index c0eda7f3..714c5602 100644 --- a/tool/cfg/cfg_txt.json +++ b/tool/cfg/cfg_txt.json @@ -319,6 +319,16 @@ "string" ] }, + { + "in_file": "DecorateCost.xlsx", + "out_file": "DecorateConst.txt", + "sheet_name": "Const", + "coloum_type": [ + "int", + "string", + "string" + ] + }, { "in_file": "DialogueData.xlsx", "out_file": "DialogData.txt",