From 07b6c734776dfd882b2ebd5b0e05c90bfa502281 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 13 Jan 2025 10:41:37 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0playroom=E9=81=93=E5=85=B7?= =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Playroom.xlsx | Bin 15904 -> 15910 bytes proto/Gameapi.proto | 10 ++++++++++ tool/cfg/cfg_xlsx.json | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/config/Playroom.xlsx b/config/Playroom.xlsx index 9df6870d86cda47909347a650e074c0b9af6d0fd..8eab5328188c52a50aa4132ee50032d8454fe2ee 100644 GIT binary patch delta 5550 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 M7K|q-@voQv1v`8*Z2$lO diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 78459845..a1b1cc9d 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -55,6 +55,7 @@ enum ITEM_POP_LABEL { // item弹窗标签 LimitEventChestRain = 48; // 限时事件宝箱雨 GetEnergyByAD = 49; // 看广告获取体力 SourceChest = 50; // 开启资源宝箱 + PlayroomBuyItem = 51; // playroom打工购买物品 } enum HANDLE_TYPE { ADD = 0; @@ -1742,6 +1743,15 @@ message ResPlayroomChip{ string Msg = 2; } +message ReqPlayroomBuyItem{ + int32 Id = 1; // Mood Id +} + +message ResPlayroomBuyItem{ + RES_CODE Code = 1; + string Msg = 2; +} + // #region 宠物宝藏 message ReqFriendTreasure{} diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index ea8cc409..a89d67c8 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -470,7 +470,7 @@ "out_file": "PlayroomMood.json", "key": "Id", "sheet_name" :"Mood", - "fields" :["Type", "Cost", "Cost2", "Effect"] + "fields" :["Type", "Cost", "Cost2", "Effect", "Buy"] }, { "in_file": "Mail.xlsx",