From 40a484695e1f16636964c0d96deb4321e13e01be Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 4 Dec 2024 10:24:20 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=8C=9C=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Activity.xlsx | Bin 9797 -> 9852 bytes config/GuessColor.xlsx | Bin 0 -> 12219 bytes config/LimitedTimeEvent.xlsx | Bin 23155 -> 20937 bytes makedown/optimization.md | 39 +++++++++++++++++++++++++++++++++++ proto/Gameapi.proto | 35 +++++++++++++++++++++++++++++++ tool/cfg/cfg_xlsx.json | 28 +++++++++++++++++++++++++ 6 files changed, 102 insertions(+) create mode 100644 config/GuessColor.xlsx diff --git a/config/Activity.xlsx b/config/Activity.xlsx index c0c1818c5dbf7e5b82a0fbb4b41df012d7dc35af..878aee688d94c5c03307b900c5837b959aef1ffa 100644 GIT binary patch delta 1689 zcmV;K24?xiO#Do+lmP^7L<)_Qm;oPuQA@)x6ouaf|3k@po1~pXLfe7Lo*W2vD87Z{ zZYwrvNTS{Ty=gmZhk}pyo|EsMdr7`JswVmb>*`h)h$aL@phYWdy)V$VTF192a-M6+ zn^r@CPT3Sld@u0viK=D=*poL$yX_O43D4X-pOs$rxQQLf-nB7w`K> zV?&)M|4U3`l2w$jbji}28SxuX4!JMCLHPx<@B*~~3Ic}lQ7r=i0C@?MuLK}}U2~!^ z6n)>B{SQpu3nEslBX(M?)|uUz&VD{e2%0GnHi^>y``#o#A+oJ62JX4%ewYNA{l;t7v-2rk)9(jA z9i%K~o+qLM$*^!)L2^J6#xpE`;g#<_QE-A|P0CVlI2eq*4AUH$2s3_343;D`A}bah zGm=Xagp(9Ys9zjtA?j!^@kQ}sj!WpZuBTPv${w<`Uk5iVVTNc8N@~VoKK>oykBXW5Zl4UC_ zF)YX=n(N0Oe%lB8*fHY1p#e>w*|LISVJ(0;D7t@Y46aVI7TKBjWX(!Vs8hY(Fs zZTrE>M?&`p38e(?HFDU0QKmE}-^hui0EQ?~i6WLlRQPo=ssq<> zT#;d|$${$+KW=eSkzlPzLGYO@aF*yQVXYJS?)Z~Lu;rQrYfYMe_HUVIHd~LD8ui7T zv(kZM0JIYYR)>^7o5GMr%6JD>7#;!dr^R6IonR893cGJ(eivJ|v0)cmsZ2Uw6FKO5 zJe+%sx*qFx{Oc~ZX=CFq_SnWIU2NONZW_!3eHxKqzI#LhYtxD?QX88#LAAKcHs)Kz zl}goB$+tv)=y9=sv|e{oSTb)qpr!C*2ec&KcEERyJ6gea-Dovw1}e~_WOZ`iYh4DOFC=Bz02o_xoAPjlfhq$B~-K%ZyaTr%cGvO?Fp zV-oID{dj=?Gz89*fjX2D#$^2hw~xWr+Nf^5=1jyvve>M`hEKLCb0G9#) z02BZK0C;RKb7*05Wn@!ya%pa7b1ryoY=x3ROT#c2hVO#^A>_WL>tV=fyMrhQ>Ot!d z2y5H|ZCaabx|?{Bxe0=@?J%7TWGBUm?BGQIjBV_{uv0-u2SP62^Sm$lATi2Eo(mcz z- zRZeEnO-sF8tzKj>RXxxr_)1>#TIyt+HuZN3Wba5`nk7^^nJxxY^l_n<- zAG4`Sqq}Z&Hc{#PwQ^b^r|Ce`O5Z0N(f^CYovs|dt3}xvB%{G+>*-IR^kZ3HP)h>@ z6aWAK2mpspvz`yM5&_4PQzAeDFdmbYA~FF~lgJ{I1Z_kLjgwy^#{qnkCnPojqmy1F zEgLoxxGYTp005T)000yK0000000031AOHXWN|UA}K>@~-=p;G;`jaCiHUc3ClMo0M jlW-*}0m+k_C0+^whVfA?0{{Sd36ldRJO*DP00000ApjFS delta 1611 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 literal 0 HcmV?d00001 diff --git a/config/LimitedTimeEvent.xlsx b/config/LimitedTimeEvent.xlsx index 3d23aac307635751672781c43397a7c39257768b..f50222d798362017abf866aecbfa9e8377a36ca0 100644 GIT binary patch delta 7346 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 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