From 55ed8da8fa47efa3fbf116b39b1e33c60e3b5bb6 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Wed, 31 Jul 2024 16:36:26 +0800 Subject: [PATCH] update skin --- data/DB_PropExchange.dat | Bin 384 -> 384 bytes data/DB_Skin.dat | Bin 744 -> 896 bytes data/DB_Skin.json | 21 ++ data/DB_Task.dat | Bin 5299 -> 5299 bytes data/DB_VIP.dat | Bin 887 -> 2170 bytes data/DB_VIP.json | 91 ++++++- protocol/server/pbdata.pb.go | 400 ++++++++++++++++--------------- protocol/server/pbdata.proto | 6 +- tools/xlsx2proto/templ/agc.templ | 4 + tools/xlsx2proto/xlsx2proto.go | 2 + 10 files changed, 332 insertions(+), 192 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 7d8588faf28f997dd243fed3a494271838ea92bf..8a38f2058576a7613bd72c2487f17ac850541c61 100644 GIT binary patch literal 384 zcmd-w<6snElw#w!(#8y?uR`f-Q2IKQz6_$3I5-yevI!h$vE|a^U;?YZ1(m-IrEfs# zn`r98IUwf4)Pc;IUwev$P-~N%v`YjK=okzlsLieXjuD*g)5eW1*^kh8t-6p7?Q;(9)w%K&anvS L(J#zg477y+Wr934 diff --git a/data/DB_Skin.dat b/data/DB_Skin.dat index 6a29fcde44bb142ae3788743358fedd2b2ba6e5d..37d62555075893fd93cfa72c9a0dd1afb64f0d69 100644 GIT binary patch delta 208 zcmaFC+Q81lWiye6K#^fZ6P1+13J&lp$`9yp1$<0iu L64(@(0~G-PayCC7 delta 70 zcmZo*f5FPaWy$ey;sx=E(h5vmMH3y1n7C>uo~vcyD(83t6rNnq7{|g@&G8h(7Gz3d V;d0`524XK`(q!VQoBWEY4gf!U7y$qP diff --git a/data/DB_Skin.json b/data/DB_Skin.json index 3b1fc03..2eeb09b 100644 --- a/data/DB_Skin.json +++ b/data/DB_Skin.json @@ -12,6 +12,9 @@ "SkinSkillDes": "0", "Turn": [ 0 + ], + "TurnKey": [ + "0" ] }, { @@ -30,6 +33,9 @@ "SkinSkillDes": "排位赛积分提升", "Turn": [ 1 + ], + "TurnKey": [ + "DBSkinUnlock_300002_t1" ] }, { @@ -48,6 +54,9 @@ "SkinSkillDes": "VIP赛每日免费报名次数提升", "Turn": [ 2 + ], + "TurnKey": [ + "DBSkinUnlock_300003_t1" ] }, { @@ -66,6 +75,9 @@ "SkinSkillDes": "每日礼包金币奖励提升", "Turn": [ 2 + ], + "TurnKey": [ + "DBSkinUnlock_300004_t1" ] }, { @@ -84,6 +96,9 @@ "SkinSkillDes": "每日任务金币奖励加成", "Turn": [ 3 + ], + "TurnKey": [ + "DBSkinUnlock_300005_t1" ] }, { @@ -102,6 +117,9 @@ "SkinSkillDes": "0", "Turn": [ 4 + ], + "TurnKey": [ + "DBSkinUnlock_300006_t1" ] }, { @@ -120,6 +138,9 @@ "SkinSkillDes": "每次钻石抽奖幸运值提升", "Turn": [ 5 + ], + "TurnKey": [ + "DBSkinUnlock_300007_t1" ] } ] diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 7b87efe408e9c8dc25c4cad51a248e5a31bbfa99..811c2699e1f7d87a8bdc16314d555abfc3bece99 100644 GIT binary patch delta 184 zcmdn2xmj~UxgZ$`Zs@Gq9KeuHBQb m^N4KL<&I^Xe1%J7@;siSlS?=RH<$3PW}0jaWEcoEvj70G!Zh{( delta 213 zcmdn2xmj~UxgZC}!d^Ck1-)!uY#d8~ERl&Fr!WNNHYYRoFitMv5ZTPkEW!kpzp&H? zsOe%GvjEp-4OVeRsBlAP6;OB)&@9%?0c`0^lSSA?HlOBbVgxZJCvxo&gvfGvLF_)z vV!K(3JAn}@%nB7=a7b?QY@QQPQAU_(FWcr4-qlP{VG*b>(9X>U0?jM{wJ$o0 diff --git a/data/DB_VIP.dat b/data/DB_VIP.dat index cd82553912ff22f9959f2044d5a2f7408f3c0a4d..b5b997e64e1d5732705055476dc9ea34e55c5395 100644 GIT binary patch literal 2170 zcmcK4OKTHR6bJC!*JS4AF){eKP>{P&3bSdOwo$=uT*$a7UCG6DKY=TWC}Ueo8;FS( zs-&V3i*Br1sI-e(LU7^E;6@P)h#-W@P<3>qdu!9(xx2fy9p%H% zf6P30t1s(lptG{!uGZmC-SWfk?CZ|jV|VAKyY0Bu+q|TsJcXY|L^mnBNuQk#ScGk+ z!Z3~yZXm?3>e#mnqHW5yX|dl+#xnYk8;XRwjuyv&6CWQH3xjfD&|=Mc`fU%#*v=># z!bzl^6TqpDkBQo(tW8?%>(l(-K7L5C*l^0P>CDH+MdLn_P!@AuiD$jb2E89uT8O8S z_RfIUe7-2!^F%^ftkF9D<$x#lfJ(;3YrrRc{*-_hOhUot-<_zD;M!qgOQnbSXg8k( zUibOa0`8lHg57_%T0Nc+`=l~r<8|N-pFbmD<`N2a|8sc1&s&Oz_-J=;@asCyGw*9N zEShr@5(<|8r}%^h(}(tlR4O)~gP#ig5#cPBBou6aZsOyCPwj$Ahx|mOcR$4)q^E-b z1<_ny$I?4s1&gIJ>y3cgXH_P)2x)!;>6swHsBqT4Q|TR+)~sxz?Op~-?ei)dTZW96 zAsb{E6V9hMhV%|gbMEY;y?%x%WyY2v>t!&54CBK2_UoAR4wwThq@e}7fH_=Jx!5w8 iUWQzdp(vczhau@5Fo%^r{Jx)IS{;rpLyp4-F7XdH*zpVi delta 171 zcmW;AJqp4=5C%|pvb)joFSkgeWJ%ByDQcya_gJRM0i#%?5<#%?o9Q0!SA8RKov9{n z@_iF}=Q!o}79dV?b*cgyO`co1P=gE5%M_tgp;tmr(-b;-y%~2h_yjR@2&y^n Award = 18; - int32 MatchFreeTimes = 19; + repeated string ParamName = 19; + + int32 MatchFreeTimes = 20; } diff --git a/tools/xlsx2proto/templ/agc.templ b/tools/xlsx2proto/templ/agc.templ index ac72b2e..748a7bb 100644 --- a/tools/xlsx2proto/templ/agc.templ +++ b/tools/xlsx2proto/templ/agc.templ @@ -86,6 +86,10 @@ func AgcConvert{{ $elem.ProtoName }}(fi,fo string) { } data.{{$col.ColName}} = arrInt {{end}} + {{if eq $col.ColType 8 }} + arrStr = strings.Split(row.Cells[{{$col.ColIndex}}].String(), "|") + data.{{$col.ColName}} = arrStr + {{end}} {{if eq $col.ColType 4 }} if row.Cells[{{$col.ColIndex}}].String() != "" { arrStr = strings.Split(row.Cells[{{$col.ColIndex}}].String(), "|") diff --git a/tools/xlsx2proto/xlsx2proto.go b/tools/xlsx2proto/xlsx2proto.go index 8c8a950..38d5102 100644 --- a/tools/xlsx2proto/xlsx2proto.go +++ b/tools/xlsx2proto/xlsx2proto.go @@ -133,6 +133,8 @@ func main() { sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ArrInt64Type), 6, Int64TypeProto, true, false, false}) case strings.HasSuffix(s, MapType): sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, MapType), 7, MapProto, false, true, false}) + case strings.HasSuffix(s, ArrStrType): + sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, ArrStrType), 8, StrTypeProto, true, false, false}) case strings.HasSuffix(s, IntTypeIndex): sms.Cols = append(sms.Cols, &SheetColumnMetaStruct{i, strings.TrimSuffix(s, IntTypeIndex), 1, IntTypeProto, false, false, true}) case strings.HasSuffix(s, Int64TypeIndex):