From 9a241060e1505768dea78d9609ee3bfe9dc10e68 Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Wed, 1 Mar 2023 17:35:23 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=89=E8=90=BD=E8=A7=84=E5=88=99=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=20+=20=E5=8A=9F=E5=A4=AB=E5=A4=A7=E5=B8=88=E6=8C=91?= =?UTF-8?q?=E6=88=98=E5=A1=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_drop.json | 1205 ++++++++++-------------- modules/comp_configure.go | 14 +- modules/pagoda/api_getlist.go | 22 +- modules/pagoda/model_pagoda.go | 11 +- modules/smithy/api_forgeequip.go | 5 +- modules/smithy/comp_configure.go | 4 +- modules/smithy/model_stove.go | 20 + sys/configure/structs/game.DropData.go | 6 +- 8 files changed, 538 insertions(+), 749 deletions(-) diff --git a/bin/json/game_drop.json b/bin/json/game_drop.json index 5e58be268..fb1b606ef 100644 --- a/bin/json/game_drop.json +++ b/bin/json/game_drop.json @@ -2,6 +2,7 @@ { "id": 1, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -10,13 +11,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 2, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -25,13 +25,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 3, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -40,13 +39,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 4, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -55,13 +53,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 5, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -70,13 +67,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 6, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -85,13 +81,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 7, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -100,13 +95,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 8, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -115,13 +109,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 9, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -130,13 +123,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 10, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -145,13 +137,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 11, "dropid": 1001, + "condition": 0, "prize": [ { "a": "item", @@ -160,13 +151,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 12, "dropid": 1001, + "condition": 9, "prize": [ { "a": "item", @@ -175,13 +165,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 13, "dropid": 1002, + "condition": 0, "prize": [ { "a": "item", @@ -190,13 +179,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 14, "dropid": 1002, + "condition": 0, "prize": [ { "a": "item", @@ -205,13 +193,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 15, "dropid": 1002, + "condition": 0, "prize": [ { "a": "item", @@ -220,13 +207,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 16, "dropid": 1003, + "condition": 0, "prize": [ { "a": "item", @@ -235,13 +221,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 17, "dropid": 1003, + "condition": 0, "prize": [ { "a": "item", @@ -250,13 +235,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 18, "dropid": 1003, + "condition": 0, "prize": [ { "a": "item", @@ -265,13 +249,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 19, "dropid": 1004, + "condition": 0, "prize": [ { "a": "equi", @@ -280,13 +263,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 20, "dropid": 1004, + "condition": 0, "prize": [ { "a": "equi", @@ -295,13 +277,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 21, "dropid": 1004, + "condition": 0, "prize": [ { "a": "equi", @@ -310,13 +291,12 @@ } ], "star": 2, - "p": 333, - "enable_type": 1, - "condition": 9 + "p": 333 }, { "id": 22, "dropid": 1005, + "condition": 0, "prize": [ { "a": "equi", @@ -325,13 +305,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 23, "dropid": 1005, + "condition": 0, "prize": [ { "a": "equi", @@ -340,13 +319,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 24, "dropid": 1005, + "condition": 0, "prize": [ { "a": "equi", @@ -355,13 +333,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 25, "dropid": 1006, + "condition": 0, "prize": [ { "a": "equi", @@ -370,13 +347,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 26, "dropid": 1006, + "condition": 0, "prize": [ { "a": "equi", @@ -385,13 +361,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 27, "dropid": 1006, + "condition": 0, "prize": [ { "a": "equi", @@ -400,13 +375,12 @@ } ], "star": 3, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 28, "dropid": 1007, + "condition": 0, "prize": [ { "a": "equi", @@ -415,13 +389,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 29, "dropid": 1007, + "condition": 0, "prize": [ { "a": "equi", @@ -430,13 +403,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 30, "dropid": 1007, + "condition": 0, "prize": [ { "a": "equi", @@ -445,13 +417,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 31, "dropid": 1008, + "condition": 0, "prize": [ { "a": "equi", @@ -460,13 +431,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 32, "dropid": 1008, + "condition": 0, "prize": [ { "a": "equi", @@ -475,13 +445,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 33, "dropid": 1008, + "condition": 0, "prize": [ { "a": "equi", @@ -490,13 +459,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 34, "dropid": 1009, + "condition": 0, "prize": [ { "a": "equi", @@ -505,13 +473,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 35, "dropid": 1009, + "condition": 0, "prize": [ { "a": "equi", @@ -520,13 +487,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 36, "dropid": 1009, + "condition": 0, "prize": [ { "a": "equi", @@ -535,13 +501,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 37, "dropid": 1010, + "condition": 0, "prize": [ { "a": "equi", @@ -550,13 +515,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 38, "dropid": 1010, + "condition": 0, "prize": [ { "a": "equi", @@ -565,13 +529,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 39, "dropid": 1010, + "condition": 0, "prize": [ { "a": "equi", @@ -580,13 +543,12 @@ } ], "star": 5, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 40, "dropid": 1011, + "condition": 0, "prize": [ { "a": "equi", @@ -595,13 +557,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 41, "dropid": 1011, + "condition": 0, "prize": [ { "a": "equi", @@ -610,13 +571,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 42, "dropid": 1011, + "condition": 0, "prize": [ { "a": "equi", @@ -625,13 +585,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 43, "dropid": 1012, + "condition": 0, "prize": [ { "a": "equi", @@ -640,13 +599,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 44, "dropid": 1012, + "condition": 0, "prize": [ { "a": "equi", @@ -655,13 +613,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 45, "dropid": 1012, + "condition": 0, "prize": [ { "a": "equi", @@ -670,13 +627,12 @@ } ], "star": 6, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 46, "dropid": 1013, + "condition": 0, "prize": [ { "a": "equi", @@ -685,13 +641,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 47, "dropid": 1013, + "condition": 0, "prize": [ { "a": "equi", @@ -700,13 +655,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 48, "dropid": 1013, + "condition": 0, "prize": [ { "a": "equi", @@ -715,13 +669,12 @@ } ], "star": 1, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 49, "dropid": 1014, + "condition": 0, "prize": [ { "a": "equi", @@ -730,13 +683,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 50, "dropid": 1015, + "condition": 0, "prize": [ { "a": "equi", @@ -745,13 +697,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 51, "dropid": 1016, + "condition": 0, "prize": [ { "a": "equi", @@ -760,13 +711,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 52, "dropid": 1017, + "condition": 0, "prize": [ { "a": "equi", @@ -775,13 +725,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 53, "dropid": 1018, + "condition": 0, "prize": [ { "a": "equi", @@ -790,13 +739,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 54, "dropid": 1019, + "condition": 0, "prize": [ { "a": "equi", @@ -805,13 +753,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 55, "dropid": 1020, + "condition": 0, "prize": [ { "a": "equi", @@ -820,13 +767,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 56, "dropid": 1021, + "condition": 0, "prize": [ { "a": "equi", @@ -835,13 +781,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 57, "dropid": 1022, + "condition": 0, "prize": [ { "a": "equi", @@ -850,13 +795,12 @@ } ], "star": 2, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 58, "dropid": 1023, + "condition": 0, "prize": [ { "a": "equi", @@ -865,13 +809,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 59, "dropid": 1024, + "condition": 0, "prize": [ { "a": "equi", @@ -880,13 +823,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 60, "dropid": 1025, + "condition": 0, "prize": [ { "a": "equi", @@ -895,13 +837,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 61, "dropid": 1026, + "condition": 0, "prize": [ { "a": "equi", @@ -910,13 +851,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 62, "dropid": 1027, + "condition": 0, "prize": [ { "a": "equi", @@ -925,13 +865,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 63, "dropid": 1028, + "condition": 0, "prize": [ { "a": "equi", @@ -940,13 +879,12 @@ } ], "star": 3, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 64, "dropid": 1029, + "condition": 0, "prize": [ { "a": "equi", @@ -955,13 +893,12 @@ } ], "star": 4, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 65, "dropid": 1030, + "condition": 0, "prize": [ { "a": "equi", @@ -970,13 +907,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 66, "dropid": 1030, + "condition": 0, "prize": [ { "a": "equi", @@ -985,13 +921,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 67, "dropid": 1030, + "condition": 0, "prize": [ { "a": "equi", @@ -1000,13 +935,12 @@ } ], "star": 4, - "p": 333, - "enable_type": 0, - "condition": 0 + "p": 333 }, { "id": 68, "dropid": 10001, + "condition": 0, "prize": [ { "a": "equi", @@ -1015,13 +949,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 69, "dropid": 10001, + "condition": 0, "prize": [ { "a": "equi", @@ -1030,13 +963,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 70, "dropid": 10001, + "condition": 0, "prize": [ { "a": "equi", @@ -1045,13 +977,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 71, "dropid": 10001, + "condition": 0, "prize": [ { "a": "equi", @@ -1060,13 +991,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 72, "dropid": 20003, + "condition": 0, "prize": [ { "a": "equi", @@ -1075,13 +1005,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 73, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1090,13 +1019,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 74, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1105,13 +1033,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 75, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1120,13 +1047,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 76, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1135,13 +1061,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 77, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1150,13 +1075,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 78, "dropid": 60001, + "condition": 0, "prize": [ { "a": "equi", @@ -1165,13 +1089,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 79, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1180,13 +1103,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 80, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1195,13 +1117,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 81, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1210,13 +1131,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 82, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1225,13 +1145,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 83, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1240,13 +1159,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 84, "dropid": 60002, + "condition": 0, "prize": [ { "a": "equi", @@ -1255,13 +1173,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 85, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1270,13 +1187,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 86, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1285,13 +1201,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 87, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1300,13 +1215,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 88, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1315,13 +1229,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 89, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1330,13 +1243,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 90, "dropid": 60003, + "condition": 0, "prize": [ { "a": "equi", @@ -1345,13 +1257,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 91, "dropid": 50005, + "condition": 0, "prize": [ { "a": "item", @@ -1360,13 +1271,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 92, "dropid": 50006, + "condition": 0, "prize": [ { "a": "item", @@ -1375,13 +1285,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 93, "dropid": 50007, + "condition": 0, "prize": [ { "a": "item", @@ -1390,13 +1299,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 94, "dropid": 50008, + "condition": 0, "prize": [ { "a": "item", @@ -1405,13 +1313,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 95, "dropid": 50009, + "condition": 0, "prize": [ { "a": "item", @@ -1420,13 +1327,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 96, "dropid": 50010, + "condition": 0, "prize": [ { "a": "item", @@ -1435,13 +1341,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 97, "dropid": 50011, + "condition": 0, "prize": [ { "a": "item", @@ -1450,13 +1355,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 98, "dropid": 50012, + "condition": 0, "prize": [ { "a": "item", @@ -1465,13 +1369,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 99, "dropid": 70001, + "condition": 0, "prize": [ { "a": "item", @@ -1480,13 +1383,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 100, "dropid": 70001, + "condition": 0, "prize": [ { "a": "item", @@ -1495,13 +1397,12 @@ } ], "star": 1, - "p": 250, - "enable_type": 0, - "condition": 0 + "p": 250 }, { "id": 101, "dropid": 70001, + "condition": 0, "prize": [ { "a": "item", @@ -1510,13 +1411,12 @@ } ], "star": 1, - "p": 67, - "enable_type": 0, - "condition": 0 + "p": 67 }, { "id": 102, "dropid": 70002, + "condition": 0, "prize": [ { "a": "item", @@ -1525,13 +1425,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 103, "dropid": 70002, + "condition": 0, "prize": [ { "a": "item", @@ -1540,13 +1439,12 @@ } ], "star": 1, - "p": 250, - "enable_type": 0, - "condition": 0 + "p": 250 }, { "id": 104, "dropid": 70002, + "condition": 0, "prize": [ { "a": "item", @@ -1555,13 +1453,12 @@ } ], "star": 1, - "p": 67, - "enable_type": 0, - "condition": 0 + "p": 67 }, { "id": 105, "dropid": 70003, + "condition": 0, "prize": [ { "a": "item", @@ -1570,13 +1467,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 106, "dropid": 70003, + "condition": 0, "prize": [ { "a": "item", @@ -1585,13 +1481,12 @@ } ], "star": 1, - "p": 250, - "enable_type": 0, - "condition": 0 + "p": 250 }, { "id": 107, "dropid": 70003, + "condition": 0, "prize": [ { "a": "item", @@ -1600,13 +1495,12 @@ } ], "star": 1, - "p": 67, - "enable_type": 0, - "condition": 0 + "p": 67 }, { "id": 108, "dropid": 70004, + "condition": 0, "prize": [ { "a": "item", @@ -1615,13 +1509,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 109, "dropid": 70004, + "condition": 0, "prize": [ { "a": "item", @@ -1630,13 +1523,12 @@ } ], "star": 1, - "p": 250, - "enable_type": 0, - "condition": 0 + "p": 250 }, { "id": 110, "dropid": 70004, + "condition": 0, "prize": [ { "a": "item", @@ -1645,13 +1537,12 @@ } ], "star": 1, - "p": 67, - "enable_type": 0, - "condition": 0 + "p": 67 }, { "id": 111, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1660,13 +1551,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 112, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1675,13 +1565,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 113, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1690,13 +1579,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 114, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1705,13 +1593,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 115, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1720,13 +1607,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 116, "dropid": 80001, + "condition": 0, "prize": [ { "a": "equi", @@ -1735,13 +1621,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 117, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1750,13 +1635,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 118, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1765,13 +1649,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 119, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1780,13 +1663,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 120, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1795,13 +1677,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 121, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1810,13 +1691,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 122, "dropid": 80002, + "condition": 0, "prize": [ { "a": "equi", @@ -1825,13 +1705,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 123, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1840,13 +1719,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 124, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1855,13 +1733,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 125, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1870,13 +1747,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 126, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1885,13 +1761,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 127, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1900,13 +1775,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 128, "dropid": 80003, + "condition": 0, "prize": [ { "a": "equi", @@ -1915,13 +1789,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 129, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -1930,13 +1803,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 130, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -1945,13 +1817,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 131, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -1960,13 +1831,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 132, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -1975,13 +1845,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 133, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -1990,13 +1859,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 134, "dropid": 80004, + "condition": 0, "prize": [ { "a": "equi", @@ -2005,13 +1873,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 135, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2020,13 +1887,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 136, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2035,13 +1901,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 137, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2050,13 +1915,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 138, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2065,13 +1929,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 139, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2080,13 +1943,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 140, "dropid": 80005, + "condition": 0, "prize": [ { "a": "equi", @@ -2095,13 +1957,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 141, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2110,13 +1971,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 142, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2125,13 +1985,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 143, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2140,13 +1999,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 144, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2155,13 +2013,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 145, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2170,13 +2027,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 146, "dropid": 80006, + "condition": 0, "prize": [ { "a": "equi", @@ -2185,13 +2041,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 147, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2200,13 +2055,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 148, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2215,13 +2069,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 149, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2230,13 +2083,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 150, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2245,13 +2097,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 151, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2260,13 +2111,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 152, "dropid": 80007, + "condition": 0, "prize": [ { "a": "equi", @@ -2275,13 +2125,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 153, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2290,13 +2139,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 154, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2305,13 +2153,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 155, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2320,13 +2167,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 156, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2335,13 +2181,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 157, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2350,13 +2195,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 158, "dropid": 80008, + "condition": 0, "prize": [ { "a": "equi", @@ -2365,13 +2209,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 159, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2380,13 +2223,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 160, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2395,13 +2237,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 161, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2410,13 +2251,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 162, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2425,13 +2265,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 163, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2440,13 +2279,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 164, "dropid": 80009, + "condition": 0, "prize": [ { "a": "equi", @@ -2455,13 +2293,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 165, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2470,13 +2307,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 166, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2485,13 +2321,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 167, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2500,13 +2335,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 168, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2515,13 +2349,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 169, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2530,13 +2363,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 170, "dropid": 80010, + "condition": 0, "prize": [ { "a": "equi", @@ -2545,13 +2377,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 171, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2560,13 +2391,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 172, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2575,13 +2405,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 173, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2590,13 +2419,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 174, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2605,13 +2433,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 175, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2620,13 +2447,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 176, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2635,13 +2461,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 177, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2650,13 +2475,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 178, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2665,13 +2489,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 179, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2680,13 +2503,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 180, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2695,13 +2517,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 181, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2710,13 +2531,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 182, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2725,13 +2545,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 183, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2740,13 +2559,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 184, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2755,13 +2573,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 185, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2770,13 +2587,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 186, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2785,13 +2601,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 187, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2800,13 +2615,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 188, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2815,13 +2629,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 189, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2830,13 +2643,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 190, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2845,13 +2657,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 191, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2860,13 +2671,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 192, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2875,13 +2685,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 193, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2890,13 +2699,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 194, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2905,13 +2713,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 195, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2920,13 +2727,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 196, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2935,13 +2741,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 197, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2950,13 +2755,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 198, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2965,13 +2769,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 199, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2980,13 +2783,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 200, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -2995,13 +2797,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 201, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3010,13 +2811,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 202, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3025,13 +2825,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 203, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3040,13 +2839,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 204, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3055,13 +2853,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 205, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3070,13 +2867,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 206, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3085,13 +2881,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 207, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3100,13 +2895,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 208, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3115,13 +2909,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 209, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3130,13 +2923,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 210, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3145,13 +2937,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 211, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3160,13 +2951,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 212, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3175,13 +2965,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 213, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3190,13 +2979,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 214, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3205,13 +2993,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 215, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3220,13 +3007,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 216, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3235,13 +3021,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 217, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3250,13 +3035,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 218, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3265,13 +3049,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 219, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3280,13 +3063,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 220, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3295,13 +3077,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 221, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3310,13 +3091,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 222, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3325,13 +3105,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 223, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3340,13 +3119,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 224, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3355,13 +3133,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 225, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3370,13 +3147,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 226, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3385,13 +3161,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 227, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3400,13 +3175,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 228, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3415,13 +3189,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 229, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3430,13 +3203,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 230, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3445,13 +3217,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 231, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3460,13 +3231,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 232, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3475,13 +3245,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 233, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3490,13 +3259,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 234, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3505,13 +3273,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 235, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3520,13 +3287,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 236, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3535,13 +3301,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 237, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3550,13 +3315,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 238, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3565,13 +3329,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 239, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3580,13 +3343,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 240, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3595,13 +3357,12 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 }, { "id": 241, "dropid": 1000001, + "condition": 0, "prize": [ { "a": "item", @@ -3610,8 +3371,6 @@ } ], "star": 1, - "p": 1000, - "enable_type": 0, - "condition": 0 + "p": 1000 } ] \ No newline at end of file diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 762d72e88..77e0b91dc 100644 --- a/modules/comp_configure.go +++ b/modules/comp_configure.go @@ -57,6 +57,8 @@ func (this *MCompConfigure) Init(service core.IService, module core.IModule, com configure.RegisterConfigure(game_drop, cfg.NewGameDrop, this.LoadDropData) configure.RegisterConfigure(game_sign, cfg.NewGameSign, this.LoadSignData) + _d := this.GetDropData(1001) + log.Errorf("%v", _d) return } func (this *MCompConfigure) LoadConfigure(name string, fn interface{}) (err error) { @@ -70,7 +72,17 @@ func (this *MCompConfigure) LoadDropData() { this.hlock.Lock() defer this.hlock.Unlock() for _, value := range configure.GetDataList() { - this._dropMap[value.Dropid] = append(this._dropMap[value.Dropid], value) + + if value.Condition == 0 { + this._dropMap[value.Dropid] = append(this._dropMap[value.Dropid], value) + } else { + key := value.Condition + key = value.Dropid*100 + key + this._dropMap[key] = append(this._dropMap[key], value) + for _, v1 := range this._dropMap[value.Dropid] { + this._dropMap[key] = append(this._dropMap[key], v1) + } + } } return } diff --git a/modules/pagoda/api_getlist.go b/modules/pagoda/api_getlist.go index be9ee05e3..8c2c5dbc3 100644 --- a/modules/pagoda/api_getlist.go +++ b/modules/pagoda/api_getlist.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" - "go.mongodb.org/mongo-driver/bson/primitive" "google.golang.org/protobuf/proto" ) @@ -16,22 +15,15 @@ func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.PagodaGetLi ///获取主线关卡信息 func (this *apiComp) GetList(session comm.IUserSession, req *pb.PagodaGetListReq) (code pb.ErrorCode, data proto.Message) { - var ( - list *pb.DBPagoda - ) - list, _ = this.module.modelPagoda.getPagodaList(session.GetUserId()) - if list.Id == "" { // 普通塔 - list.Id = primitive.NewObjectID().Hex() - - list.Uid = session.GetUserId() - list.PagodaId = 0 // 初始数据0层 - list.Type = comm.PagodaType - this.module.modelPagoda.addNewPagoda(session.GetUserId(), list) - - } else if list.Complete { - list, _ = this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId()) + list, err := this.module.modelPagoda.getPagodaList(session.GetUserId()) + if err != nil { + code = pb.ErrorCode_DBError + return } + // if list.Complete { // 这个版本不给赛季塔信息 + // list, _ = this.module.modelSeasonPagoda.getSeasonPagodaList(session.GetUserId()) + // } session.SendMsg(string(this.module.GetType()), PagodaGetListResp, &pb.PagodaGetListResp{Data: list}) return diff --git a/modules/pagoda/model_pagoda.go b/modules/pagoda/model_pagoda.go index b5ddc5190..fd7c54d67 100644 --- a/modules/pagoda/model_pagoda.go +++ b/modules/pagoda/model_pagoda.go @@ -7,6 +7,7 @@ import ( "go_dreamfactory/modules" "go_dreamfactory/pb" + "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" "go.mongodb.org/mongo-driver/x/bsonx" ) @@ -30,8 +31,14 @@ func (this *ModelPagoda) Init(service core.IService, module core.IModule, comp c // 获取爬塔信息 func (this *ModelPagoda) getPagodaList(uid string) (result *pb.DBPagoda, err error) { result = &pb.DBPagoda{} - if err = this.Get(uid, result); err != nil && err == mgo.MongodbNil { - err = nil + if err = this.Get(uid, result); err != nil && err == mgo.MongodbNil { // 初始一条数据 + result.Id = primitive.NewObjectID().Hex() + result.Uid = uid + result.PagodaId = 0 // 初始数据0层 + result.Reward = make(map[int32]bool, 0) + result.Type = comm.PagodaType + err = this.module.modelPagoda.addNewPagoda(uid, result) + return } diff --git a/modules/smithy/api_forgeequip.go b/modules/smithy/api_forgeequip.go index 3ca871556..69653c3f9 100644 --- a/modules/smithy/api_forgeequip.go +++ b/modules/smithy/api_forgeequip.go @@ -150,8 +150,9 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq return } } else { - res := this.module.configure.GetDropReward(reelcfg.BasicDrop) - //res := this.module.configure.GetSmithyDropReward(reelcfg.BasicDrop) + // 获取掉落id + newdrop := this.module.modelStove.CheckUnlockSuid(req.ReelId, stove.Data[req.ReelId].Lv, reelcfg.BasicDrop) + res := this.module.configure.GetDropReward(newdrop) if err, atno := this.module.DispenseAtno(session, res, true); err == pb.ErrorCode_Success { for _, v := range atno { if eq, err1 := this.module.ModuleEquipment.QueryEquipment(session.GetUserId(), v.O); err1 == pb.ErrorCode_Success { diff --git a/modules/smithy/comp_configure.go b/modules/smithy/comp_configure.go index 6dc1cbc8d..e6859df59 100644 --- a/modules/smithy/comp_configure.go +++ b/modules/smithy/comp_configure.go @@ -207,8 +207,8 @@ func (this *configureComp) LoadProficileData() { return } -func (this *configureComp) GetSmithyProficileData(reelid int32, proficile int32) *cfg.GameSmithyProficiencyData { - return this._mapProficile[int64(reelid<<16)+int64(proficile)] +func (this *configureComp) GetSmithyProficileData(reelid int32, lv int32) *cfg.GameSmithyProficiencyData { + return this._mapProficile[int64(reelid<<16)+int64(lv)] } // 获取铁匠铺顾客配置 diff --git a/modules/smithy/model_stove.go b/modules/smithy/model_stove.go index ca9f86ae7..93d01777a 100644 --- a/modules/smithy/model_stove.go +++ b/modules/smithy/model_stove.go @@ -9,6 +9,7 @@ import ( "go_dreamfactory/pb" "go_dreamfactory/sys/configure" cfg "go_dreamfactory/sys/configure/structs" + "math" "math/big" "strconv" @@ -210,3 +211,22 @@ func (this *modelStove) GetRandEquipLv(sz []int32) int32 { } return 0 } + +func (this *modelStove) CheckUnlockSuid(reelId, lv, dropid int32) int32 { + var index int32 + var szDrop []int32 + var szLen int32 + for index = 1; index <= lv; index++ { + if conf := this.module.configure.GetSmithyProficileData(reelId, index); conf != nil { + if conf.Type == comm.SmithyReelType4 && conf.Value1 != 0 { + szDrop = append(szDrop, conf.Value1) + } + } + } + szLen = int32(len(szDrop)) + dropid *= int32(math.Pow(10, float64(szLen))) + for pos, v := range szDrop { + dropid += v * int32(math.Pow(10, float64(pos))) + } + return dropid +} diff --git a/sys/configure/structs/game.DropData.go b/sys/configure/structs/game.DropData.go index 21ef8d0c5..73740a0b6 100644 --- a/sys/configure/structs/game.DropData.go +++ b/sys/configure/structs/game.DropData.go @@ -13,11 +13,10 @@ import "errors" type GameDropData struct { Id int32 Dropid int32 + Condition int32 Prize []*Gameatn Star int32 P int32 - EnableType int32 - Condition int32 } const TypeId_GameDropData = 1700203957 @@ -29,6 +28,7 @@ func (*GameDropData) GetTypeId() int32 { func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dropid"].(float64); !_ok_ { err = errors.New("dropid error"); return }; _v.Dropid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool @@ -45,8 +45,6 @@ func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enable_type"].(float64); !_ok_ { err = errors.New("enable_type error"); return }; _v.EnableType = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } return }