From 7ec602ef755bb575db37cb1509bde3ae93b7d352 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Wed, 27 Nov 2024 11:54:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=8D=8F=E8=AE=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/Avatar.xlsx | Bin 9900 -> 9903 bytes config/Invite.xlsx | Bin 0 -> 9613 bytes config/Item.xlsx | Bin 17792 -> 17881 bytes makedown/optimization.md | 5 ++- proto/Gameapi.proto | 92 ++++++++++++++++++++++++--------------- tool/cfg/cfg_xlsx.json | 7 +++ 6 files changed, 67 insertions(+), 37 deletions(-) create mode 100644 config/Invite.xlsx diff --git a/config/Avatar.xlsx b/config/Avatar.xlsx index e03613d49fde8ca733e93713dc222eabb0671055..cb4581b1ef199f0bfd3a6950172758fee987ba3d 100644 GIT binary patch delta 1251 zcmV<91RVRUO|MO`lK})3T72F5S%E!h2(B4Hfczr-Tu94yVVW_ zAMZUU-#zz|e0flH^aa*cjV=&P2#P?9Mpk-PpqI@mUZBW%t|hM<4Fx)aL(B5|Di?-{ z#=?_r3|L=*ivmeICQO0$-W!Io6MInHCBdPCxNWTBK9qKc4HqAL2RJ3<1}pG?TyoEG z2aL@~L?@&aBhq}@x(7&sp#}xoJ4_Rbf4m;7a(_PPm5EbT{%FEZr?^wL6oWXr53U-G zZQCYo*2f6>DSlf&KKHA}mF{jO0F}8EOjzK)vE@sSCslX3nmfM^N8VN-?~a|}cQX+B zzyk(k6e6%8@L74y?jJTQRHh^@oyC;I8QqYKr87pzdpGmqeHUqHsMF+si8M}cH-xhJ zjLjDl;u%o(xi7y#`3wbH7`Ym+!&Z4#%pA=|g_*oGV&Bkf({nSbV+@sMHr_*NF)nQ%c_6{27=MINbA zmeJ}EqF+Cs?;emRB(5@Cu!@A}9}(zr_wmEFVfd4Qq~*a7wM6dSWH+= zDzM~?mw#BoD?j+6<^*S2R2KehI$ioDrWG;~HvBy?Sf10ABrH9Zq>?5GCk2+kFOIYp z*Jy9qyW(XWH&E-9r-zsrOB*j(jQC2Lawb?VCn+m^gEp>m?XL%Qmgy*vqgf^9uc!JB z0@qO7o)%R8)8$@)i0tAtO*3g~F-fZnMXy1@%6}&^J_*Un1WSx|TYUpB+}~|83SCrJ z?{Sic=qcDF!3=>xyZol45xr+m;{6X&kW`WkW(9d_2KJ1-D#y=oG*!X1g9?dLNzWuE zMG>Me!5rr3ug;>LA%)-O=s#ccJ?pu7;a)~^d@5wjia#`y#}KX2_3S%qJ`s92N`RS9 z?thWTPO_jC`AW{D06~a!BArK-zT0xvcrX@#E^4fXHrOnHIaP;Ga0-zGyq|Z|t$zlr z^kR$pwqR(B`?lH8mh^4&*5(683o~=V!0AnxzHQM4)kVa8+x^g%^li)5Hh@vLH15n? z_r$6@Qog#EE$FHZYG9nYWUPB=bpx1%6Msfs*m-9)I#Rwvm~|V}z!;rXL^9R|-Q5pp zV7?r!xz{w^)#_Z4@*UCyR^r$Qt<%II>?$4LES)$@jbjZ(qz<*h5 z94l9(d@US%l#S5F84G7OMmc~j@8E%B_0#HVF#XZqL!z0LJHAM*fDqT#0 zX0kdEX>W_k9%=AV<&2nAB1?K>s9_g6nPw(%*WF8_l)Dw#9&EE-wZB@mBmZtV&Cknh zNwd9bd?4R2KhR2e1m*4m2;4)f!>XBy4>Bc!Yml1UB4M?Z})ld3}K` zY;4c^P%Y*5Z{6-ckRG!T2&ozY`jfgMKmlWu`yw*|hm$WOlLQr7guRo-BgX-+la3@d z0@fds?;jkK;v^~oMUxFBK>_fSPbE45^^=MvHUS)y!6iTe^^*c7UJ0bza>FMB000}4 NX(l}ek|F>A001M?O9lV{ delta 1259 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 MKs@6t@m}Qq4~X4~=l}o! literal 0 HcmV?d00001 diff --git a/config/Item.xlsx b/config/Item.xlsx index fe4b2a2849859a56e2c548936bc77b20aaa8d038..68d4e50ebf3292a8f7905eb2f2fb61dfc462e5c9 100644 GIT binary patch delta 9306 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

MA&K;@?But)Xuh9WheSYy4Bd%P)T|o%=EVT zEf%%H5tp-uPeCMKh^t;@6A8ZK`-+gN6QSXo`mxWUF!>>EXqQc45?fzHB@YHEa~>%1 ztl4F`;E-_4J9<2leL-EDqUg}{T?HKfIJvH3dSr}ZJ{+DpGBDQhx=#0{eL|bIkh9o$ zgq;|;=Ta_SY&*3r#`-%!&8LAv&$n7Gkp_Xfq#r1-}IFG+q35f zJ)W|0Q33C_$HsM2)^tg=Ve&+hw3>>{cH6IfS}{hS0yxN`FYVZ@q_A_oL%T~lh(f8q zc0x688hMQV<`xq<_D*0m$p2oM8_RQ5KD#7ox8C4D}5pLXny7e}1C!km5f{GB6%KSb@wclGFWt97V3{7My?XivR1h dK=s#&QHh-P|GstpuhScdwh}j%fZRjN{{o|7o5}zH delta 9218 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 C!du1w diff --git a/makedown/optimization.md b/makedown/optimization.md index b9d8ecb1..75247da3 100644 --- a/makedown/optimization.md +++ b/makedown/optimization.md @@ -665,7 +665,6 @@ message ReqLimitEvent{} message ResLimitEvent{ map LimitEventList = 1; } -message ResLimitEventProgress{} message ResLimitEventProgress{ int32 Progress = 2; //进度 map ProgressReward = 3; //奖励 可以选择的奖励 Id =》 RewardId @@ -793,6 +792,10 @@ message NotifyFriendCard{ ResFriendCard Info = 1; } +message NotifyFriendLog{ + ResFriendLog info = 1; +} + // 好友卡牌申请 message ResFriendCard{ int32 Uid = 1; diff --git a/proto/Gameapi.proto b/proto/Gameapi.proto index 3aa62092..4e1d27c8 100644 --- a/proto/Gameapi.proto +++ b/proto/Gameapi.proto @@ -1751,14 +1751,7 @@ message ResAutoFBAddFriend{ int32 ResultCode = 1; } -///请求自动添加facebook好友 -message ReqAutoAddInviteFriend{ - repeated string Ids = 1; -} -message ResAutoAddInviteFriend{ - int32 ResultCode = 1; -} message NotifySuccessInviteAddFriend{ @@ -1778,34 +1771,7 @@ message ResRecommendFriendList{ repeated FriendInfo PlayerInfos = 1; } /// -message ReqInviteFriendData{ - int32 dwUin = 1; -} -message ResInviteFriendData{ - repeated int32 IdLists = 1; - int32 GetIndex = 2; -} -message ReqSelfInvited{ - int32 InviterId = 1; -} -message ResSelfInvited{ - int32 ResultCode = 1; - repeated int32 IdLists = 2; -} - -message NotifyInvitedSuccess{ - int32 ResultCode = 1; - repeated int32 IdLists = 2; -} - -message ReqGetInviteReward{ - int32 GetIndex = 1; -} - -message ResGetInviteReward{ - int32 ResultCode = 1; -} /// message ReqFriendTreasureData{ int32 dwUin = 1; @@ -2832,10 +2798,14 @@ message ResPlayerRank{ message ResFriendLog{ ResPlayerSimple Player = 1; - int32 Type =2; + int32 Type = 2; int32 Time = 3; string Param = 4; - string Id = 5; + int32 Id = 5; +} + +message NotifyFriendLog{ + ResFriendLog info = 1; } message NotifyFriendCard{ @@ -2889,14 +2859,17 @@ message ReqFriendList{} message ResFriendList{ repeated ResPlayerSimple FriendList = 1; } +// 好友申请列表 message ReqFriendApply{} message ResFriendApply{ repeated ResPlayerSimple ApplyList = 1; } +// 好友卡牌交换列表 message ReqFriendCardMsg{} message ResFriendCardMsg{ repeated ResFriendCard MsgList = 1; } +// 好友时间线 message ReqFriendTimeLine{} message ResFriendTimeLine{ repeated ResFriendLog Log = 1; @@ -3151,3 +3124,50 @@ message ResNotifyCard{ map Master = 2; // 万能卡牌 int32 ExStar = 3; // 额外星星 } + +message ReqSetFacebookUrl{ + string Url = 1; +} + +message ResSetFacebookUrl{ + RES_CODE Code = 1; + string Msg = 2; +} + +// 邀请facebook好友 +message ReqInviteFriendData{ + int32 dwUin = 1; +} +message ResInviteFriendData{ + repeated int32 IdLists = 1; + int32 GetIndex = 2; +} + +message ReqSelfInvited{ + int32 InviterId = 1; +} +message ResSelfInvited{ + int32 ResultCode = 1; +} + +message NotifyInvitedSuccess{ + int32 ResultCode = 1; + repeated int32 IdLists = 2; +} + +message ReqGetInviteReward{ + int32 GetIndex = 1; +} + +message ResGetInviteReward{ + int32 ResultCode = 1; +} + +///请求自动添加facebook好友 + +message ReqAutoAddInviteFriend{ + int32 id = 1; +} +message ResAutoAddInviteFriend{ + int32 ResultCode = 1; +} \ No newline at end of file diff --git a/tool/cfg/cfg_xlsx.json b/tool/cfg/cfg_xlsx.json index bb596415..d4161961 100644 --- a/tool/cfg/cfg_xlsx.json +++ b/tool/cfg/cfg_xlsx.json @@ -338,6 +338,13 @@ "key": "Id", "sheet_name" :"Group", "fields" :["Min", "Max"] + }, + { + "in_file": "Invite.xlsx", + "out_file": "Invite.json", + "key": "Id", + "sheet_name" :"Reward", + "fields" :["Need", "Items"] } ] } \ No newline at end of file