From 67385797e57bbbd24526419d89d954ba0cce2370 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 14 Dec 2022 14:27:39 +0800 Subject: [PATCH] =?UTF-8?q?vip=20=E7=89=B9=E6=9D=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_privilege.json | 2035 ++++++++++++++++++- bin/json/game_privilegecard.json | 16 +- modules/hero/hero_test.go | 14 +- modules/privilege/configure.go | 21 +- modules/privilege/model_vip.go | 15 +- modules/privilege/module.go | 69 +- pb/privilege_db.pb.go | 183 +- stress/server/dispose.go | 2 +- sys/configure/structs/Game.PrivilegeData.go | 4 + 9 files changed, 2215 insertions(+), 144 deletions(-) diff --git a/bin/json/game_privilege.json b/bin/json/game_privilege.json index dd8b12486..e5294e4d2 100644 --- a/bin/json/game_privilege.json +++ b/bin/json/game_privilege.json @@ -1,79 +1,2030 @@ [ { - "privilege_id": 10001, + "privilege_id": 10101, + "privilege_type": 1, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10001", - "text": "特权描述1" + "key": "privilege_10101", + "text": "每日获得" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10001", - "text": "特权描述1" - } + "key": "PrivilegeAfter_10101", + "text": "60钻石" + }, + "privilege_parameter": 60 }, { - "privilege_id": 10002, + "privilege_id": 10201, + "privilege_type": 2, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10002", - "text": "特权描述2" + "key": "privilege_10201", + "text": "金币商店每日" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10002", - "text": "特权描述2" - } + "key": "PrivilegeAfter_10201", + "text": "免费刷新次数+1" + }, + "privilege_parameter": 1 }, { - "privilege_id": 10003, + "privilege_id": 10301, + "privilege_type": 7, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10003", - "text": "特权描述3" + "key": "privilege_10301", + "text": "巨怪商队" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10003", - "text": "特权描述3" - } + "key": "PrivilegeAfter_10301", + "text": "背包容量+1" + }, + "privilege_parameter": 1 }, { - "privilege_id": 10004, + "privilege_id": 10104, + "privilege_type": 1, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10004", - "text": "特权描述4" + "key": "privilege_10104", + "text": "每日获得" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10004", - "text": "特权描述4" - } + "key": "PrivilegeAfter_10104", + "text": "90钻石" + }, + "privilege_parameter": 0 }, { - "privilege_id": 10005, + "privilege_id": 10205, + "privilege_type": 2, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10005", - "text": "特权描述5" + "key": "privilege_10205", + "text": "金币商店每日" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10005", - "text": "特权描述5" - } + "key": "PrivilegeAfter_10205", + "text": "免费刷新次数+1" + }, + "privilege_parameter": 1 }, { - "privilege_id": 10006, + "privilege_id": 10306, + "privilege_type": 7, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10006", - "text": "特权描述6" + "key": "privilege_10306", + "text": "巨怪商队" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10006", - "text": "特权描述6" - } + "key": "PrivilegeAfter_10306", + "text": "背包容量+1" + }, + "privilege_parameter": 1 }, { - "privilege_id": 10007, + "privilege_id": 20101, + "privilege_type": 1, "privilege_DescribeFront": { - "key": "PrivilegeCardFront_10007", - "text": "特权描述7" + "key": "privilege_20101", + "text": "每日获得钻石*5" }, "privilege_DescribeAfter": { - "key": "PrivilegeCardAfter_10007", - "text": "特权描述7" - } + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20102, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20102", + "text": "每日获得钻石*10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20103, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20103", + "text": "每日获得钻石*15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20104, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20104", + "text": "每日获得钻石*25" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 25 + }, + { + "privilege_id": 20105, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20105", + "text": "每日获得钻石*35" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 35 + }, + { + "privilege_id": 20106, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20106", + "text": "每日获得钻石*45" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 45 + }, + { + "privilege_id": 20107, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20107", + "text": "每日获得钻石*60" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 55 + }, + { + "privilege_id": 20108, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20108", + "text": "每日获得钻石*75" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 65 + }, + { + "privilege_id": 20109, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20109", + "text": "每日获得钻石*90" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 75 + }, + { + "privilege_id": 20110, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20110", + "text": "每日获得钻石*110" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 90 + }, + { + "privilege_id": 20111, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20111", + "text": "每日获得钻石*130" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 130 + }, + { + "privilege_id": 20112, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20112", + "text": "每日获得钻石*150" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 150 + }, + { + "privilege_id": 20113, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20113", + "text": "每日获得钻石*180" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 180 + }, + { + "privilege_id": 20114, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20114", + "text": "每日获得钻石*210" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 210 + }, + { + "privilege_id": 20115, + "privilege_type": 1, + "privilege_DescribeFront": { + "key": "privilege_20115", + "text": "每日获得钻石*240" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 240 + }, + { + "privilege_id": 20201, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20201", + "text": "金币商店每日免费刷新次数+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20202, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20202", + "text": "金币商店每日免费刷新次数+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20203, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20203", + "text": "金币商店每日免费刷新次数+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20204, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20204", + "text": "金币商店每日免费刷新次数+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20205, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20205", + "text": "金币商店每日免费刷新次数+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20206, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20206", + "text": "金币商店每日免费刷新次数+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20207, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20207", + "text": "金币商店每日免费刷新次数+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20208, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20208", + "text": "金币商店每日免费刷新次数+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20209, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20209", + "text": "金币商店每日免费刷新次数+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20210, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20210", + "text": "金币商店每日免费刷新次数+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20211, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20211", + "text": "金币商店每日免费刷新次数+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20212, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20212", + "text": "金币商店每日免费刷新次数+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20213, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20213", + "text": "金币商店每日免费刷新次数+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20214, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20214", + "text": "金币商店每日免费刷新次数+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20215, + "privilege_type": 2, + "privilege_DescribeFront": { + "key": "privilege_20215", + "text": "金币商店每日免费刷新次数+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20301, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20301", + "text": "维京远征每日可购买挑战次数+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20302, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20302", + "text": "维京远征每日可购买挑战次数+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20303, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20303", + "text": "维京远征每日可购买挑战次数+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20304, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20304", + "text": "维京远征每日可购买挑战次数+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20305, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20305", + "text": "维京远征每日可购买挑战次数+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20306, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20306", + "text": "维京远征每日可购买挑战次数+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20307, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20307", + "text": "维京远征每日可购买挑战次数+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20308, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20308", + "text": "维京远征每日可购买挑战次数+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20309, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20309", + "text": "维京远征每日可购买挑战次数+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20310, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20310", + "text": "维京远征每日可购买挑战次数+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20311, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20311", + "text": "维京远征每日可购买挑战次数+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20312, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20312", + "text": "维京远征每日可购买挑战次数+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20313, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20313", + "text": "维京远征每日可购买挑战次数+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20314, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20314", + "text": "维京远征每日可购买挑战次数+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20315, + "privilege_type": 3, + "privilege_DescribeFront": { + "key": "privilege_20315", + "text": "维京远征每日可购买挑战次数+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20401, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20401", + "text": "狩猎每日可购买挑战次数+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20402, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20402", + "text": "狩猎每日可购买挑战次数+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20403, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20403", + "text": "狩猎每日可购买挑战次数+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20404, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20404", + "text": "狩猎每日可购买挑战次数+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20405, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20405", + "text": "狩猎每日可购买挑战次数+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20406, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20406", + "text": "狩猎每日可购买挑战次数+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20407, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20407", + "text": "狩猎每日可购买挑战次数+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20408, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20408", + "text": "狩猎每日可购买挑战次数+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20409, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20409", + "text": "狩猎每日可购买挑战次数+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20410, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20410", + "text": "狩猎每日可购买挑战次数+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20411, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20411", + "text": "狩猎每日可购买挑战次数+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20412, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20412", + "text": "狩猎每日可购买挑战次数+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20413, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20413", + "text": "狩猎每日可购买挑战次数+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20414, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20414", + "text": "狩猎每日可购买挑战次数+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20415, + "privilege_type": 4, + "privilege_DescribeFront": { + "key": "privilege_20415", + "text": "狩猎每日可购买挑战次数+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20501, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20501", + "text": "竞技场每日可购买挑战次数+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20502, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20502", + "text": "竞技场每日可购买挑战次数+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20503, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20503", + "text": "竞技场每日可购买挑战次数+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20504, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20504", + "text": "竞技场每日可购买挑战次数+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20505, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20505", + "text": "竞技场每日可购买挑战次数+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20506, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20506", + "text": "竞技场每日可购买挑战次数+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20507, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20507", + "text": "竞技场每日可购买挑战次数+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20508, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20508", + "text": "竞技场每日可购买挑战次数+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20509, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20509", + "text": "竞技场每日可购买挑战次数+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20510, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20510", + "text": "竞技场每日可购买挑战次数+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20511, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20511", + "text": "竞技场每日可购买挑战次数+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20512, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20512", + "text": "竞技场每日可购买挑战次数+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20513, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20513", + "text": "竞技场每日可购买挑战次数+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20514, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20514", + "text": "竞技场每日可购买挑战次数+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20515, + "privilege_type": 5, + "privilege_DescribeFront": { + "key": "privilege_20515", + "text": "竞技场每日可购买挑战次数+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20601, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20601", + "text": "梦境每日可购买挑战次数+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20602, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20602", + "text": "梦境每日可购买挑战次数+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20603, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20603", + "text": "梦境每日可购买挑战次数+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20604, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20604", + "text": "梦境每日可购买挑战次数+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20605, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20605", + "text": "梦境每日可购买挑战次数+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20606, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20606", + "text": "梦境每日可购买挑战次数+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20607, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20607", + "text": "梦境每日可购买挑战次数+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20608, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20608", + "text": "梦境每日可购买挑战次数+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20609, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20609", + "text": "梦境每日可购买挑战次数+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20610, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20610", + "text": "梦境每日可购买挑战次数+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20611, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20611", + "text": "梦境每日可购买挑战次数+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20612, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20612", + "text": "梦境每日可购买挑战次数+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20613, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20613", + "text": "梦境每日可购买挑战次数+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20614, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20614", + "text": "梦境每日可购买挑战次数+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20615, + "privilege_type": 6, + "privilege_DescribeFront": { + "key": "privilege_20615", + "text": "梦境每日可购买挑战次数+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20701, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20701", + "text": "巨怪商队背包容量+1" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 1 + }, + { + "privilege_id": 20702, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20702", + "text": "巨怪商队背包容量+2" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 2 + }, + { + "privilege_id": 20703, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20703", + "text": "巨怪商队背包容量+3" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 3 + }, + { + "privilege_id": 20704, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20704", + "text": "巨怪商队背包容量+4" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 4 + }, + { + "privilege_id": 20705, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20705", + "text": "巨怪商队背包容量+5" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 5 + }, + { + "privilege_id": 20706, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20706", + "text": "巨怪商队背包容量+6" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 6 + }, + { + "privilege_id": 20707, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20707", + "text": "巨怪商队背包容量+7" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 7 + }, + { + "privilege_id": 20708, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20708", + "text": "巨怪商队背包容量+8" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 8 + }, + { + "privilege_id": 20709, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20709", + "text": "巨怪商队背包容量+9" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 9 + }, + { + "privilege_id": 20710, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20710", + "text": "巨怪商队背包容量+10" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 10 + }, + { + "privilege_id": 20711, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20711", + "text": "巨怪商队背包容量+11" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 11 + }, + { + "privilege_id": 20712, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20712", + "text": "巨怪商队背包容量+12" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 12 + }, + { + "privilege_id": 20713, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20713", + "text": "巨怪商队背包容量+13" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 13 + }, + { + "privilege_id": 20714, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20714", + "text": "巨怪商队背包容量+14" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 14 + }, + { + "privilege_id": 20715, + "privilege_type": 7, + "privilege_DescribeFront": { + "key": "privilege_20715", + "text": "巨怪商队背包容量+15" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 15 + }, + { + "privilege_id": 20801, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20801", + "text": "美食馆每日最大制作时间+30分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 30 + }, + { + "privilege_id": 20802, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20802", + "text": "美食馆每日最大制作时间+45分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 45 + }, + { + "privilege_id": 20803, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20803", + "text": "美食馆每日最大制作时间+60分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 60 + }, + { + "privilege_id": 20804, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20804", + "text": "美食馆每日最大制作时间+75分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 75 + }, + { + "privilege_id": 20805, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20805", + "text": "美食馆每日最大制作时间+90分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 90 + }, + { + "privilege_id": 20806, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20806", + "text": "美食馆每日最大制作时间+105分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 105 + }, + { + "privilege_id": 20807, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20807", + "text": "美食馆每日最大制作时间+120分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 120 + }, + { + "privilege_id": 20808, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20808", + "text": "美食馆每日最大制作时间+135分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 135 + }, + { + "privilege_id": 20809, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20809", + "text": "美食馆每日最大制作时间+150分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 150 + }, + { + "privilege_id": 20810, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20810", + "text": "美食馆每日最大制作时间+165分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 165 + }, + { + "privilege_id": 20811, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20811", + "text": "美食馆每日最大制作时间+180分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 180 + }, + { + "privilege_id": 20812, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20812", + "text": "美食馆每日最大制作时间+195分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 195 + }, + { + "privilege_id": 20813, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20813", + "text": "美食馆每日最大制作时间+210分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 210 + }, + { + "privilege_id": 20814, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20814", + "text": "美食馆每日最大制作时间+225分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 225 + }, + { + "privilege_id": 20815, + "privilege_type": 8, + "privilege_DescribeFront": { + "key": "privilege_20815", + "text": "美食馆每日最大制作时间+240分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 240 + }, + { + "privilege_id": 20901, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20901", + "text": "武馆每日最大练功时间+30分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 30 + }, + { + "privilege_id": 20902, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20902", + "text": "武馆每日最大练功时间+45分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 45 + }, + { + "privilege_id": 20903, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20903", + "text": "武馆每日最大练功时间+60分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 60 + }, + { + "privilege_id": 20904, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20904", + "text": "武馆每日最大练功时间+75分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 75 + }, + { + "privilege_id": 20905, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20905", + "text": "武馆每日最大练功时间+90分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 90 + }, + { + "privilege_id": 20906, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20906", + "text": "武馆每日最大练功时间+105分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 105 + }, + { + "privilege_id": 20907, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20907", + "text": "武馆每日最大练功时间+120分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 120 + }, + { + "privilege_id": 20908, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20908", + "text": "武馆每日最大练功时间+135分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 135 + }, + { + "privilege_id": 20909, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20909", + "text": "武馆每日最大练功时间+150分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 150 + }, + { + "privilege_id": 20910, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20910", + "text": "武馆每日最大练功时间+165分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 165 + }, + { + "privilege_id": 20911, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20911", + "text": "武馆每日最大练功时间+180分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 180 + }, + { + "privilege_id": 20912, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20912", + "text": "武馆每日最大练功时间+195分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 195 + }, + { + "privilege_id": 20913, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20913", + "text": "武馆每日最大练功时间+210分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 210 + }, + { + "privilege_id": 20914, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20914", + "text": "武馆每日最大练功时间+225分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 225 + }, + { + "privilege_id": 20915, + "privilege_type": 9, + "privilege_DescribeFront": { + "key": "privilege_20915", + "text": "武馆每日最大练功时间+240分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 240 + }, + { + "privilege_id": 21001, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21001", + "text": "铁匠铺每日最大锻造时间+30分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 30 + }, + { + "privilege_id": 21002, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21002", + "text": "铁匠铺每日最大锻造时间+45分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 45 + }, + { + "privilege_id": 21003, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21003", + "text": "铁匠铺每日最大锻造时间+60分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 60 + }, + { + "privilege_id": 21004, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21004", + "text": "铁匠铺每日最大锻造时间+75分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 75 + }, + { + "privilege_id": 21005, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21005", + "text": "铁匠铺每日最大锻造时间+90分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 90 + }, + { + "privilege_id": 21006, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21006", + "text": "铁匠铺每日最大锻造时间+105分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 105 + }, + { + "privilege_id": 21007, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21007", + "text": "铁匠铺每日最大锻造时间+120分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 120 + }, + { + "privilege_id": 21008, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21008", + "text": "铁匠铺每日最大锻造时间+135分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 135 + }, + { + "privilege_id": 21009, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21009", + "text": "铁匠铺每日最大锻造时间+150分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 150 + }, + { + "privilege_id": 21010, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21010", + "text": "铁匠铺每日最大锻造时间+165分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 165 + }, + { + "privilege_id": 21011, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21011", + "text": "铁匠铺每日最大锻造时间+180分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 180 + }, + { + "privilege_id": 21012, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21012", + "text": "铁匠铺每日最大锻造时间+195分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 195 + }, + { + "privilege_id": 21013, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21013", + "text": "铁匠铺每日最大锻造时间+210分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 210 + }, + { + "privilege_id": 21014, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21014", + "text": "铁匠铺每日最大锻造时间+225分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 225 + }, + { + "privilege_id": 21015, + "privilege_type": 10, + "privilege_DescribeFront": { + "key": "privilege_21015", + "text": "铁匠铺每日最大锻造时间+240分钟" + }, + "privilege_DescribeAfter": { + "key": "", + "text": "" + }, + "privilege_parameter": 240 } ] \ No newline at end of file diff --git a/bin/json/game_privilegecard.json b/bin/json/game_privilegecard.json index b925f7b1b..460b2ca84 100644 --- a/bin/json/game_privilegecard.json +++ b/bin/json/game_privilegecard.json @@ -20,9 +20,9 @@ } ], "privilege_id": [ - 10001, - 10002, - 10003 + 10101, + 10201, + 10301 ] }, { @@ -46,9 +46,9 @@ } ], "privilege_id": [ - 10004, - 10005, - 10006 + 10401, + 10501, + 10601 ] }, { @@ -59,8 +59,6 @@ "renew_day": 0, "day_reward": [], "disposable_reward": [], - "privilege_id": [ - 10007 - ] + "privilege_id": [] } ] \ No newline at end of file diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 2ee415446..2ace8e4d8 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -70,7 +70,19 @@ func GetMonthStartEnd() (int64, int64) { return _d1, _d2 } func Test_Main(t *testing.T) { - + var list []int32 + var list2 []int32 + list = []int32{1, 2, 3, 4, 5, 6, 7, 8, 9} + list2 = []int32{4, 8, 9} + for _, v := range list2 { + for i, v1 := range list { + if v == v1 { // 找到了 就删除 + //conf.PrivilegeId = append(conf.PrivilegeId, v1) + list = append(list[:i], list[i+1:]...) + break + } + } + } ids := utils.RandomNumbers(0, 10, 5) for _, v := range ids { fmt.Printf("%d", v) diff --git a/modules/privilege/configure.go b/modules/privilege/configure.go index e7f8b29ea..1c3925791 100644 --- a/modules/privilege/configure.go +++ b/modules/privilege/configure.go @@ -47,20 +47,15 @@ func (this *configureComp) GetPrivilegeCard(id string) (configure *cfg.GamePrivi } // 获取指定特权配置 -func (this *configureComp) GetPrivilegeData(id int32) (result *cfg.GamePrivilegeData, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_privilege); err != nil { - this.module.Errorf("err:%v", err) - return - } else { - if result, ok = v.(*cfg.GamePrivilege).GetDataMap()[id]; !ok { - err = fmt.Errorf("GamePrivilegeData not found:%d ", id) - this.module.Errorf("err:%v", err) +func (this *configureComp) GetPrivilegeData(id int32) (result *cfg.GamePrivilegeData) { + + if v, err := this.GetConfigure(game_privilege); err == nil { + + if c, ok := v.(*cfg.GamePrivilege); ok { + result = c.Get(id) return } } - return + this.module.Errorf("GetPrivilegeData err, id:%d", id) + return nil } diff --git a/modules/privilege/model_vip.go b/modules/privilege/model_vip.go index 44d2a5e5f..55742c33d 100644 --- a/modules/privilege/model_vip.go +++ b/modules/privilege/model_vip.go @@ -33,11 +33,18 @@ func (this *ModelVip) Init(service core.IService, module core.IModule, comp core // 获取vip信息 func (this *ModelVip) getVipList(uid string) (vip *pb.DBVip, err error) { vip = &pb.DBVip{} - if err = this.Get(uid, vip); err != nil && err != mgo.MongodbNil { - return + if err = this.Get(uid, vip); err == mgo.MongodbNil { // 没有数据 直接创建一条 + + vip.Id = primitive.NewObjectID().Hex() + vip.CTime = configure.Now().Unix() + if err = this.Add(uid, vip); err != nil { + this.module.Errorf("err:%v", err) + return + } + err = nil + return vip, err } - err = nil - return vip, err + return } // 修改Vip信息 diff --git a/modules/privilege/module.go b/modules/privilege/module.go index abd9e8cae..128c9c468 100644 --- a/modules/privilege/module.go +++ b/modules/privilege/module.go @@ -106,17 +106,36 @@ func (this *Privilege) CreatePrivilegeCard(session comm.IUserSession, cId string if !bFind { data := &pb.DBPrivilege{ - Id: primitive.NewObjectID().Hex(), - Uid: session.GetUserId(), - CId: cId, - PrivilegeID: []int32{}, - CTime: configure.Now().Unix(), - ETime: 0, - RewardTime: configure.Now().Unix(), + Id: primitive.NewObjectID().Hex(), + Uid: session.GetUserId(), + CId: cId, + + CTime: configure.Now().Unix(), + ETime: 0, + RewardTime: configure.Now().Unix(), } data.ETime = configure.Now().Unix() + int64(conf.AssertDay*24*3600) // 设置过期时间 - for _, v := range conf.PrivilegeId { - data.PrivilegeID = append(data.PrivilegeID, v) + + // 特权插入 + vip, err := this.modelVip.getVipList(session.GetUserId()) + if err == nil { + update := map[string]interface{}{} + for _, v := range conf.PrivilegeId { + conf := this.configure.GetPrivilegeData(v) + if conf != nil { + + if _, ok := vip.Privilege[conf.PrivilegeType]; ok { + vip.Privilege[conf.PrivilegeType].PrivilegeID = append(vip.Privilege[conf.PrivilegeType].PrivilegeID, v) + } else { + sz := &pb.PrivilegeData{} + sz.PrivilegeID = append(sz.PrivilegeID, v) + vip.Privilege[conf.PrivilegeType] = sz + } + } + + } + update["privilege"] = vip.Privilege + this.modelVip.modifyVipData(session.GetUserId(), update) } list = append(list, data) this.modelPrivilege.addNewPrivilegeData(session.GetUserId(), data) @@ -189,21 +208,43 @@ func (this *Privilege) CheckPrivilege(session comm.IUserSession, cId string) (pr // 查询特权信息,把过期的特权清除掉 func (this *Privilege) QueryPrivilege(session comm.IUserSession) (privilegeID []int32) { + privilgeList, err := this.modelVip.getVipList(session.GetUserId()) + if err != nil { + return + } list, err := this.modelPrivilege.getPrivilegeList(session.GetUserId()) if err != nil { return } for _, v := range list { + conf, err := this.configure.GetPrivilegeCard(v.CId) + if err != nil { + return nil + } if v.ETime < configure.Now().Unix() { // 判断当前特权是否过期 + if err := this.modelPrivilege.DelListlds(session.GetUserId(), v.Id); err != nil { this.Errorf("delete privilege failed:%v", err) } - } else { - conf, err := this.configure.GetPrivilegeCard(v.CId) - if err != nil { - return nil + update := map[string]interface{}{} + for _, id := range conf.PrivilegeId { // 找到过期的特权 并删除 + data := this.configure.GetPrivilegeData(id) + if data != nil { + + if v, ok := privilgeList.Privilege[data.PrivilegeType]; ok { + + for i, v1 := range v.PrivilegeID { + if v1 == id { // 找到了 就删除 + v.PrivilegeID = append(v.PrivilegeID[:i], v.PrivilegeID[i+1:]...) + break + } + } + } + } } - privilegeID = append(privilegeID, v.PrivilegeID...) + update["privilege"] = privilgeList.Privilege + this.modelVip.modifyVipData(session.GetUserId(), update) // 更新数据 + } else { // 检查 每日奖励是否发放 if !utils.IsToday(v.RewardTime) { v.RewardTime = configure.Now().Unix() diff --git a/pb/privilege_db.pb.go b/pb/privilege_db.pb.go index 782ce1374..b10d88bd0 100644 --- a/pb/privilege_db.pb.go +++ b/pb/privilege_db.pb.go @@ -26,13 +26,13 @@ type DBPrivilege struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - CId string `protobuf:"bytes,3,opt,name=cId,proto3" json:"cId" bson:"cId"` //计费点数ID - PrivilegeID []int32 `protobuf:"varint,4,rep,packed,name=privilegeID,proto3" json:"privilegeID" bson:"privilegeID"` //特权ID - CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` ////购买时间 - ETime int64 `protobuf:"varint,6,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` ////到期时间 - RewardTime int64 `protobuf:"varint,7,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"` //每日奖励时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + CId string `protobuf:"bytes,3,opt,name=cId,proto3" json:"cId" bson:"cId"` //计费点数ID + // repeated int32 privilegeID = 4; //@go_tags(`bson:"privilegeID"`) 特权ID + CTime int64 `protobuf:"varint,4,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` ////购买时间 + ETime int64 `protobuf:"varint,5,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` ////到期时间 + RewardTime int64 `protobuf:"varint,6,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"` //每日奖励时间 } func (x *DBPrivilege) Reset() { @@ -88,13 +88,6 @@ func (x *DBPrivilege) GetCId() string { return "" } -func (x *DBPrivilege) GetPrivilegeID() []int32 { - if x != nil { - return x.PrivilegeID - } - return nil -} - func (x *DBPrivilege) GetCTime() int64 { if x != nil { return x.CTime @@ -116,23 +109,70 @@ func (x *DBPrivilege) GetRewardTime() int64 { return 0 } +type PrivilegeData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + PrivilegeID []int32 `protobuf:"varint,1,rep,packed,name=privilegeID,proto3" json:"privilegeID" bson:"privilegeID"` //特权ID +} + +func (x *PrivilegeData) Reset() { + *x = PrivilegeData{} + if protoimpl.UnsafeEnabled { + mi := &file_privilege_privilege_db_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *PrivilegeData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*PrivilegeData) ProtoMessage() {} + +func (x *PrivilegeData) ProtoReflect() protoreflect.Message { + mi := &file_privilege_privilege_db_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use PrivilegeData.ProtoReflect.Descriptor instead. +func (*PrivilegeData) Descriptor() ([]byte, []int) { + return file_privilege_privilege_db_proto_rawDescGZIP(), []int{1} +} + +func (x *PrivilegeData) GetPrivilegeID() []int32 { + if x != nil { + return x.PrivilegeID + } + return nil +} + type DBVip struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID - Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID - Reward map[int32]bool `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` - PrivilegeID []int32 `protobuf:"varint,4,rep,packed,name=privilegeID,proto3" json:"privilegeID" bson:"privilegeID"` //特权ID - CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` ////购买时间 - RewardTime int64 `protobuf:"varint,6,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"` //每日奖励时间 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID + Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID + Reward map[int32]bool `protobuf:"bytes,3,rep,name=reward,proto3" json:"reward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key vip 等级 + Privilege map[int32]*PrivilegeData `protobuf:"bytes,4,rep,name=privilege,proto3" json:"privilege" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3" bson:"privilege"` //特权ID + CTime int64 `protobuf:"varint,5,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` ////购买时间 + RewardTime int64 `protobuf:"varint,6,opt,name=rewardTime,proto3" json:"rewardTime" bson:"rewardTime"` //每日奖励时间 } func (x *DBVip) Reset() { *x = DBVip{} if protoimpl.UnsafeEnabled { - mi := &file_privilege_privilege_db_proto_msgTypes[1] + mi := &file_privilege_privilege_db_proto_msgTypes[2] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -145,7 +185,7 @@ func (x *DBVip) String() string { func (*DBVip) ProtoMessage() {} func (x *DBVip) ProtoReflect() protoreflect.Message { - mi := &file_privilege_privilege_db_proto_msgTypes[1] + mi := &file_privilege_privilege_db_proto_msgTypes[2] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -158,7 +198,7 @@ func (x *DBVip) ProtoReflect() protoreflect.Message { // Deprecated: Use DBVip.ProtoReflect.Descriptor instead. func (*DBVip) Descriptor() ([]byte, []int) { - return file_privilege_privilege_db_proto_rawDescGZIP(), []int{1} + return file_privilege_privilege_db_proto_rawDescGZIP(), []int{2} } func (x *DBVip) GetId() string { @@ -182,9 +222,9 @@ func (x *DBVip) GetReward() map[int32]bool { return nil } -func (x *DBVip) GetPrivilegeID() []int32 { +func (x *DBVip) GetPrivilege() map[int32]*PrivilegeData { if x != nil { - return x.PrivilegeID + return x.Privilege } return nil } @@ -207,34 +247,41 @@ var File_privilege_privilege_db_proto protoreflect.FileDescriptor var file_privilege_privilege_db_proto_rawDesc = []byte{ 0x0a, 0x1c, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x2f, 0x70, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xaf, + 0x69, 0x6c, 0x65, 0x67, 0x65, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x8d, 0x01, 0x0a, 0x0b, 0x44, 0x42, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x49, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, - 0x49, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, - 0x44, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, - 0x67, 0x65, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, - 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, - 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x22, 0xe8, 0x01, 0x0a, 0x05, 0x44, 0x42, 0x56, 0x69, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, - 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, 0x06, - 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x44, - 0x42, 0x56, 0x69, 0x70, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, - 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, - 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x44, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, - 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x44, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, - 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, - 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, - 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, - 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, - 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, - 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x08, - 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, - 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, + 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, + 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, + 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x22, 0x31, + 0x0a, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x44, 0x61, 0x74, 0x61, 0x12, + 0x20, 0x0a, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, 0x44, 0x18, 0x01, + 0x20, 0x03, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x49, + 0x44, 0x22, 0xc9, 0x02, 0x0a, 0x05, 0x44, 0x42, 0x56, 0x69, 0x70, 0x12, 0x0e, 0x0a, 0x02, 0x69, + 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x2a, 0x0a, + 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, + 0x44, 0x42, 0x56, 0x69, 0x70, 0x2e, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x52, 0x06, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x12, 0x33, 0x0a, 0x09, 0x70, 0x72, 0x69, + 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x44, + 0x42, 0x56, 0x69, 0x70, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x52, 0x09, 0x70, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x12, 0x14, + 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, + 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1e, 0x0a, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, 0x54, 0x69, + 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x72, 0x65, 0x77, 0x61, 0x72, 0x64, + 0x54, 0x69, 0x6d, 0x65, 0x1a, 0x39, 0x0a, 0x0b, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, + 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, + 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, + 0x4c, 0x0a, 0x0e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x45, 0x6e, 0x74, 0x72, + 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, + 0x6b, 0x65, 0x79, 0x12, 0x24, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x44, 0x61, + 0x74, 0x61, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, + 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -249,19 +296,23 @@ func file_privilege_privilege_db_proto_rawDescGZIP() []byte { return file_privilege_privilege_db_proto_rawDescData } -var file_privilege_privilege_db_proto_msgTypes = make([]protoimpl.MessageInfo, 3) +var file_privilege_privilege_db_proto_msgTypes = make([]protoimpl.MessageInfo, 5) var file_privilege_privilege_db_proto_goTypes = []interface{}{ - (*DBPrivilege)(nil), // 0: DBPrivilege - (*DBVip)(nil), // 1: DBVip - nil, // 2: DBVip.RewardEntry + (*DBPrivilege)(nil), // 0: DBPrivilege + (*PrivilegeData)(nil), // 1: PrivilegeData + (*DBVip)(nil), // 2: DBVip + nil, // 3: DBVip.RewardEntry + nil, // 4: DBVip.PrivilegeEntry } var file_privilege_privilege_db_proto_depIdxs = []int32{ - 2, // 0: DBVip.reward:type_name -> DBVip.RewardEntry - 1, // [1:1] is the sub-list for method output_type - 1, // [1:1] is the sub-list for method input_type - 1, // [1:1] is the sub-list for extension type_name - 1, // [1:1] is the sub-list for extension extendee - 0, // [0:1] is the sub-list for field type_name + 3, // 0: DBVip.reward:type_name -> DBVip.RewardEntry + 4, // 1: DBVip.privilege:type_name -> DBVip.PrivilegeEntry + 1, // 2: DBVip.PrivilegeEntry.value:type_name -> PrivilegeData + 3, // [3:3] is the sub-list for method output_type + 3, // [3:3] is the sub-list for method input_type + 3, // [3:3] is the sub-list for extension type_name + 3, // [3:3] is the sub-list for extension extendee + 0, // [0:3] is the sub-list for field type_name } func init() { file_privilege_privilege_db_proto_init() } @@ -283,6 +334,18 @@ func file_privilege_privilege_db_proto_init() { } } file_privilege_privilege_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*PrivilegeData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_privilege_privilege_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*DBVip); i { case 0: return &v.state @@ -301,7 +364,7 @@ func file_privilege_privilege_db_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_privilege_privilege_db_proto_rawDesc, NumEnums: 0, - NumMessages: 3, + NumMessages: 5, NumExtensions: 0, NumServices: 0, }, diff --git a/stress/server/dispose.go b/stress/server/dispose.go index db12e7ea1..4f122bddf 100644 --- a/stress/server/dispose.go +++ b/stress/server/dispose.go @@ -63,7 +63,7 @@ func Dispose(ctx context.Context, concurrency, totalNumber uint64, request *mode // 并发建立长链接 go func(i uint64) { r := robot.NewRobot(request.URL) - r.SetAccount("c71112" + strconv.Itoa(int(i))) + r.SetAccount("d71112" + strconv.Itoa(int(i))) //head := &pb.UserMessage{MainType: "user", SubType: "login"} // 先登录 diff --git a/sys/configure/structs/Game.PrivilegeData.go b/sys/configure/structs/Game.PrivilegeData.go index 94bc9a1ef..d4db307a4 100644 --- a/sys/configure/structs/Game.PrivilegeData.go +++ b/sys/configure/structs/Game.PrivilegeData.go @@ -12,8 +12,10 @@ import "errors" type GamePrivilegeData struct { PrivilegeId int32 + PrivilegeType int32 PrivilegeDescribeFront string PrivilegeDescribeAfter string + PrivilegeParameter int32 } const TypeId_GamePrivilegeData = 40320255 @@ -24,8 +26,10 @@ func (*GamePrivilegeData) GetTypeId() int32 { func (_v *GamePrivilegeData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_id"].(float64); !_ok_ { err = errors.New("privilege_id error"); return }; _v.PrivilegeId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_type"].(float64); !_ok_ { err = errors.New("privilege_type error"); return }; _v.PrivilegeType = int32(_tempNum_) } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["privilege_DescribeFront"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrivilegeDescribeFront error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrivilegeDescribeFront, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["privilege_DescribeAfter"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.PrivilegeDescribeAfter error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.PrivilegeDescribeAfter, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["privilege_parameter"].(float64); !_ok_ { err = errors.New("privilege_parameter error"); return }; _v.PrivilegeParameter = int32(_tempNum_) } return }