diff --git a/bin/json/game_bufflottery.json b/bin/json/game_bufflottery.json index 6ecc7f424..4cfa31d40 100644 --- a/bin/json/game_bufflottery.json +++ b/bin/json/game_bufflottery.json @@ -3086,5 +3086,1557 @@ "GroupNum": 3, "BuffWt": 50, "TypeWt": 75 + }, + { + "Id": 387, + "GroupId": 100007, + "buffID": 770001111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 388, + "GroupId": 100007, + "buffID": 770001112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 389, + "GroupId": 100007, + "buffID": 770002111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 390, + "GroupId": 100007, + "buffID": 770002112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 391, + "GroupId": 100007, + "buffID": 770003111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 392, + "GroupId": 100007, + "buffID": 770003112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 393, + "GroupId": 100007, + "buffID": 770004111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 394, + "GroupId": 100007, + "buffID": 770004112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 395, + "GroupId": 100007, + "buffID": 770005111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 396, + "GroupId": 100007, + "buffID": 770005112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 397, + "GroupId": 100007, + "buffID": 770006111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 398, + "GroupId": 100007, + "buffID": 770006112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 399, + "GroupId": 100007, + "buffID": 770007111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 400, + "GroupId": 100007, + "buffID": 770007112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 401, + "GroupId": 100007, + "buffID": 770008111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 402, + "GroupId": 100007, + "buffID": 770008112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 403, + "GroupId": 100007, + "buffID": 770021111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 404, + "GroupId": 100007, + "buffID": 770021112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 405, + "GroupId": 100007, + "buffID": 770022111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 406, + "GroupId": 100007, + "buffID": 770022112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 407, + "GroupId": 100007, + "buffID": 770023111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 408, + "GroupId": 100007, + "buffID": 770023112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 409, + "GroupId": 100007, + "buffID": 770024111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 410, + "GroupId": 100007, + "buffID": 770024112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 411, + "GroupId": 100007, + "buffID": 770025111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 412, + "GroupId": 100007, + "buffID": 770025112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 413, + "GroupId": 100007, + "buffID": 770026111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 414, + "GroupId": 100007, + "buffID": 770026112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 415, + "GroupId": 100007, + "buffID": 770027111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 416, + "GroupId": 100007, + "buffID": 770027112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 417, + "GroupId": 100007, + "buffID": 770032111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 418, + "GroupId": 100007, + "buffID": 770032112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 419, + "GroupId": 100007, + "buffID": 770041111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 420, + "GroupId": 100007, + "buffID": 770041112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 421, + "GroupId": 100007, + "buffID": 770042111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 422, + "GroupId": 100007, + "buffID": 770042112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 423, + "GroupId": 100007, + "buffID": 770043111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 424, + "GroupId": 100007, + "buffID": 770043112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 425, + "GroupId": 100007, + "buffID": 770047111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 426, + "GroupId": 100007, + "buffID": 770047112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 427, + "GroupId": 100007, + "buffID": 770048111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 428, + "GroupId": 100007, + "buffID": 770048112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 429, + "GroupId": 100007, + "buffID": 770049111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 430, + "GroupId": 100007, + "buffID": 770049112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 431, + "GroupId": 100007, + "buffID": 770057111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 432, + "GroupId": 100007, + "buffID": 770057112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 433, + "GroupId": 100007, + "buffID": 770060111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 434, + "GroupId": 100007, + "buffID": 770060112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 435, + "GroupId": 100007, + "buffID": 770061111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 436, + "GroupId": 100007, + "buffID": 770061112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 437, + "GroupId": 100007, + "buffID": 770062111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 438, + "GroupId": 100007, + "buffID": 770062112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 439, + "GroupId": 100007, + "buffID": 770070111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 440, + "GroupId": 100007, + "buffID": 770070112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 441, + "GroupId": 100007, + "buffID": 770072111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 442, + "GroupId": 100007, + "buffID": 770072112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 443, + "GroupId": 100007, + "buffID": 770074111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 444, + "GroupId": 100007, + "buffID": 770074112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 445, + "GroupId": 100007, + "buffID": 770075111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 446, + "GroupId": 100007, + "buffID": 770075112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 447, + "GroupId": 100007, + "buffID": 770076111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 448, + "GroupId": 100007, + "buffID": 770076112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 449, + "GroupId": 100007, + "buffID": 770077111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 450, + "GroupId": 100007, + "buffID": 770077112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 451, + "GroupId": 100008, + "buffID": 770009111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 452, + "GroupId": 100008, + "buffID": 770009112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 453, + "GroupId": 100008, + "buffID": 770011111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 454, + "GroupId": 100008, + "buffID": 770011112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 455, + "GroupId": 100008, + "buffID": 770013111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 456, + "GroupId": 100008, + "buffID": 770013112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 457, + "GroupId": 100008, + "buffID": 770014111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 458, + "GroupId": 100008, + "buffID": 770014112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 459, + "GroupId": 100008, + "buffID": 770019111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 460, + "GroupId": 100008, + "buffID": 770019112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 461, + "GroupId": 100008, + "buffID": 770020111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 462, + "GroupId": 100008, + "buffID": 770020112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 463, + "GroupId": 100008, + "buffID": 770028111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 464, + "GroupId": 100008, + "buffID": 770028112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 465, + "GroupId": 100008, + "buffID": 770030111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 466, + "GroupId": 100008, + "buffID": 770030112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 467, + "GroupId": 100008, + "buffID": 770033111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 468, + "GroupId": 100008, + "buffID": 770033112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 469, + "GroupId": 100008, + "buffID": 770034111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 470, + "GroupId": 100008, + "buffID": 770034112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 471, + "GroupId": 100008, + "buffID": 770036111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 472, + "GroupId": 100008, + "buffID": 770036112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 473, + "GroupId": 100008, + "buffID": 770039111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 474, + "GroupId": 100008, + "buffID": 770039112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 475, + "GroupId": 100008, + "buffID": 770044111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 476, + "GroupId": 100008, + "buffID": 770044112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 477, + "GroupId": 100008, + "buffID": 770045111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 478, + "GroupId": 100008, + "buffID": 770045112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 479, + "GroupId": 100008, + "buffID": 770046111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 480, + "GroupId": 100008, + "buffID": 770046112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 481, + "GroupId": 100008, + "buffID": 770052111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 482, + "GroupId": 100008, + "buffID": 770052112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 483, + "GroupId": 100008, + "buffID": 770053111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 484, + "GroupId": 100008, + "buffID": 770053112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 485, + "GroupId": 100008, + "buffID": 770054111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 486, + "GroupId": 100008, + "buffID": 770054112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 487, + "GroupId": 100008, + "buffID": 770063111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 488, + "GroupId": 100008, + "buffID": 770063112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 489, + "GroupId": 100008, + "buffID": 770064111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 490, + "GroupId": 100008, + "buffID": 770064112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 491, + "GroupId": 100008, + "buffID": 770066111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 492, + "GroupId": 100008, + "buffID": 770066112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 493, + "GroupId": 100008, + "buffID": 770068111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 494, + "GroupId": 100008, + "buffID": 770068112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 495, + "GroupId": 100008, + "buffID": 770071111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 496, + "GroupId": 100008, + "buffID": 770071112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 497, + "GroupId": 100008, + "buffID": 770080111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 498, + "GroupId": 100008, + "buffID": 770080112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 499, + "GroupId": 100008, + "buffID": 782000111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 500, + "GroupId": 100008, + "buffID": 782001111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 501, + "GroupId": 100008, + "buffID": 782002111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 502, + "GroupId": 100008, + "buffID": 782003111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 503, + "GroupId": 100008, + "buffID": 782004111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 504, + "GroupId": 100008, + "buffID": 782005111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 505, + "GroupId": 100008, + "buffID": 782006111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 506, + "GroupId": 100008, + "buffID": 782007111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 507, + "GroupId": 100008, + "buffID": 782008111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 508, + "GroupId": 100008, + "buffID": 782009111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 509, + "GroupId": 100008, + "buffID": 791000111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 510, + "GroupId": 100008, + "buffID": 791001111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 511, + "GroupId": 100008, + "buffID": 791002111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 512, + "GroupId": 100008, + "buffID": 791003111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 513, + "GroupId": 100008, + "buffID": 791004111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 514, + "GroupId": 100008, + "buffID": 791005111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 515, + "GroupId": 100008, + "buffID": 791006111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 516, + "GroupId": 100008, + "buffID": 791007111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 517, + "GroupId": 100008, + "buffID": 791008111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 518, + "GroupId": 100008, + "buffID": 791009111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 519, + "GroupId": 100008, + "buffID": 791000211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 520, + "GroupId": 100008, + "buffID": 791001211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 521, + "GroupId": 100008, + "buffID": 791002211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 522, + "GroupId": 100008, + "buffID": 791003211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 523, + "GroupId": 100008, + "buffID": 791004211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 524, + "GroupId": 100008, + "buffID": 791005211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 525, + "GroupId": 100008, + "buffID": 791006211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 526, + "GroupId": 100008, + "buffID": 791007211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 527, + "GroupId": 100008, + "buffID": 791008211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 528, + "GroupId": 100008, + "buffID": 791009211, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 529, + "GroupId": 100009, + "buffID": 770010111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 530, + "GroupId": 100009, + "buffID": 770010112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 531, + "GroupId": 100009, + "buffID": 770012111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 532, + "GroupId": 100009, + "buffID": 770012112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 533, + "GroupId": 100009, + "buffID": 770015111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 534, + "GroupId": 100009, + "buffID": 770015112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 535, + "GroupId": 100009, + "buffID": 770016111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 536, + "GroupId": 100009, + "buffID": 770016112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 537, + "GroupId": 100009, + "buffID": 770017111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 538, + "GroupId": 100009, + "buffID": 770017112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 539, + "GroupId": 100009, + "buffID": 770018111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 540, + "GroupId": 100009, + "buffID": 770018112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 541, + "GroupId": 100009, + "buffID": 770029111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 542, + "GroupId": 100009, + "buffID": 770029112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 543, + "GroupId": 100009, + "buffID": 770031111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 544, + "GroupId": 100009, + "buffID": 770031112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 545, + "GroupId": 100009, + "buffID": 770035111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 546, + "GroupId": 100009, + "buffID": 770035112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 547, + "GroupId": 100009, + "buffID": 770037111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 548, + "GroupId": 100009, + "buffID": 770037112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 549, + "GroupId": 100009, + "buffID": 770038111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 550, + "GroupId": 100009, + "buffID": 770038112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 551, + "GroupId": 100009, + "buffID": 770040111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 552, + "GroupId": 100009, + "buffID": 770040112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 553, + "GroupId": 100009, + "buffID": 770050111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 554, + "GroupId": 100009, + "buffID": 770050112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 555, + "GroupId": 100009, + "buffID": 770051111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 556, + "GroupId": 100009, + "buffID": 770051112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 557, + "GroupId": 100009, + "buffID": 770055111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 558, + "GroupId": 100009, + "buffID": 770055112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 559, + "GroupId": 100009, + "buffID": 770056111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 560, + "GroupId": 100009, + "buffID": 770056112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 561, + "GroupId": 100009, + "buffID": 770058111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 562, + "GroupId": 100009, + "buffID": 770058112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 563, + "GroupId": 100009, + "buffID": 770059111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 564, + "GroupId": 100009, + "buffID": 770059112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 565, + "GroupId": 100009, + "buffID": 770065111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 566, + "GroupId": 100009, + "buffID": 770065112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 567, + "GroupId": 100009, + "buffID": 770067111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 568, + "GroupId": 100009, + "buffID": 770067112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 569, + "GroupId": 100009, + "buffID": 770069111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 570, + "GroupId": 100009, + "buffID": 770069112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 571, + "GroupId": 100009, + "buffID": 770073111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 572, + "GroupId": 100009, + "buffID": 770073112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 573, + "GroupId": 100009, + "buffID": 770078111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 574, + "GroupId": 100009, + "buffID": 770078112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 575, + "GroupId": 100009, + "buffID": 770079111, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 576, + "GroupId": 100009, + "buffID": 770079112, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 577, + "GroupId": 100009, + "buffID": 770076113, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 578, + "GroupId": 100009, + "buffID": 770077113, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 579, + "GroupId": 100009, + "buffID": 770070113, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 + }, + { + "Id": 580, + "GroupId": 100009, + "buffID": 770071113, + "GroupNum": 3, + "BuffWt": 50, + "TypeWt": 75 } ] \ No newline at end of file diff --git a/bin/json/game_coin.json b/bin/json/game_coin.json index 521317b51..ae63f1451 100644 --- a/bin/json/game_coin.json +++ b/bin/json/game_coin.json @@ -30,7 +30,7 @@ "keyint": 2, "name": { "key": "item_coin_name_2", - "text": "钻石" + "text": "月光原石" }, "color": 2, "effects": "", diff --git a/bin/json/game_gamesummarytab.json b/bin/json/game_gamesummarytab.json index 5830bf0f7..65b10d3f0 100644 --- a/bin/json/game_gamesummarytab.json +++ b/bin/json/game_gamesummarytab.json @@ -30,7 +30,7 @@ "scale": 0.8, "usetext": { "key": "gamesummary_fathernode_usetext_2", - "text": "探险!这是永远不会停歇的主题!从这里开始你的冒险之旅吧!" + "text": "探险!这是永远不会停歇的主题!从这里开始你的[color=#ffcc00]冒险之旅[/color]吧!" } }, { @@ -149,7 +149,7 @@ "scale": 0.65, "usetext": { "key": "gamesummary_fathernode_usetext_9", - "text": "万物相生,万物相克。使用克制属性去获取更高的排名与更好的奖励吧!" + "text": "万物相生,万物相克。使用[color=#ffcc00]同一属性的守护者组成阵容[/color]挑战这塔吧!" } }, { @@ -166,7 +166,7 @@ "scale": 0.8, "usetext": { "key": "gamesummary_fathernode_usetext_10", - "text": "有人的地方就存在着纷争,·去战胜他人获得竞技币,在竞技商店兑换奖励吧!" + "text": "有人的地方就存在着纷争,·去战胜他人获得[color=#ffcc00]竞技币[/color],在[color=#ffcc00]竞技商店兑换奖励[/color]吧!" } }, { @@ -200,7 +200,7 @@ "scale": 0.8, "usetext": { "key": "gamesummary_fathernode_usetext_12", - "text": "巨怪商人们的脚步永不停歇,听说在他们那赚了足够多的钱财后可以有神秘大奖!" + "text": "巨怪商人们的脚步永不停歇,听说在他们那赚了足够多的瓶盖后可以有[color=#ffcc00]神秘大奖[/color]!" } } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 59a4db7ea..0a4996da1 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -17152,10 +17152,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_birdeggs", + "img": "item_21000002", "intr": { "key": "item_item_intr_358", - "text": "原始鸵鸟产的蛋,具有极高的营养价值。" + "text": "可能产出于:宝贝老板,疯狂原始人" }, "describe": { "key": "item_item_describe_358", @@ -17197,10 +17197,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_conch", + "img": "item_21000003", "intr": { "key": "item_item_intr_359", - "text": "海螺响起时,可能是传递一种信号,也可能是传递一种思念。" + "text": "可能产出于:功夫熊猫" }, "describe": { "key": "item_item_describe_359", @@ -17242,10 +17242,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_neckpillow", + "img": "item_21000004", "intr": { "key": "item_item_intr_360", - "text": "长途旅行过程中,可以把颈枕放在脖子后,缓解疲劳感。" + "text": "可能产出于:坏蛋联盟" }, "describe": { "key": "item_item_describe_360", @@ -17287,10 +17287,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "tem_shellnecklace", + "img": "item_21000005", "intr": { "key": "item_item_intr_361", - "text": "用原始世界各种造型的贝壳串联起来的项链。" + "text": "可能产出于:疯狂外星人,怪物史莱克" }, "describe": { "key": "item_item_describe_361", @@ -17332,10 +17332,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "tem_simplesauce", + "img": "item_21000006", "intr": { "key": "item_item_intr_362", - "text": "平先生做的阳春面,深受和平谷居民的欢迎。" + "text": "可能产出于:驯龙高手" }, "describe": { "key": "item_item_describe_362", @@ -17377,10 +17377,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_skychair", + "img": "item_21000007", "intr": { "key": "item_item_intr_363", - "text": "一个绑满鞭炮的椅子,能够达到一飞冲天的效果。" + "text": "可能产出于:野性精神" }, "describe": { "key": "item_item_describe_363", @@ -17422,10 +17422,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_pandasign", + "img": "item_21000008", "intr": { "key": "item_item_intr_364", - "text": "神龙大侠诞生之后,繁衍出的应援物。" + "text": "可能产出于:疯狂外星人,魔发精灵" }, "describe": { "key": "item_item_describe_364", @@ -17467,10 +17467,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_lantern", + "img": "item_21000009", "intr": { "key": "item_item_intr_365", - "text": "传统手工艺品,逢年过节挂上灯笼,增添节日氛围。" + "text": "可能产出于:宝贝老板" }, "describe": { "key": "item_item_describe_365", @@ -17512,10 +17512,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_smile", + "img": "item_21000010", "intr": { "key": "item_item_intr_366", - "text": "闻名于坏蛋联盟的世界名画。" + "text": "可能产出于:马达加斯加" }, "describe": { "key": "item_item_describe_366", @@ -17557,10 +17557,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_goldcup", + "img": "item_21000011", "intr": { "key": "item_item_intr_367", - "text": "用来提升室内装潢高级感的摆件。" + "text": "可能产出于:疯狂外星人" }, "describe": { "key": "item_item_describe_367", @@ -17602,10 +17602,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_creamcake", + "img": "item_21000012", "intr": { "key": "item_item_intr_368", - "text": "用于庆祝一年中最重要的一天。" + "text": "可能产出于:守护者联盟" }, "describe": { "key": "item_item_describe_368", @@ -17647,10 +17647,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_pushsugar", + "img": "item_21000013", "intr": { "key": "item_item_intr_369", - "text": "一种冰棒,吃完会让人心情愉悦。" + "text": "可能产出于:疯狂外星人,巨怪猎人" }, "describe": { "key": "item_item_describe_369", @@ -17692,10 +17692,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_magicblanket", + "img": "item_21000014", "intr": { "key": "item_item_intr_370", - "text": "被赋予魔法的毛毯,把人带到想去的地方。" + "text": "可能产出于:疯狂原始人,巨怪猎人,驯龙高手" }, "describe": { "key": "item_item_describe_370", @@ -17737,10 +17737,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_happinesspotion", + "img": "item_21000015", "intr": { "key": "item_item_intr_371", - "text": "传说,只要喝下幸福药水,就能和所爱之人幸福的生活在一起。" + "text": "可能产出于:宝贝老板,疯狂外星人,坏蛋联盟,巨怪猎人,守护者联盟,野性精神" }, "describe": { "key": "item_item_describe_371", @@ -17782,10 +17782,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_tambourine", + "img": "item_21000016", "intr": { "key": "item_item_intr_372", - "text": "一种击打乐器,经常在具有地方特色的庆典活动中出现。" + "text": "可能产出于:疯狂外星人,疯狂原始人,功夫熊猫,马达加斯加,魔发精灵" }, "describe": { "key": "item_item_describe_372", @@ -17827,10 +17827,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_mirror", + "img": "item_21000017", "intr": { "key": "item_item_intr_373", - "text": "这是一面能窥探到人内心深处欲望的镜子。" + "text": "可能产出于:疯狂外星人,怪物史莱克,坏蛋联盟,巨怪猎人,守护者联盟" }, "describe": { "key": "item_item_describe_373", @@ -17872,10 +17872,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_treasureclassic", + "img": "item_21000018", "intr": { "key": "item_item_intr_374", - "text": "这本书里记载了各种龙的信息,爱龙人士的首选。" + "text": "可能产出于:宝贝老板,疯狂外星人,魔发精灵" }, "describe": { "key": "item_item_describe_374", @@ -17917,10 +17917,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonteeth", + "img": "item_21000019", "intr": { "key": "item_item_intr_375", - "text": "维京人纯手工打造的龙牙,坚硬无比。" + "text": "可能产出于:宝贝老板,疯狂原始人,巨怪猎人,驯龙高手" }, "describe": { "key": "item_item_describe_375", @@ -17962,10 +17962,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_bolt", + "img": "item_21000020", "intr": { "key": "item_item_intr_376", - "text": "猎龙人研发的弩箭,是龙的天敌。" + "text": "可能产出于:怪物史莱克,坏蛋联盟,魔发精灵,守护者联盟" }, "describe": { "key": "item_item_describe_376", @@ -18007,10 +18007,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonsaddle", + "img": "item_21000021", "intr": { "key": "item_item_intr_377", - "text": "龙骑士驯龙时安置在龙身上的护具。" + "text": "可能产出于:功夫熊猫,驯龙高手,野性精神" }, "describe": { "key": "item_item_describe_377", @@ -18052,10 +18052,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_mirror", + "img": "item_21000022", "intr": { "key": "item_item_intr_378", - "text": "这是一面能窥探到人内心深处欲望的镜子。" + "text": "可能产出于:疯狂原始人,怪物史莱克,巨怪猎人,驯龙高手" }, "describe": { "key": "item_item_describe_378", @@ -18097,10 +18097,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_treasureclassic", + "img": "item_21000023", "intr": { "key": "item_item_intr_379", - "text": "这本书里记载了各种龙的信息,爱龙人士的首选。" + "text": "可能产出于:疯狂原始人,功夫熊猫,马达加斯加" }, "describe": { "key": "item_item_describe_379", @@ -18142,10 +18142,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonteeth", + "img": "item_21000024", "intr": { "key": "item_item_intr_380", - "text": "维京人纯手工打造的龙牙,坚硬无比。" + "text": "可能产出于:宝贝老板,疯狂外星人,巨怪猎人,魔发精灵,守护者联盟" }, "describe": { "key": "item_item_describe_380", @@ -18187,10 +18187,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_bolt", + "img": "item_21000025", "intr": { "key": "item_item_intr_381", - "text": "猎龙人研发的弩箭,是龙的天敌。" + "text": "可能产出于:宝贝老板,疯狂外星人,坏蛋联盟,巨怪猎人,守护者联盟" }, "describe": { "key": "item_item_describe_381", @@ -18232,10 +18232,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonsaddle", + "img": "item_21000026", "intr": { "key": "item_item_intr_382", - "text": "龙骑士驯龙时安置在龙身上的护具。" + "text": "可能产出于:功夫熊猫,怪物史莱克,驯龙高手" }, "describe": { "key": "item_item_describe_382", @@ -18277,10 +18277,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_mirror", + "img": "item_21000027", "intr": { "key": "item_item_intr_383", - "text": "这是一面能窥探到人内心深处欲望的镜子。" + "text": "可能产出于:怪物史莱克,坏蛋联盟,野性精神" }, "describe": { "key": "item_item_describe_383", @@ -18322,10 +18322,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_treasureclassic", + "img": "item_21000028", "intr": { "key": "item_item_intr_384", - "text": "这本书里记载了各种龙的信息,爱龙人士的首选。" + "text": "可能产出于:疯狂原始人,马达加斯加,魔发精灵,野性精神" }, "describe": { "key": "item_item_describe_384", @@ -18367,10 +18367,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonteeth", + "img": "item_21000029", "intr": { "key": "item_item_intr_385", - "text": "维京人纯手工打造的龙牙,坚硬无比。" + "text": "可能产出于:宝贝老板,坏蛋联盟,马达加斯加,守护者联盟,野性精神" }, "describe": { "key": "item_item_describe_385", @@ -18412,10 +18412,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_bolt", + "img": "item_21000030", "intr": { "key": "item_item_intr_386", - "text": "猎龙人研发的弩箭,是龙的天敌。" + "text": "可能产出于:功夫熊猫,魔发精灵,野性精神" }, "describe": { "key": "item_item_describe_386", @@ -18457,10 +18457,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonsaddle", + "img": "item_21000031", "intr": { "key": "item_item_intr_387", - "text": "龙骑士驯龙时安置在龙身上的护具。" + "text": "可能产出于:疯狂原始人,马达加斯加,驯龙高手" }, "describe": { "key": "item_item_describe_387", @@ -18502,10 +18502,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_bolt", + "img": "item_21000032", "intr": { "key": "item_item_intr_388", - "text": "猎龙人研发的弩箭,是龙的天敌。" + "text": "可能产出于:功夫熊猫,驯龙高手,野性精神" }, "describe": { "key": "item_item_describe_388", @@ -18547,10 +18547,10 @@ "access": [], "use_skip": 11001, "upper_limit": 999, - "img": "item_dragonsaddle", + "img": "item_21000033", "intr": { "key": "item_item_intr_389", - "text": "龙骑士驯龙时安置在龙身上的护具。" + "text": "可能产出于:宝贝老板,疯狂外星人,怪物史莱克,马达加斯加" }, "describe": { "key": "item_item_describe_389", @@ -19092,11 +19092,11 @@ "img": "item_24010001", "intr": { "key": "item_item_intr_401", - "text": "" + "text": "剧情道具,剧情探索中获得并使用。" }, "describe": { "key": "item_item_describe_401", - "text": "" + "text": "尾巴的断处有撕裂的痕迹,显然是经过一番打斗之后留下的。" }, "dialogue": { "key": "item_item_dialogue_399", @@ -19137,11 +19137,11 @@ "img": "item_24010002", "intr": { "key": "item_item_intr_402", - "text": "" + "text": "剧情道具,剧情探索中获得并使用。" }, "describe": { "key": "item_item_describe_402", - "text": "" + "text": "非常厚实,温暖,看着就想窝进去让它将自己团团包裹。" }, "dialogue": { "key": "item_item_dialogue_400", @@ -19182,11 +19182,11 @@ "img": "item_24010003", "intr": { "key": "item_item_intr_403", - "text": "" + "text": "剧情道具,剧情探索中获得并使用。" }, "describe": { "key": "item_item_describe_403", - "text": "" + "text": "弯曲尖利的长牙,上面还隐隐有一些血迹,稍稍加工就是极好的武器。" }, "dialogue": { "key": "item_item_dialogue_401", diff --git a/bin/json/game_stoneevent.json b/bin/json/game_stoneevent.json index 3b4d8b921..a330a07e5 100644 --- a/bin/json/game_stoneevent.json +++ b/bin/json/game_stoneevent.json @@ -333,22 +333,6 @@ "PostEvent": 0, "probability": 0 }, - { - "EventId": 19000001, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_16", - "text": "扣血" - }, - "EventType": 19, - "EventResource": "", - "Value1": 10, - "Value2": 5, - "Value3": 0, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, { "EventId": 14110101, "EventTitle": { @@ -437,7 +421,7 @@ }, "EventType": 25, "EventResource": "", - "Value1": 100001, + "Value1": 100002, "Value2": 0, "Value3": 0, "Value4": 0, @@ -557,134 +541,6 @@ "PostEvent": 0, "probability": 0 }, - { - "EventId": 22000000, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_30", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 0, - "Value3": 0, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000101, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_31", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 1, - "Value3": 1, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000102, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_32", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 1, - "Value3": 2, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000103, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_33", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 1, - "Value3": 3, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000104, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_34", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 1, - "Value3": 4, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000201, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_35", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 2, - "Value3": 1, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000202, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_36", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 2, - "Value3": 2, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, - { - "EventId": 22000203, - "EventTitle": { - "key": "stonehenge_eventconfig_EventTitle_37", - "text": "删除buff" - }, - "EventType": 22, - "EventResource": "", - "Value1": 1, - "Value2": 2, - "Value3": 3, - "Value4": 0, - "CostItem": [], - "PostEvent": 0, - "probability": 0 - }, { "EventId": 23000000, "EventTitle": { @@ -812,5 +668,117 @@ "CostItem": [], "PostEvent": 0, "probability": 0 + }, + { + "EventId": 22012101, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_46", + "text": "删除buff(商店用)" + }, + "EventType": 22, + "EventResource": "", + "Value1": 1, + "Value2": 2, + "Value3": 1, + "Value4": 0, + "CostItem": [], + "PostEvent": 25100007, + "probability": 1000 + }, + { + "EventId": 25100007, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_47", + "text": "随机buff(商店用)" + }, + "EventType": 25, + "EventResource": "", + "Value1": 100007, + "Value2": 0, + "Value3": 0, + "Value4": 0, + "CostItem": [], + "PostEvent": 0, + "probability": 0 + }, + { + "EventId": 22012201, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_48", + "text": "删除buff(商店用)" + }, + "EventType": 22, + "EventResource": "", + "Value1": 1, + "Value2": 2, + "Value3": 2, + "Value4": 0, + "CostItem": [], + "PostEvent": 25100008, + "probability": 1000 + }, + { + "EventId": 25100008, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_49", + "text": "随机buff(商店用)" + }, + "EventType": 25, + "EventResource": "", + "Value1": 100008, + "Value2": 0, + "Value3": 0, + "Value4": 0, + "CostItem": [], + "PostEvent": 0, + "probability": 0 + }, + { + "EventId": 22012301, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_50", + "text": "删除buff(商店用)" + }, + "EventType": 22, + "EventResource": "", + "Value1": 1, + "Value2": 2, + "Value3": 3, + "Value4": 0, + "CostItem": [], + "PostEvent": 25100009, + "probability": 1000 + }, + { + "EventId": 25100009, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_51", + "text": "随机buff(商店用)" + }, + "EventType": 25, + "EventResource": "", + "Value1": 100009, + "Value2": 0, + "Value3": 0, + "Value4": 0, + "CostItem": [], + "PostEvent": 0, + "probability": 0 + }, + { + "EventId": 19000002, + "EventTitle": { + "key": "stonehenge_eventconfig_EventTitle_52", + "text": "扣血抽buff" + }, + "EventType": 19, + "EventResource": "", + "Value1": 200, + "Value2": 0, + "Value3": 0, + "Value4": 0, + "CostItem": [], + "PostEvent": 25100001, + "probability": 1000 } ] \ No newline at end of file diff --git a/bin/json/game_stonestore.json b/bin/json/game_stonestore.json index 35e4c2b42..872994da5 100644 --- a/bin/json/game_stonestore.json +++ b/bin/json/game_stonestore.json @@ -7,7 +7,7 @@ "text": "支援" }, "LimitTime": 1, - "PrivilegeId": 0 + "PrivilegeId": 2 }, { "Id": 2, @@ -27,6 +27,46 @@ "text": "回血" }, "LimitTime": 2, - "PrivilegeId": 2 + "PrivilegeId": 0 + }, + { + "Id": 4, + "EventId": 22012101, + "EventDesc": { + "key": "stonehenge_eventstore_EventDesc_4", + "text": "更换符文(品质1)" + }, + "LimitTime": 1, + "PrivilegeId": 3 + }, + { + "Id": 5, + "EventId": 22012201, + "EventDesc": { + "key": "stonehenge_eventstore_EventDesc_5", + "text": "更换符文(品质2)" + }, + "LimitTime": 1, + "PrivilegeId": 3 + }, + { + "Id": 6, + "EventId": 22012301, + "EventDesc": { + "key": "stonehenge_eventstore_EventDesc_6", + "text": "更换符文(品质3)" + }, + "LimitTime": 1, + "PrivilegeId": 3 + }, + { + "Id": 7, + "EventId": 19000002, + "EventDesc": { + "key": "stonehenge_eventstore_EventDesc_7", + "text": "献血机" + }, + "LimitTime": 5, + "PrivilegeId": 0 } ] \ No newline at end of file diff --git a/bin/json/game_topuiconfig.json b/bin/json/game_topuiconfig.json index e2b047489..d03de1dcf 100644 --- a/bin/json/game_topuiconfig.json +++ b/bin/json/game_topuiconfig.json @@ -916,7 +916,18 @@ { "id": "LeadingRole", "subId": "", - "currencyField": [] + "currencyField": [ + { + "a": "attr", + "t": "gold", + "n": 1 + }, + { + "a": "attr", + "t": "diamond", + "n": 1 + } + ] }, { "id": "PersonalInformation", diff --git a/bin/json/game_worldbattle.json b/bin/json/game_worldbattle.json index 8a6c7f3ee..a153bcf38 100644 --- a/bin/json/game_worldbattle.json +++ b/bin/json/game_worldbattle.json @@ -11,7 +11,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 102, @@ -25,7 +26,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 103, @@ -39,7 +41,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 104, @@ -53,7 +56,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 105, @@ -67,7 +71,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 106, @@ -81,7 +86,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 107, @@ -95,7 +101,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 108, @@ -109,7 +116,8 @@ "t": "exp", "n": 5 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 109, @@ -123,7 +131,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 110, @@ -137,7 +146,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 111, @@ -151,7 +161,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 112, @@ -165,7 +176,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 113, @@ -179,7 +191,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 114, @@ -193,7 +206,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 115, @@ -207,7 +221,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 116, @@ -221,7 +236,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 117, @@ -235,7 +251,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 118, @@ -249,7 +266,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 119, @@ -263,7 +281,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 120, @@ -277,7 +296,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 121, @@ -291,7 +311,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 122, @@ -305,7 +326,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 123, @@ -319,7 +341,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 124, @@ -333,7 +356,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 125, @@ -347,7 +371,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 126, @@ -361,7 +386,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 180, @@ -375,7 +401,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 501, @@ -389,7 +416,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 502, @@ -403,7 +431,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 503, @@ -417,7 +446,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 504, @@ -431,7 +461,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 505, @@ -445,7 +476,8 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 }, { "id": 506, @@ -459,6 +491,7 @@ "t": "exp", "n": 0 }, - "carexe": 500 + "carexe": 500, + "reward": 0 } ] \ No newline at end of file diff --git a/modules/wtask/api_battlefinish.go b/modules/wtask/api_battlefinish.go index 4b196a353..34135a01e 100644 --- a/modules/wtask/api_battlefinish.go +++ b/modules/wtask/api_battlefinish.go @@ -1,6 +1,7 @@ package wtask import ( + "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/sys/log" "go_dreamfactory/pb" @@ -27,6 +28,8 @@ func (this *apiComp) BattleFinishCheck(session comm.IUserSession, req *pb.WTaskB func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattleFinishReq) (errdata *pb.ErrorData) { var ( conf *cfg.GameWorldBattleData + prop []*cfg.Gameatn + award []*pb.UserAssets err error isWin bool ) @@ -49,30 +52,49 @@ func (this *apiComp) BattleFinish(session comm.IUserSession, req *pb.WTaskBattle if isWin { if conf.Carexe > 0 { if req.Report != nil && req.Report.Info != nil && len(req.Report.Info.Redflist) > 0 { + heros := make([]string, 0) for _, v := range req.Report.Info.Redflist[0].Team { if !v.Ishelp { // 助战英雄不加经验 - this.module.ModuleHero.AddHeroExp(session, v.Oid, conf.Carexe) + heros = append(heros, v.Oid) } } + if _, errdata = this.module.ModuleHero.AddHerosExp(session, heros, conf.Carexe); errdata != nil { + return + } } } - if errdata = this.module.DispenseRes(session, []*cfg.Gameatn{conf.Playexp}, true); errdata != nil { + + user := this.module.ModuleUser.GetUser(session.GetUserId()) + if prop = this.module.ModuleTools.GetGroupDataByLottery(conf.Reward, user.Vip, user.Lv); len(prop) == 0 { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: fmt.Sprintf("掉落组未找到:%d", conf.Reward), + } + return + } + prop = append(prop, conf.Playexp) + award = make([]*pb.UserAssets, 0) + for _, v := range prop { + award = append(award, &pb.UserAssets{ + A: v.A, + T: v.T, + N: v.N, + }) + } + if errdata = this.module.DispenseRes(session, prop, true); errdata != nil { this.module.Error("世界任务战斗玩家经验结算", log.Field{Key: "uid", Value: session.GetUserId()}, log.Field{Key: "playerExp", Value: conf.Playexp}, ) return - } else { - //触发任务 - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId)) } + //触发任务 + go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype70, 1, req.BattleConfId)) + } else { go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype227, 1, req.BattleConfId)) - // this.module.Error("世界任务战斗失败", - // log.Field{Key: "uid", Value: session.GetUserId()}, - // log.Field{Key: "isWin", Value: isWin}, - // ) } - session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId}) + session.SendMsg(string(this.module.GetType()), "battlefinish", &pb.WTaskBattleFinishResp{BattleConfId: req.BattleConfId, Award: award}) return } diff --git a/pb/wtask_msg.pb.go b/pb/wtask_msg.pb.go index 5846e05a1..b5774b2f5 100644 --- a/pb/wtask_msg.pb.go +++ b/pb/wtask_msg.pb.go @@ -841,7 +841,8 @@ type WTaskBattleFinishResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID + BattleConfId int32 `protobuf:"varint,1,opt,name=battleConfId,proto3" json:"battleConfId"` //战斗配表ID + Award []*UserAssets `protobuf:"bytes,2,rep,name=award,proto3" json:"award"` //奖励 } func (x *WTaskBattleFinishResp) Reset() { @@ -883,6 +884,13 @@ func (x *WTaskBattleFinishResp) GetBattleConfId() int32 { return 0 } +func (x *WTaskBattleFinishResp) GetAward() []*UserAssets { + if x != nil { + return x.Award + } + return nil +} + //世界任务宝箱变化推送 type WTaskBoxChangePush struct { state protoimpl.MessageState @@ -1601,71 +1609,73 @@ var file_wtask_wtask_msg_proto_rawDesc = []byte{ 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, - 0x74, 0x22, 0x3b, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x74, 0x22, 0x5e, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x52, 0x65, 0x73, 0x70, 0x12, 0x22, 0x0a, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x22, 0x8d, - 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, - 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, - 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x42, 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, - 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a, 0x09, 0x42, 0x6f, 0x78, 0x73, - 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, 0x61, 0x73, 0x6b, - 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x3c, - 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, - 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, - 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, 0x60, 0x0a, 0x13, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, - 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, - 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x24, - 0x0a, 0x10, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, - 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, - 0x03, 0x65, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, - 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x21, 0x0a, 0x05, 0x61, - 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, - 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x2b, - 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x42, 0x0a, 0x14, 0x57, - 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, - 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x22, - 0x6b, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, - 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, + 0x52, 0x0c, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x43, 0x6f, 0x6e, 0x66, 0x49, 0x64, 0x12, 0x21, + 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x22, 0x8d, 0x01, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x43, 0x68, + 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x12, 0x31, 0x0a, 0x04, 0x62, 0x6f, 0x78, 0x73, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1d, 0x2e, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, + 0x78, 0x43, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x50, 0x75, 0x73, 0x68, 0x2e, 0x42, 0x6f, 0x78, 0x73, + 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x04, 0x62, 0x6f, 0x78, 0x73, 0x1a, 0x44, 0x0a, 0x09, 0x42, + 0x6f, 0x78, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, + 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x21, 0x0a, 0x05, 0x76, 0x61, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x44, 0x42, 0x57, 0x54, + 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, + 0x01, 0x22, 0x3c, 0x0a, 0x12, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, + 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, + 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x22, + 0x60, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x6f, 0x78, 0x52, 0x65, 0x63, 0x65, 0x69, + 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x74, 0x69, 0x64, 0x18, 0x01, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x03, 0x74, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x62, 0x6f, 0x78, 0x69, + 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x62, 0x6f, 0x78, 0x69, 0x64, 0x12, 0x21, + 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x22, 0x24, 0x0a, 0x10, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, + 0x67, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, + 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x22, 0x48, 0x0a, 0x11, 0x57, 0x54, 0x61, 0x73, 0x6b, + 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, + 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x03, 0x28, 0x05, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x21, + 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, + 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, + 0x64, 0x22, 0x2b, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, + 0x61, 0x72, 0x67, 0x65, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, + 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x22, 0x42, + 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x54, 0x61, 0x72, 0x67, + 0x65, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, - 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, 0x72, 0x6d, 0x61, - 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, 0x63, 0x0a, 0x14, - 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, - 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, - 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, - 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, - 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0b, - 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x69, 0x6e, 0x66, - 0x6f, 0x22, 0x6a, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, - 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, - 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, - 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, - 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, - 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x22, 0x67, 0x0a, - 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, - 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x6e, 0x74, 0x22, 0x6b, 0x0a, 0x13, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, + 0x65, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, + 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, + 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, + 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x46, 0x6f, + 0x72, 0x6d, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x06, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x22, + 0x63, 0x0a, 0x14, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x45, 0x76, + 0x65, 0x6e, 0x74, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, - 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, - 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, 0x74, 0x73, 0x52, - 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x6e, 0x74, 0x12, 0x1f, 0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x03, 0x20, 0x01, 0x28, + 0x0b, 0x32, 0x0b, 0x2e, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, + 0x69, 0x6e, 0x66, 0x6f, 0x22, 0x6a, 0x0a, 0x15, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, + 0x6e, 0x74, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, + 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x25, 0x0a, 0x06, 0x72, 0x65, 0x70, + 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x42, 0x61, 0x74, 0x74, + 0x6c, 0x65, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x06, 0x72, 0x65, 0x70, 0x6f, 0x72, 0x74, + 0x22, 0x67, 0x0a, 0x16, 0x57, 0x54, 0x61, 0x73, 0x6b, 0x45, 0x76, 0x65, 0x6e, 0x74, 0x43, 0x6f, + 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x14, 0x0a, 0x05, 0x67, 0x72, + 0x6f, 0x75, 0x70, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x67, 0x72, 0x6f, 0x75, 0x70, + 0x12, 0x14, 0x0a, 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, + 0x05, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x12, 0x21, 0x0a, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, + 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0b, 0x2e, 0x55, 0x73, 0x65, 0x72, 0x41, 0x73, 0x73, 0x65, + 0x74, 0x73, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, + 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( @@ -1731,19 +1741,20 @@ var file_wtask_wtask_msg_proto_depIdxs = []int32{ 32, // 8: WTaskBattleStartReq.battle:type_name -> BattleFormation 33, // 9: WTaskBattleStartResp.info:type_name -> BattleInfo 34, // 10: WTaskBattleFinishReq.report:type_name -> BattleReport - 28, // 11: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry - 31, // 12: WTaskBoxReceiveResp.award:type_name -> UserAssets - 31, // 13: WTaskExchangeResp.award:type_name -> UserAssets - 32, // 14: WTaskBattleEventReq.battle:type_name -> BattleFormation - 33, // 15: WTaskBattleEventResp.info:type_name -> BattleInfo - 34, // 16: WTaskEventCompleteReq.report:type_name -> BattleReport - 31, // 17: WTaskEventCompleteResp.award:type_name -> UserAssets - 35, // 18: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox - 19, // [19:19] is the sub-list for method output_type - 19, // [19:19] is the sub-list for method input_type - 19, // [19:19] is the sub-list for extension type_name - 19, // [19:19] is the sub-list for extension extendee - 0, // [0:19] is the sub-list for field type_name + 31, // 11: WTaskBattleFinishResp.award:type_name -> UserAssets + 28, // 12: WTaskBoxChangePush.boxs:type_name -> WTaskBoxChangePush.BoxsEntry + 31, // 13: WTaskBoxReceiveResp.award:type_name -> UserAssets + 31, // 14: WTaskExchangeResp.award:type_name -> UserAssets + 32, // 15: WTaskBattleEventReq.battle:type_name -> BattleFormation + 33, // 16: WTaskBattleEventResp.info:type_name -> BattleInfo + 34, // 17: WTaskEventCompleteReq.report:type_name -> BattleReport + 31, // 18: WTaskEventCompleteResp.award:type_name -> UserAssets + 35, // 19: WTaskBoxChangePush.BoxsEntry.value:type_name -> DBWTaskBox + 20, // [20:20] is the sub-list for method output_type + 20, // [20:20] is the sub-list for method input_type + 20, // [20:20] is the sub-list for extension type_name + 20, // [20:20] is the sub-list for extension extendee + 0, // [0:20] is the sub-list for field type_name } func init() { file_wtask_wtask_msg_proto_init() } diff --git a/sys/configure/structs/Game.WorldBattleData.go b/sys/configure/structs/Game.WorldBattleData.go index 396456717..de3fcfa84 100644 --- a/sys/configure/structs/Game.WorldBattleData.go +++ b/sys/configure/structs/Game.WorldBattleData.go @@ -17,6 +17,7 @@ type GameWorldBattleData struct { EventList []int32 Playexp *Gameatn Carexe int32 + Reward int32 } const TypeId_GameWorldBattleData = 1096332216 @@ -58,6 +59,7 @@ func (_v *GameWorldBattleData)Deserialize(_buf map[string]interface{}) (err erro { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["playexp"].(map[string]interface{}); !_ok_ { err = errors.New("playexp error"); return }; if _v.Playexp, err = DeserializeGameatn(_x_); err != nil { return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["carexe"].(float64); !_ok_ { err = errors.New("carexe error"); return }; _v.Carexe = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reward"].(float64); !_ok_ { err = errors.New("reward error"); return }; _v.Reward = int32(_tempNum_) } return }