tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: tl_server_2:7504a2dcdf4775a5754fe4da15499f11096f6a53
Branches Tags
tl_server_2:main
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
..
compare: tl_server_2:e326ccdf81b05278f3ac3440c8f5b72b58b3c869
Branches Tags
tl_server_2:dev_login
tl_server_2:develop
tl_server_2:dev_slots
tl_server_2:release
tl_server_2:dev_third
tl_server_2:dev_expireitem
tl_server_2:ma
tl_server_2:machine
tl_server_2:main

No commits in common. "7504a2dcdf4775a5754fe4da15499f11096f6a53" and "e326ccdf81b05278f3ac3440c8f5b72b58b3c869" have entirely different histories.
7504a2dcdf ... e326ccdf81

14 changed files with 127 additions and 338 deletions
Show Stats Expand all files Collapse all files

BIN
data/DB_GiftCard.dat
View File

Binary file not shown.

BIN
data/DB_PropExchange.dat
View File

Binary file not shown.

BIN
data/DB_Task.dat
View File

Binary file not shown.

141
data/DB_Task.json
View File

@ -3,8 +3,6 @@
{ {
"Id": 1, "Id": 1,
"Order": 1, "Order": 1,
"Name": "每日任务",
"Des": "充值任意金额",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 1, "TargetTimes": 1,
@ -21,8 +19,6 @@
{ {
"Id": 2, "Id": 2,
"Order": 2, "Order": 2,
"Name": "每日任务",
"Des": "购买一次金币",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 2, "TaskType": 2,
"TargetTimes": 1, "TargetTimes": 1,
@ -39,8 +35,6 @@
{ {
"Id": 3, "Id": 3,
"Order": 3, "Order": 3,
"Name": "每日任务",
"Des": "每日登录游戏",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 3, "TaskType": 3,
"TargetTimes": 1, "TargetTimes": 1,
@ -53,8 +47,6 @@
{ {
"Id": 4, "Id": 4,
"Order": 4, "Order": 4,
"Name": "每日任务",
"Des": "任意玩法对局胜利1次",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 1, "TargetTimes": 1,
@ -68,8 +60,6 @@
{ {
"Id": 5, "Id": 5,
"Order": 5, "Order": 5,
"Name": "每日任务",
"Des": "任意玩法对局10次",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 10, "TargetTimes": 10,
@ -83,8 +73,6 @@
{ {
"Id": 6, "Id": 6,
"Order": 6, "Order": 6,
"Name": "每日任务",
"Des": "在排位赛中对局一次",
"ActivityType": 1, "ActivityType": 1,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 1, "TargetTimes": 1,
@ -98,7 +86,6 @@
{ {
"Id": 7, "Id": 7,
"Order": 1, "Order": 1,
"Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 200, "TargetTimes": 200,
@ -110,7 +97,6 @@
{ {
"Id": 8, "Id": 8,
"Order": 2, "Order": 2,
"Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 300, "TargetTimes": 300,
@ -122,7 +108,6 @@
{ {
"Id": 9, "Id": 9,
"Order": 3, "Order": 3,
"Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 400, "TargetTimes": 400,
@ -134,7 +119,6 @@
{ {
"Id": 10, "Id": 10,
"Order": 4, "Order": 4,
"Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 500, "TargetTimes": 500,
@ -146,7 +130,6 @@
{ {
"Id": 11, "Id": 11,
"Order": 5, "Order": 5,
"Name": "周活跃任务",
"ActivityType": 2, "ActivityType": 2,
"TaskType": 14, "TaskType": 14,
"TargetTimes": 600, "TargetTimes": 600,
@ -158,8 +141,6 @@
{ {
"Id": 12, "Id": 12,
"Order": 1, "Order": 1,
"Name": "新手任务",
"Des": "绑定邀请人",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 10, "TaskType": 10,
"TargetTimes": 1, "TargetTimes": 1,
@ -172,8 +153,6 @@
{ {
"Id": 13, "Id": 13,
"Order": 2, "Order": 2,
"Name": "新手任务",
"Des": "游玩Tienlen10次",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 10, "TargetTimes": 10,
@ -187,8 +166,6 @@
{ {
"Id": 14, "Id": 14,
"Order": 3, "Order": 3,
"Name": "新手任务",
"Des": "累计获取10M金币",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 10000000, "TargetTimes": 10000000,
@ -200,8 +177,6 @@
{ {
"Id": 15, "Id": 15,
"Order": 4, "Order": 4,
"Name": "新手任务",
"Des": "Tienlen获胜10次",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 10, "TargetTimes": 10,
@ -215,8 +190,6 @@
{ {
"Id": 16, "Id": 16,
"Order": 5, "Order": 5,
"Name": "新手任务",
"Des": "成功邀请3人",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 16, "TaskType": 16,
"TargetTimes": 3, "TargetTimes": 3,
@ -229,8 +202,6 @@
{ {
"Id": 21, "Id": 21,
"Order": 6, "Order": 6,
"Name": "新手任务",
"Des": "被邀请人累计充值0.1$",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 18, "TaskType": 18,
"TargetTimes": 10, "TargetTimes": 10,
@ -243,8 +214,6 @@
{ {
"Id": 22, "Id": 22,
"Order": 7, "Order": 7,
"Name": "新手任务",
"Des": "成功邀请5人",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 16, "TaskType": 16,
"TargetTimes": 5, "TargetTimes": 5,
@ -257,8 +226,6 @@
{ {
"Id": 23, "Id": 23,
"Order": 8, "Order": 8,
"Name": "新手任务",
"Des": "成功邀请10人",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 16, "TaskType": 16,
"TargetTimes": 10, "TargetTimes": 10,
@ -271,8 +238,6 @@
{ {
"Id": 24, "Id": 24,
"Order": 9, "Order": 9,
"Name": "新手任务",
"Des": "被邀请人累计充值1$",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 18, "TaskType": 18,
"TargetTimes": 100, "TargetTimes": 100,
@ -285,8 +250,6 @@
{ {
"Id": 25, "Id": 25,
"Order": 10, "Order": 10,
"Name": "新手任务",
"Des": "被邀请人累计充值5$",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 18, "TaskType": 18,
"TargetTimes": 500, "TargetTimes": 500,
@ -299,8 +262,6 @@
{ {
"Id": 26, "Id": 26,
"Order": 11, "Order": 11,
"Name": "新手任务",
"Des": "被邀请人累计充值10$",
"ActivityType": 3, "ActivityType": 3,
"TaskType": 18, "TaskType": 18,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -313,8 +274,6 @@
{ {
"Id": 17, "Id": 17,
"Order": 1, "Order": 1,
"Name": "邀请任务",
"Des": "邀请积分达到10000",
"ActivityType": 4, "ActivityType": 4,
"TaskType": 13, "TaskType": 13,
"TargetTimes": 10000, "TargetTimes": 10000,
@ -327,8 +286,6 @@
{ {
"Id": 18, "Id": 18,
"Order": 2, "Order": 2,
"Name": "邀请任务",
"Des": "邀请积分达到50000",
"ActivityType": 4, "ActivityType": 4,
"TaskType": 13, "TaskType": 13,
"TargetTimes": 50000, "TargetTimes": 50000,
@ -341,8 +298,6 @@
{ {
"Id": 19, "Id": 19,
"Order": 3, "Order": 3,
"Name": "邀请任务",
"Des": "邀请积分达到200000",
"ActivityType": 4, "ActivityType": 4,
"TaskType": 13, "TaskType": 13,
"TargetTimes": 200000, "TargetTimes": 200000,
@ -355,8 +310,6 @@
{ {
"Id": 20, "Id": 20,
"Order": 4, "Order": 4,
"Name": "邀请任务",
"Des": "邀请积分达到1000000",
"ActivityType": 4, "ActivityType": 4,
"TaskType": 13, "TaskType": 13,
"TargetTimes": 1000000, "TargetTimes": 1000000,
@ -369,8 +322,6 @@
{ {
"Id": 10001, "Id": 10001,
"Order": 1, "Order": 1,
"Name": "成就",
"Des": "累计获取100M金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 100000000, "TargetTimes": 100000000,
@ -384,8 +335,6 @@
{ {
"Id": 10002, "Id": 10002,
"Order": 7, "Order": 7,
"Name": "成就",
"Des": "累计获取1B金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 1000000000, "TargetTimes": 1000000000,
@ -399,8 +348,6 @@
{ {
"Id": 10003, "Id": 10003,
"Order": 13, "Order": 13,
"Name": "成就",
"Des": "累计获取10B金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 10000000000, "TargetTimes": 10000000000,
@ -414,8 +361,6 @@
{ {
"Id": 10004, "Id": 10004,
"Order": 19, "Order": 19,
"Name": "成就",
"Des": "累计获取100B金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 100000000000, "TargetTimes": 100000000000,
@ -429,8 +374,6 @@
{ {
"Id": 10005, "Id": 10005,
"Order": 25, "Order": 25,
"Name": "成就",
"Des": "累计获取500B金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 500000000000, "TargetTimes": 500000000000,
@ -444,8 +387,6 @@
{ {
"Id": 10006, "Id": 10006,
"Order": 31, "Order": 31,
"Name": "成就",
"Des": "累计获取1000B金币",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 11, "TaskType": 11,
"TargetTimes": 1000000000000, "TargetTimes": 1000000000000,
@ -459,8 +400,6 @@
{ {
"Id": 20001, "Id": 20001,
"Order": 2, "Order": 2,
"Name": "成就",
"Des": "游玩Tienlen100次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 100, "TargetTimes": 100,
@ -474,8 +413,6 @@
{ {
"Id": 20002, "Id": 20002,
"Order": 8, "Order": 8,
"Name": "成就",
"Des": "游玩Tienlen1000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -489,8 +426,6 @@
{ {
"Id": 20003, "Id": 20003,
"Order": 14, "Order": 14,
"Name": "成就",
"Des": "游玩Tienlen5000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 5000, "TargetTimes": 5000,
@ -504,8 +439,6 @@
{ {
"Id": 20004, "Id": 20004,
"Order": 20, "Order": 20,
"Name": "成就",
"Des": "游玩Tienlen10000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 10000, "TargetTimes": 10000,
@ -519,8 +452,6 @@
{ {
"Id": 20005, "Id": 20005,
"Order": 26, "Order": 26,
"Name": "成就",
"Des": "游玩Tienlen50000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 50000, "TargetTimes": 50000,
@ -534,8 +465,6 @@
{ {
"Id": 20006, "Id": 20006,
"Order": 32, "Order": 32,
"Name": "成就",
"Des": "游玩Tienlen100000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 5, "TaskType": 5,
"TargetTimes": 100000, "TargetTimes": 100000,
@ -549,8 +478,6 @@
{ {
"Id": 30001, "Id": 30001,
"Order": 3, "Order": 3,
"Name": "成就",
"Des": "Tienlen获胜100次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 100, "TargetTimes": 100,
@ -564,8 +491,6 @@
{ {
"Id": 30002, "Id": 30002,
"Order": 9, "Order": 9,
"Name": "成就",
"Des": "Tienlen获胜1000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -579,8 +504,6 @@
{ {
"Id": 30003, "Id": 30003,
"Order": 15, "Order": 15,
"Name": "成就",
"Des": "Tienlen获胜5000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 5000, "TargetTimes": 5000,
@ -594,8 +517,6 @@
{ {
"Id": 30004, "Id": 30004,
"Order": 21, "Order": 21,
"Name": "成就",
"Des": "Tienlen获胜10000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 10000, "TargetTimes": 10000,
@ -609,8 +530,6 @@
{ {
"Id": 30005, "Id": 30005,
"Order": 27, "Order": 27,
"Name": "成就",
"Des": "Tienlen获胜50000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 50000, "TargetTimes": 50000,
@ -624,8 +543,6 @@
{ {
"Id": 30006, "Id": 30006,
"Order": 33, "Order": 33,
"Name": "成就",
"Des": "Tienlen获胜100000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 4, "TaskType": 4,
"TargetTimes": 100000, "TargetTimes": 100000,
@ -639,8 +556,6 @@
{ {
"Id": 40001, "Id": 40001,
"Order": 4, "Order": 4,
"Name": "成就",
"Des": "在排位赛中对局100次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 100, "TargetTimes": 100,
@ -654,8 +569,6 @@
{ {
"Id": 40002, "Id": 40002,
"Order": 10, "Order": 10,
"Name": "成就",
"Des": "在排位赛中对局1000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -669,8 +582,6 @@
{ {
"Id": 40003, "Id": 40003,
"Order": 16, "Order": 16,
"Name": "成就",
"Des": "在排位赛中对局5000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 5000, "TargetTimes": 5000,
@ -684,8 +595,6 @@
{ {
"Id": 40004, "Id": 40004,
"Order": 22, "Order": 22,
"Name": "成就",
"Des": "在排位赛中对局10000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 10000, "TargetTimes": 10000,
@ -699,8 +608,6 @@
{ {
"Id": 40005, "Id": 40005,
"Order": 28, "Order": 28,
"Name": "成就",
"Des": "在排位赛中对局50000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 50000, "TargetTimes": 50000,
@ -714,8 +621,6 @@
{ {
"Id": 40006, "Id": 40006,
"Order": 34, "Order": 34,
"Name": "成就",
"Des": "在排位赛中对局100000次",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 6, "TaskType": 6,
"TargetTimes": 100000, "TargetTimes": 100000,
@ -729,8 +634,6 @@
{ {
"Id": 50001, "Id": 50001,
"Order": 5, "Order": 5,
"Name": "成就",
"Des": "累积充值$0.1",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 10, "TargetTimes": 10,
@ -747,8 +650,6 @@
{ {
"Id": 50002, "Id": 50002,
"Order": 11, "Order": 11,
"Name": "成就",
"Des": "累积充值$1",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 100, "TargetTimes": 100,
@ -765,8 +666,6 @@
{ {
"Id": 50003, "Id": 50003,
"Order": 17, "Order": 17,
"Name": "成就",
"Des": "累积充值$10",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -783,8 +682,6 @@
{ {
"Id": 50004, "Id": 50004,
"Order": 23, "Order": 23,
"Name": "成就",
"Des": "累积充值$100",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 10000, "TargetTimes": 10000,
@ -801,8 +698,6 @@
{ {
"Id": 50005, "Id": 50005,
"Order": 29, "Order": 29,
"Name": "成就",
"Des": "累积充值$500",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 50000, "TargetTimes": 50000,
@ -819,8 +714,6 @@
{ {
"Id": 50006, "Id": 50006,
"Order": 35, "Order": 35,
"Name": "成就",
"Des": "累积充值$1000",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 100000, "TargetTimes": 100000,
@ -837,8 +730,6 @@
{ {
"Id": 60001, "Id": 60001,
"Order": 6, "Order": 6,
"Name": "成就",
"Des": "累积登录10天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 10, "TargetTimes": 10,
@ -851,8 +742,6 @@
{ {
"Id": 60002, "Id": 60002,
"Order": 12, "Order": 12,
"Name": "成就",
"Des": "累积登录20天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 20, "TargetTimes": 20,
@ -865,8 +754,6 @@
{ {
"Id": 60003, "Id": 60003,
"Order": 18, "Order": 18,
"Name": "成就",
"Des": "累积登录50天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 50, "TargetTimes": 50,
@ -879,8 +766,6 @@
{ {
"Id": 60004, "Id": 60004,
"Order": 24, "Order": 24,
"Name": "成就",
"Des": "累积登录100天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 100, "TargetTimes": 100,
@ -893,8 +778,6 @@
{ {
"Id": 60005, "Id": 60005,
"Order": 30, "Order": 30,
"Name": "成就",
"Des": "累积登录500天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 500, "TargetTimes": 500,
@ -907,8 +790,6 @@
{ {
"Id": 60006, "Id": 60006,
"Order": 36, "Order": 36,
"Name": "成就",
"Des": "累积登录1000天",
"ActivityType": 5, "ActivityType": 5,
"TaskType": 15, "TaskType": 15,
"TargetTimes": 1000, "TargetTimes": 1000,
@ -921,8 +802,6 @@
{ {
"Id": 11001, "Id": 11001,
"Order": 1, "Order": 1,
"Name": "通行证",
"Des": "领取转盘签到奖励",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 17, "TaskType": 17,
"TargetTimes": 1, "TargetTimes": 1,
@ -934,8 +813,6 @@
{ {
"Id": 11002, "Id": 11002,
"Order": 2, "Order": 2,
"Name": "通行证",
"Des": "在线时长60分钟",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 21, "TaskType": 21,
"TargetTimes": 3600, "TargetTimes": 3600,
@ -951,8 +828,6 @@
{ {
"Id": 11003, "Id": 11003,
"Order": 3, "Order": 3,
"Name": "通行证",
"Des": "购买任意金币1次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 2, "TaskType": 2,
"TargetTimes": 1, "TargetTimes": 1,
@ -968,8 +843,6 @@
{ {
"Id": 11004, "Id": 11004,
"Order": 4, "Order": 4,
"Name": "通行证",
"Des": "购买任意存钱罐1次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 22, "TaskType": 22,
"TargetTimes": 1, "TargetTimes": 1,
@ -981,8 +854,6 @@
{ {
"Id": 11005, "Id": 11005,
"Order": 5, "Order": 5,
"Name": "通行证",
"Des": "参与大众场对局获得胜利3次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 23, "TaskType": 23,
"TargetTimes": 3, "TargetTimes": 3,
@ -995,8 +866,6 @@
{ {
"Id": 11006, "Id": 11006,
"Order": 6, "Order": 6,
"Name": "通行证",
"Des": "参与排位赛获得胜利3次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 30, "TaskType": 30,
"TargetTimes": 3, "TargetTimes": 3,
@ -1009,8 +878,6 @@
{ {
"Id": 11007, "Id": 11007,
"Order": 7, "Order": 7,
"Name": "通行证",
"Des": "邀请好友进行私人桌对局1次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 24, "TaskType": 24,
"TargetTimes": 1, "TargetTimes": 1,
@ -1023,8 +890,6 @@
{ {
"Id": 11008, "Id": 11008,
"Order": 8, "Order": 8,
"Name": "通行证",
"Des": "成功参与比赛场3次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 25, "TaskType": 25,
"TargetTimes": 3, "TargetTimes": 3,
@ -1037,8 +902,6 @@
{ {
"Id": 11009, "Id": 11009,
"Order": 9, "Order": 9,
"Name": "通行证",
"Des": "比赛场获得前十名1次",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 26, "TaskType": 26,
"TargetTimes": 1, "TargetTimes": 1,
@ -1051,8 +914,6 @@
{ {
"Id": 11010, "Id": 11010,
"Order": 10, "Order": 10,
"Name": "通行证",
"Des": "今日累计消耗100钻石",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 27, "TaskType": 27,
"TargetTimes": 100, "TargetTimes": 100,
@ -1068,8 +929,6 @@
{ {
"Id": 11011, "Id": 11011,
"Order": 11, "Order": 11,
"Name": "通行证",
"Des": "充值任意金额",
"ActivityType": 6, "ActivityType": 6,
"TaskType": 7, "TaskType": 7,
"TargetTimes": 1, "TargetTimes": 1,

16
model/permit.go
View File

@ -37,20 +37,4 @@ type BackendPermitJoin struct {
Platform string // 平台 Platform string // 平台
StartTs int64 // 活动开始时间 StartTs int64 // 活动开始时间
SnId int32 // 玩家id SnId int32 // 玩家id
Score int64 // 增加积分
Long int64 // 增加龙币数量
Ts int64 // 时间戳
}
// BackendPermitTask 通行证任务完成记录
type BackendPermitTask struct {
Platform string // 平台
StartTs int64 // 活动开始时间
SnId int32 // 玩家id
TaskId int32 // 任务id
TaskName string // 任务名称
ActivityType int32 // 活动类型
TaskType int32 // 任务类型
Gain []AwardItem // 任务获得奖励
Ts int64 // 时间戳
} }

1
mq/keyconf.go
View File

@ -14,7 +14,6 @@ const (
BackSystemPermitRank = "back_permitrank" BackSystemPermitRank = "back_permitrank"
BackSystemPermitExchange = "back_permitexchange" BackSystemPermitExchange = "back_permitexchange"
BackSystemPermitJoin = "back_permitjoin" BackSystemPermitJoin = "back_permitjoin"
BackSystemPermitTask = "back_permittask"
) )
// dbproxy 消息 // dbproxy 消息

238
protocol/server/pbdata.pb.go
View File

@ -9696,15 +9696,13 @@ type DB_Task struct {
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
Order int32 `protobuf:"varint,2,opt,name=Order,proto3" json:"Order,omitempty"` Order int32 `protobuf:"varint,2,opt,name=Order,proto3" json:"Order,omitempty"`
Name string `protobuf:"bytes,3,opt,name=Name,proto3" json:"Name,omitempty"` ActivityType int32 `protobuf:"varint,3,opt,name=ActivityType,proto3" json:"ActivityType,omitempty"`
Des string `protobuf:"bytes,4,opt,name=Des,proto3" json:"Des,omitempty"` TaskType int32 `protobuf:"varint,4,opt,name=TaskType,proto3" json:"TaskType,omitempty"`
ActivityType int32 `protobuf:"varint,5,opt,name=ActivityType,proto3" json:"ActivityType,omitempty"` TargetTimes int64 `protobuf:"varint,5,opt,name=TargetTimes,proto3" json:"TargetTimes,omitempty"`
TaskType int32 `protobuf:"varint,6,opt,name=TaskType,proto3" json:"TaskType,omitempty"` FinishTimes int64 `protobuf:"varint,6,opt,name=FinishTimes,proto3" json:"FinishTimes,omitempty"`
TargetTimes int64 `protobuf:"varint,7,opt,name=TargetTimes,proto3" json:"TargetTimes,omitempty"` Award map[int64]int64 `protobuf:"bytes,7,rep,name=Award,proto3" json:"Award,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
FinishTimes int64 `protobuf:"varint,8,opt,name=FinishTimes,proto3" json:"FinishTimes,omitempty"` GameType int32 `protobuf:"varint,8,opt,name=GameType,proto3" json:"GameType,omitempty"`
Award map[int64]int64 `protobuf:"bytes,9,rep,name=Award,proto3" json:"Award,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Position []int32 `protobuf:"varint,9,rep,packed,name=Position,proto3" json:"Position,omitempty"`
GameType int32 `protobuf:"varint,10,opt,name=GameType,proto3" json:"GameType,omitempty"`
Position []int32 `protobuf:"varint,11,rep,packed,name=Position,proto3" json:"Position,omitempty"`
} }
func (x *DB_Task) Reset() { func (x *DB_Task) Reset() {
@ -9753,20 +9751,6 @@ func (x *DB_Task) GetOrder() int32 {
return 0 return 0
} }
func (x *DB_Task) GetName() string {
if x != nil {
return x.Name
}
return ""
}
func (x *DB_Task) GetDes() string {
if x != nil {
return x.Des
}
return ""
}
func (x *DB_Task) GetActivityType() int32 { func (x *DB_Task) GetActivityType() int32 {
if x != nil { if x != nil {
return x.ActivityType return x.ActivityType
@ -11610,117 +11594,115 @@ var file_pbdata_proto_rawDesc = []byte{
0x5f, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x72, 0x72, 0x5f, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x72, 0x72,
0x61, 0x79, 0x12, 0x29, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x61, 0x79, 0x12, 0x29, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x17, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x79, 0x73, 0x74, 0x17, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x79, 0x73, 0x74,
0x65, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xfd, 0x02, 0x65, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xd7, 0x02,
0x0a, 0x07, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x64,
0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x65, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12,
0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x22, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18,
0x61, 0x6d, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x44, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54,
0x52, 0x03, 0x44, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18,
0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12,
0x69, 0x76, 0x69, 0x74, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x20, 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x05,
0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x54, 0x61, 0x73, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65,
0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73,
0x69, 0x6d, 0x65, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x54, 0x69,
0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x6d, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03,
0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x46, 0x69, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54,
0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x61, 0x73, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05,
0x72, 0x64, 0x18, 0x09, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70,
0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70,
0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20,
0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x03, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x1a, 0x38, 0x0a,
0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x69, 0x6f, 0x6e, 0x18, 0x0b, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a,
0x69, 0x6f, 0x6e, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x61,
0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x73, 0x6b, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01,
0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x31, 0x0a, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42,
0x0c, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x85, 0x02, 0x0a, 0x1b, 0x44,
0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47,
0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x52, 0x03, 0x41, 0x72, 0x72, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
0x22, 0x85, 0x02, 0x0a, 0x1b, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x79,
0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x2c,
0x0a, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e,
0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64,
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b,
0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28,
0x09, 0x52, 0x0b, 0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x12,
0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x65,
0x73, 0x63, 0x12, 0x34, 0x0a, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65,
0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28,
0x05, 0x52, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61,
0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x68, 0x69, 0x72,
0x64, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64,
0x49, 0x44, 0x22, 0x59, 0x0a, 0x20, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c,
0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e,
0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x35, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f,
0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d,
0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x43, 0x0a,
0x07, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65,
0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64,
0x12, 0x10, 0x0a, 0x03, 0x44, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x44,
0x65, 0x73, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x41, 0x72, 0x72,
0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73,
0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xea, 0x05, 0x0a, 0x06, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50,
0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64,
0x12, 0x22, 0x0a, 0x0c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04,
0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20,
0x6d, 0x65, 0x49, 0x44, 0x12, 0x2c, 0x0a, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x56, 0x69,
0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x70, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x56, 0x69, 0x70, 0x45,
0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31,
0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32,
0x6d, 0x65, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x05, 0x20, 0x01, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x28, 0x09, 0x52, 0x04, 0x44, 0x65, 0x73, 0x63, 0x12, 0x34, 0x0a, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x18, 0x07, 0x20,
0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x12, 0x1e, 0x0a, 0x0a,
0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05,
0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x12, 0x1e, 0x0a, 0x0a,
0x0a, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05,
0x07, 0x54, 0x68, 0x69, 0x72, 0x64, 0x49, 0x44, 0x22, 0x59, 0x0a, 0x20, 0x44, 0x42, 0x5f, 0x54, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a,
0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05,
0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x35, 0x0a, 0x03, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x12, 0x1e, 0x0a, 0x0a,
0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05,
0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x12, 0x3e, 0x0a, 0x0a,
0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x03, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b,
0x41, 0x72, 0x72, 0x22, 0x43, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x12, 0x0e, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50,
0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x12, 0x28, 0x0a, 0x0f,
0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x44, 0x65, 0x73, 0x18, 0x03, 0x20, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18,
0x01, 0x28, 0x09, 0x52, 0x03, 0x44, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
0x69, 0x70, 0x73, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64,
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x37, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37,
0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xea, 0x05, 0x0a, 0x06, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x18, 0x0f,
0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38,
0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x10, 0x20, 0x03, 0x28, 0x05, 0x52,
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x18, 0x11, 0x20, 0x03, 0x28, 0x05, 0x52,
0x12, 0x16, 0x0a, 0x06, 0x56, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44,
0x52, 0x06, 0x56, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x12, 0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e,
0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72,
0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69,
0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x6d, 0x65, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68,
0x49, 0x64, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69,
0x64, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x65, 0x33, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34,
0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35,
0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x65, 0x35, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36,
0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x65, 0x36, 0x12, 0x3e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37,
0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e,
0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67,
0x65, 0x37, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37,
0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x50, 0x72, 0x69,
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07,
0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53,
0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c,
0x65, 0x67, 0x65, 0x38, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76,
0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18,
0x10, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x0f,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x18,
0x11, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74,
0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x12, 0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18,
0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44,
0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x26, 0x0a, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68,
0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x13, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x1a,
0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38,
0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72,
0x49, 0x50, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x20, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x5f, 0x56, 0x49, 0x50, 0x52, 0x03, 0x41, 0x72, 0x72, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x41, 0x72, 0x72, 0x61,
0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x79, 0x12, 0x20, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x52, 0x03,
0x41, 0x72, 0x72, 0x42, 0x26, 0x5a, 0x24, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d,
0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74,
0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f,
0x74, 0x6f, 0x33,
} }
var ( var (

18
protocol/server/pbdata.proto
View File

@ -1577,23 +1577,19 @@ message DB_Task {
int32 Order = 2; int32 Order = 2;
string Name = 3; int32 ActivityType = 3;
string Des = 4; int32 TaskType = 4;
int32 ActivityType = 5; int64 TargetTimes = 5;
int32 TaskType = 6; int64 FinishTimes = 6;
int64 TargetTimes = 7; map<int64, int64> Award = 7;
int64 FinishTimes = 8; int32 GameType = 8;
map<int64, int64> Award = 9; repeated int32 Position = 9;
int32 GameType = 10;
repeated int32 Position = 11;
} }

20
worldsrv/action_task.go
View File

@ -171,8 +171,6 @@ func CSTaskReward(s *netlib.Session, packetId int, data interface{}, sid int64)
return nil return nil
} }
now := time.Now()
ret := &taskproto.SCTaskReward{ ret := &taskproto.SCTaskReward{
OpCode: taskproto.OpResultCode_OPRC_Error, OpCode: taskproto.OpResultCode_OPRC_Error,
Tp: msg.GetTp(), Tp: msg.GetTp(),
@ -183,14 +181,6 @@ func CSTaskReward(s *netlib.Session, packetId int, data interface{}, sid int64)
f := func(id int32) { f := func(id int32) {
if IsTaskFinish(p, id) && !IsTaskReward(p, id) { if IsTaskFinish(p, id) && !IsTaskReward(p, id) {
p.WelfData.Task[id].Ts = time.Now().Unix() p.WelfData.Task[id].Ts = time.Now().Unix()
// 任务完成记录
taskLog := &model.BackendPermitTask{
Platform: p.Platform,
StartTs: PlatformMgrSingleton.GetConfig(p.Platform).PermitStartTs,
SnId: p.SnId,
TaskId: id,
Ts: now.Unix(),
}
data := srvdata.PBDB_TaskMgr.GetData(id) data := srvdata.PBDB_TaskMgr.GetData(id)
if data != nil { if data != nil {
SendReward(p, data.Award, msg.Tp) SendReward(p, data.Award, msg.Tp)
@ -200,17 +190,7 @@ func CSTaskReward(s *netlib.Session, packetId int, data interface{}, sid int64)
} }
ret.Reward[k] = ret.Reward[k] + vv ret.Reward[k] = ret.Reward[k] + vv
} }
for k, v := range ret.Reward {
taskLog.Gain = append(taskLog.Gain, model.AwardItem{
Id: int32(k),
Num: v,
})
}
taskLog.TaskName = data.GetDes()
taskLog.ActivityType = data.GetActivityType()
taskLog.TaskType = data.GetTaskType()
} }
LogChannelSingleton.WriteLog(taskLog)
ret.OpCode = taskproto.OpResultCode_OPRC_Success ret.OpCode = taskproto.OpResultCode_OPRC_Success
} }
} }

28
worldsrv/bagmgr.go
View File

@ -176,6 +176,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
cost = params[0].Cost cost = params[0].Cost
} }
longItem := this.GetItem(p.SnId, common.ItemIDPermit)
var items []*Item var items []*Item
for _, v := range addItems { for _, v := range addItems {
if v == nil || v.ItemNum == 0 { if v == nil || v.ItemNum == 0 {
@ -219,7 +220,7 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
} }
// 添加道具到背包 // 添加道具到背包
var permitScore, long int64
var changeItems []int32 var changeItems []int32
var newBagInfo *BagInfo var newBagInfo *BagInfo
if _, exist := this.PlayerBag[p.SnId]; !exist { if _, exist := this.PlayerBag[p.SnId]; !exist {
@ -328,12 +329,6 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
p.VCardCost = 0 p.VCardCost = 0
} }
} }
if v.ItemId == common.ItemIDPermit && v.ItemNum > 0 {
permitScore += v.ItemNum
}
if v.ItemId == common.ItemIDLong && v.ItemNum > 0 {
long += v.ItemNum
}
} }
if len(changeItems) > 0 { if len(changeItems) > 0 {
@ -358,6 +353,14 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
StartTs: startTs, StartTs: startTs,
Ts: time.Now().Unix(), Ts: time.Now().Unix(),
}) })
// 参与赛季通行证活动
if longItem == nil || longItem.ItemNum == 0 {
LogChannelSingleton.WriteLog(&model.BackendPermitJoin{
Platform: p.Platform,
StartTs: PlatformMgrSingleton.GetConfig(p.Platform).PermitStartTs,
SnId: p.SnId,
})
}
} }
} }
if v == common.ItemIDLong { if v == common.ItemIDLong {
@ -365,17 +368,6 @@ func (this *BagMgr) AddItems(p *Player, addItems []*Item, add int64, gainWay int
} }
} }
if permitScore > 0 || long > 0 {
LogChannelSingleton.WriteLog(&model.BackendPermitJoin{
Platform: p.Platform,
StartTs: PlatformMgrSingleton.GetConfig(p.Platform).PermitStartTs,
SnId: p.SnId,
Score: permitScore,
Long: long,
Ts: time.Now().Unix(),
})
}
if code != bag.OpResultCode_OPRC_Sucess { if code != bag.OpResultCode_OPRC_Sucess {
return newBagInfo, code, false return newBagInfo, code, false
} }

1
worldsrv/logchannel.go
View File

@ -68,5 +68,4 @@ func init() {
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitRank, &model.BackendPermitRank{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitRank, &model.BackendPermitRank{})
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitExchange, &model.BackendPermitExchange{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitExchange, &model.BackendPermitExchange{})
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitJoin, &model.BackendPermitJoin{}) LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitJoin, &model.BackendPermitJoin{})
LogChannelSingleton.RegisterLogCName(mq.BackSystemPermitTask, &model.BackendPermitTask{})
} }

1
worldsrv/player.go
View File

@ -3948,7 +3948,6 @@ func (this *Player) GetPayGoodsInfo() {
Platform: this.Platform, Platform: this.Platform,
StartTs: PlatformMgrSingleton.GetConfig(this.Platform).PermitStartTs, StartTs: PlatformMgrSingleton.GetConfig(this.Platform).PermitStartTs,
SnId: this.SnId, SnId: this.SnId,
Ts: time.Now().Unix(),
}) })
} }
switch info.Remark { switch info.Remark {

1
worldsrv/trascate_webapi.go
View File

@ -3471,7 +3471,6 @@ func init() {
Platform: player.Platform, Platform: player.Platform,
StartTs: PlatformMgrSingleton.GetConfig(player.Platform).PermitStartTs, StartTs: PlatformMgrSingleton.GetConfig(player.Platform).PermitStartTs,
SnId: player.SnId, SnId: player.SnId,
Ts: time.Now().Unix(),
}) })
} }
switch info.Remark { switch info.Remark {

BIN
xlsx/DB_Task.xlsx
View File

Binary file not shown.