From 4891d635d7a8086f2935f252912dc346cb4ed37b Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Mon, 27 Jun 2022 17:45:02 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=AD=A6=E5=99=A8=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E9=85=8D=E7=BD=AE=E5=92=8C=E6=8E=A5=E5=8F=A3=E9=87=8D?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bin/json/game_com.json | 27 - bin/json/game_equip.json | 1418 ++++++++++ bin/json/game_equipattrlibrary.json | 2378 +++++++++++++++++ bin/json/game_equipintensify.json | 1502 +++++++++++ bin/json/game_equipment.json | 1 - bin/json/game_equipsuit.json | 87 + bin/json/game_hero.json | 596 +++++ bin/json/game_herolevelgrow.json | 330 +-- bin/json/game_herolevelup.json | 60 + bin/json/game_herostargrow.json | 18 +- bin/json/game_herostarup.json | 138 +- bin/json/game_item.json | 279 +- bin/json/game_msgdistrib.json | 1 - bin/json/game_newhero.json | 254 +- bin/json/game_skill.json | 50 +- bin/json/game_skillafteratk.json | 795 +----- bin/json/game_skillatk.json | 141 +- bin/json/game_skillbuff.json | 89 +- bin/json/game_skillpassive.json | 308 +-- bin/json/game_ui.json | 2 +- comm/core.go | 8 + comm/imodule.go | 27 +- modules/core.go | 8 +- modules/equipment/api_equip.go | 10 +- modules/equipment/api_upgrade.go | 44 +- modules/equipment/configure_comp.go | 89 +- modules/equipment/model_equipment_comp.go | 2 +- modules/forum/configure_comp.go | 19 - modules/game/configure_comp.go | 19 - modules/items/model_pack_comp.go | 2 +- modules/items/module.go | 8 +- modules/mail/api_getAttachment.go | 2 +- modules/modulebase.go | 88 +- pb.bat | 2 +- pb/errorcode.pb.go | 101 +- pb/items_db.pb.go | 209 ++ pb/items_msg.pb.go | 484 ++++ pb/proto/errorcode.proto | 14 +- .../pack_db.proto => items/items_db.proto} | 0 .../pack_msg.proto => items/items_msg.proto} | 2 +- sys/configure/structs/game.atn.go | 39 +- sys/configure/structs/game.equipment.go | 39 - sys/configure/structs/game.equipmentData.go | 73 - 43 files changed, 7672 insertions(+), 2091 deletions(-) delete mode 100644 bin/json/game_com.json create mode 100644 bin/json/game_equip.json create mode 100644 bin/json/game_equipattrlibrary.json create mode 100644 bin/json/game_equipintensify.json delete mode 100644 bin/json/game_equipment.json create mode 100644 bin/json/game_equipsuit.json create mode 100644 bin/json/game_hero.json delete mode 100644 bin/json/game_msgdistrib.json create mode 100644 pb/items_db.pb.go create mode 100644 pb/items_msg.pb.go rename pb/proto/{pack/pack_db.proto => items/items_db.proto} (100%) rename pb/proto/{pack/pack_msg.proto => items/items_msg.proto} (96%) delete mode 100644 sys/configure/structs/game.equipment.go delete mode 100644 sys/configure/structs/game.equipmentData.go diff --git a/bin/json/game_com.json b/bin/json/game_com.json deleted file mode 100644 index 11edd1a7a..000000000 --- a/bin/json/game_com.json +++ /dev/null @@ -1,27 +0,0 @@ -[ - { - "index": "max_hy", - "var": "30", - "intr": "最大好友数" - }, - { - "index": "max_getreward", - "var": "10002,99", - "intr": "领取/赠送奖励" - }, - { - "index": "max_get", - "var": "30", - "intr": "每日领取/赠送次数" - }, - { - "index": "max_char", - "var": "100", - "intr": "聊天最大输入字符数量" - }, - { - "index": "max_hmd", - "var": "30", - "intr": "最大黑名单数" - } -] \ No newline at end of file diff --git a/bin/json/game_equip.json b/bin/json/game_equip.json new file mode 100644 index 000000000..1e8c174e5 --- /dev/null +++ b/bin/json/game_equip.json @@ -0,0 +1,1418 @@ +[ + { + "id": 10001, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 1, + "leadlibrary": 10001, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10002, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 1, + "leadlibrary": 10002, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10003, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 1, + "leadlibrary": 10003, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10004, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 1, + "leadlibrary": 10004, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10005, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 1, + "leadlibrary": 10005, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10006, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 1, + "leadlibrary": 10006, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 10011, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 2, + "leadlibrary": 10011, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10012, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 2, + "leadlibrary": 10012, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10013, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 2, + "leadlibrary": 10013, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10014, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 2, + "leadlibrary": 10014, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10015, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 2, + "leadlibrary": 10015, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10016, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 2, + "leadlibrary": 10016, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 10021, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 3, + "leadlibrary": 10021, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10022, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 3, + "leadlibrary": 10022, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10023, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 3, + "leadlibrary": 10023, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10024, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 3, + "leadlibrary": 10024, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10025, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 3, + "leadlibrary": 10025, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10026, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 3, + "leadlibrary": 10026, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 10031, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 4, + "leadlibrary": 10031, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10032, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 4, + "leadlibrary": 10032, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10033, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 4, + "leadlibrary": 10033, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10034, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 4, + "leadlibrary": 10034, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10035, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 4, + "leadlibrary": 10035, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10036, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 4, + "leadlibrary": 10036, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 10041, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 5, + "leadlibrary": 10041, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10042, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 5, + "leadlibrary": 10042, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10043, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 5, + "leadlibrary": 10043, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10044, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 5, + "leadlibrary": 10044, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10045, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 5, + "leadlibrary": 10045, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10046, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 5, + "leadlibrary": 10046, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 10051, + "suittype": 0, + "suitintr": "", + "pos": 1, + "star": 6, + "leadlibrary": 10051, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10052, + "suittype": 0, + "suitintr": "", + "pos": 2, + "star": 6, + "leadlibrary": 10052, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10053, + "suittype": 0, + "suitintr": "", + "pos": 3, + "star": 6, + "leadlibrary": 10053, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10054, + "suittype": 0, + "suitintr": "", + "pos": 4, + "star": 6, + "leadlibrary": 10054, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1001 + }, + { + "id": 10055, + "suittype": 100, + "suitintr": "", + "pos": 5, + "star": 6, + "leadlibrary": 10055, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1001 + }, + { + "id": 10056, + "suittype": 100, + "suitintr": "", + "pos": 6, + "star": 6, + "leadlibrary": 10056, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1001 + }, + { + "id": 11001, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 1, + "leadlibrary": 11001, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11002, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 1, + "leadlibrary": 11002, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11003, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 1, + "leadlibrary": 11003, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11004, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 1, + "leadlibrary": 11004, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11005, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 1, + "leadlibrary": 11005, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11006, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 1, + "leadlibrary": 11006, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + }, + { + "id": 11011, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 2, + "leadlibrary": 11011, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11012, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 2, + "leadlibrary": 11012, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11013, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 2, + "leadlibrary": 11013, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11014, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 2, + "leadlibrary": 11014, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11015, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 2, + "leadlibrary": 11015, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11016, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 2, + "leadlibrary": 11016, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + }, + { + "id": 11021, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 3, + "leadlibrary": 11021, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11022, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 3, + "leadlibrary": 11022, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11023, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 3, + "leadlibrary": 11023, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11024, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 3, + "leadlibrary": 11024, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11025, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 3, + "leadlibrary": 11025, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11026, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 3, + "leadlibrary": 11026, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + }, + { + "id": 11031, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 4, + "leadlibrary": 11031, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11032, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 4, + "leadlibrary": 11032, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11033, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 4, + "leadlibrary": 11033, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11034, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 4, + "leadlibrary": 11034, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11035, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 4, + "leadlibrary": 11035, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11036, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 4, + "leadlibrary": 11036, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + }, + { + "id": 11041, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 5, + "leadlibrary": 11041, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11042, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 5, + "leadlibrary": 11042, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11043, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 5, + "leadlibrary": 11043, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11044, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 5, + "leadlibrary": 11044, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11045, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 5, + "leadlibrary": 11045, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11046, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 5, + "leadlibrary": 11046, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + }, + { + "id": 11051, + "suittype": 1, + "suitintr": "", + "pos": 1, + "star": 6, + "leadlibrary": 11051, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 50, + 30, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11052, + "suittype": 1, + "suitintr": "", + "pos": 2, + "star": 6, + "leadlibrary": 11052, + "addattrnum": [ + 0, + 1, + 2 + ], + "addattrnump": [ + 30, + 50, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11053, + "suittype": 1, + "suitintr": "", + "pos": 3, + "star": 6, + "leadlibrary": 11053, + "addattrnum": [ + 0, + 1, + 2, + 3 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11054, + "suittype": 1, + "suitintr": "", + "pos": 4, + "star": 6, + "leadlibrary": 11054, + "addattrnum": [ + 1, + 2, + 3 + ], + "addattrnump": [ + 40, + 40, + 20 + ], + "addlibrary": 1101 + }, + { + "id": 11055, + "suittype": 101, + "suitintr": "", + "pos": 5, + "star": 6, + "leadlibrary": 11055, + "addattrnum": [ + 1, + 2, + 3, + 4 + ], + "addattrnump": [ + 10, + 40, + 40, + 10 + ], + "addlibrary": 1101 + }, + { + "id": 11056, + "suittype": 101, + "suitintr": "", + "pos": 6, + "star": 6, + "leadlibrary": 11056, + "addattrnum": [ + 2, + 3, + 4 + ], + "addattrnump": [ + 60, + 35, + 5 + ], + "addlibrary": 1101 + } +] \ No newline at end of file diff --git a/bin/json/game_equipattrlibrary.json b/bin/json/game_equipattrlibrary.json new file mode 100644 index 000000000..74a53ad8e --- /dev/null +++ b/bin/json/game_equipattrlibrary.json @@ -0,0 +1,2378 @@ +[ + { + "key": 1, + "libraryid": 10001, + "attr": [ + "atk", + "20" + ], + "probability": 1000 + }, + { + "key": 2, + "libraryid": 10002, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 3, + "libraryid": 10002, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 4, + "libraryid": 10002, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 5, + "libraryid": 10002, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 6, + "libraryid": 10002, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 7, + "libraryid": 10002, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 8, + "libraryid": 10003, + "attr": [ + "def", + "20" + ], + "probability": 1000 + }, + { + "key": 9, + "libraryid": 10004, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 10, + "libraryid": 10004, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 11, + "libraryid": 10004, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 12, + "libraryid": 10004, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 13, + "libraryid": 10004, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 14, + "libraryid": 10004, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 15, + "libraryid": 10005, + "attr": [ + "hp", + "100" + ], + "probability": 1000 + }, + { + "key": 16, + "libraryid": 10006, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 17, + "libraryid": 10006, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 18, + "libraryid": 10006, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 19, + "libraryid": 10006, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 20, + "libraryid": 10006, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 21, + "libraryid": 10006, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 22, + "libraryid": 10011, + "attr": [ + "atk", + "26" + ], + "probability": 1000 + }, + { + "key": 23, + "libraryid": 10012, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 24, + "libraryid": 10012, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 25, + "libraryid": 10012, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 26, + "libraryid": 10012, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 27, + "libraryid": 10012, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 28, + "libraryid": 10012, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 29, + "libraryid": 10013, + "attr": [ + "def", + "26" + ], + "probability": 1000 + }, + { + "key": 30, + "libraryid": 10014, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 31, + "libraryid": 10014, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 32, + "libraryid": 10014, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 33, + "libraryid": 10014, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 34, + "libraryid": 10014, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 35, + "libraryid": 10014, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 36, + "libraryid": 10015, + "attr": [ + "hp", + "130" + ], + "probability": 1000 + }, + { + "key": 37, + "libraryid": 10016, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 38, + "libraryid": 10016, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 39, + "libraryid": 10016, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 40, + "libraryid": 10016, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 41, + "libraryid": 10016, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 42, + "libraryid": 10016, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 43, + "libraryid": 10021, + "attr": [ + "atk", + "33" + ], + "probability": 1000 + }, + { + "key": 44, + "libraryid": 10022, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 45, + "libraryid": 10022, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 46, + "libraryid": 10022, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 47, + "libraryid": 10022, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 48, + "libraryid": 10022, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 49, + "libraryid": 10022, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 50, + "libraryid": 10023, + "attr": [ + "def", + "33" + ], + "probability": 1000 + }, + { + "key": 51, + "libraryid": 10024, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 52, + "libraryid": 10024, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 53, + "libraryid": 10024, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 54, + "libraryid": 10024, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 55, + "libraryid": 10024, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 56, + "libraryid": 10024, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 57, + "libraryid": 10025, + "attr": [ + "hp", + "169" + ], + "probability": 1000 + }, + { + "key": 58, + "libraryid": 10026, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 59, + "libraryid": 10026, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 60, + "libraryid": 10026, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 61, + "libraryid": 10026, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 62, + "libraryid": 10026, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 63, + "libraryid": 10026, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 64, + "libraryid": 10031, + "attr": [ + "atk", + "42" + ], + "probability": 1000 + }, + { + "key": 65, + "libraryid": 10032, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 66, + "libraryid": 10032, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 67, + "libraryid": 10032, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 68, + "libraryid": 10032, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 69, + "libraryid": 10032, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 70, + "libraryid": 10032, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 71, + "libraryid": 10033, + "attr": [ + "def", + "42" + ], + "probability": 1000 + }, + { + "key": 72, + "libraryid": 10034, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 73, + "libraryid": 10034, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 74, + "libraryid": 10034, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 75, + "libraryid": 10034, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 76, + "libraryid": 10034, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 77, + "libraryid": 10034, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 78, + "libraryid": 10035, + "attr": [ + "hp", + "219" + ], + "probability": 1000 + }, + { + "key": 79, + "libraryid": 10036, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 80, + "libraryid": 10036, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 81, + "libraryid": 10036, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 82, + "libraryid": 10036, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 83, + "libraryid": 10036, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 84, + "libraryid": 10036, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 85, + "libraryid": 10041, + "attr": [ + "atk", + "54" + ], + "probability": 1000 + }, + { + "key": 86, + "libraryid": 10042, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 87, + "libraryid": 10042, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 88, + "libraryid": 10042, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 89, + "libraryid": 10042, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 90, + "libraryid": 10042, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 91, + "libraryid": 10042, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 92, + "libraryid": 10043, + "attr": [ + "def", + "54" + ], + "probability": 1000 + }, + { + "key": 93, + "libraryid": 10044, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 94, + "libraryid": 10044, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 95, + "libraryid": 10044, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 96, + "libraryid": 10044, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 97, + "libraryid": 10044, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 98, + "libraryid": 10044, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 99, + "libraryid": 10045, + "attr": [ + "hp", + "284" + ], + "probability": 1000 + }, + { + "key": 100, + "libraryid": 10046, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 101, + "libraryid": 10046, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 102, + "libraryid": 10046, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 103, + "libraryid": 10046, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 104, + "libraryid": 10046, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 105, + "libraryid": 10046, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 106, + "libraryid": 10051, + "attr": [ + "atk", + "70" + ], + "probability": 1000 + }, + { + "key": 107, + "libraryid": 10052, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 108, + "libraryid": 10052, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 109, + "libraryid": 10052, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 110, + "libraryid": 10052, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 111, + "libraryid": 10052, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 112, + "libraryid": 10052, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 113, + "libraryid": 10053, + "attr": [ + "def", + "70" + ], + "probability": 1000 + }, + { + "key": 114, + "libraryid": 10054, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 115, + "libraryid": 10054, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 116, + "libraryid": 10054, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 117, + "libraryid": 10054, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 118, + "libraryid": 10054, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 119, + "libraryid": 10054, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 120, + "libraryid": 10055, + "attr": [ + "hp", + "369" + ], + "probability": 1000 + }, + { + "key": 121, + "libraryid": 10056, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 122, + "libraryid": 10056, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 123, + "libraryid": 10056, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 124, + "libraryid": 10056, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 125, + "libraryid": 10056, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 126, + "libraryid": 10056, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 127, + "libraryid": 1001, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 128, + "libraryid": 1001, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 129, + "libraryid": 1001, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 130, + "libraryid": 1001, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 131, + "libraryid": 1001, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 132, + "libraryid": 1001, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 133, + "libraryid": 11001, + "attr": [ + "atk", + "20" + ], + "probability": 1000 + }, + { + "key": 134, + "libraryid": 11002, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 135, + "libraryid": 11002, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 136, + "libraryid": 11002, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 137, + "libraryid": 11002, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 138, + "libraryid": 11002, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 139, + "libraryid": 11002, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 140, + "libraryid": 11003, + "attr": [ + "def", + "20" + ], + "probability": 1000 + }, + { + "key": 141, + "libraryid": 11004, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 142, + "libraryid": 11004, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 143, + "libraryid": 11004, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 144, + "libraryid": 11004, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 145, + "libraryid": 11004, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 146, + "libraryid": 11004, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 147, + "libraryid": 11005, + "attr": [ + "hp", + "100" + ], + "probability": 1000 + }, + { + "key": 148, + "libraryid": 11006, + "attr": [ + "atk", + "20" + ], + "probability": 150 + }, + { + "key": 149, + "libraryid": 11006, + "attr": [ + "def", + "20" + ], + "probability": 150 + }, + { + "key": 150, + "libraryid": 11006, + "attr": [ + "hp", + "100" + ], + "probability": 400 + }, + { + "key": 151, + "libraryid": 11006, + "attr": [ + "atkpro", + "20" + ], + "probability": 100 + }, + { + "key": 152, + "libraryid": 11006, + "attr": [ + "defpro", + "20" + ], + "probability": 100 + }, + { + "key": 153, + "libraryid": 11006, + "attr": [ + "hppro", + "20" + ], + "probability": 100 + }, + { + "key": 154, + "libraryid": 11011, + "attr": [ + "atk", + "26" + ], + "probability": 1000 + }, + { + "key": 155, + "libraryid": 11012, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 156, + "libraryid": 11012, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 157, + "libraryid": 11012, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 158, + "libraryid": 11012, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 159, + "libraryid": 11012, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 160, + "libraryid": 11012, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 161, + "libraryid": 11013, + "attr": [ + "def", + "26" + ], + "probability": 1000 + }, + { + "key": 162, + "libraryid": 11014, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 163, + "libraryid": 11014, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 164, + "libraryid": 11014, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 165, + "libraryid": 11014, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 166, + "libraryid": 11014, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 167, + "libraryid": 11014, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 168, + "libraryid": 11015, + "attr": [ + "hp", + "130" + ], + "probability": 1000 + }, + { + "key": 169, + "libraryid": 11016, + "attr": [ + "atk", + "26" + ], + "probability": 150 + }, + { + "key": 170, + "libraryid": 11016, + "attr": [ + "def", + "26" + ], + "probability": 150 + }, + { + "key": 171, + "libraryid": 11016, + "attr": [ + "hp", + "130" + ], + "probability": 400 + }, + { + "key": 172, + "libraryid": 11016, + "attr": [ + "atkpro", + "26" + ], + "probability": 100 + }, + { + "key": 173, + "libraryid": 11016, + "attr": [ + "defpro", + "26" + ], + "probability": 100 + }, + { + "key": 174, + "libraryid": 11016, + "attr": [ + "hppro", + "26" + ], + "probability": 100 + }, + { + "key": 175, + "libraryid": 11021, + "attr": [ + "atk", + "33" + ], + "probability": 1000 + }, + { + "key": 176, + "libraryid": 11022, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 177, + "libraryid": 11022, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 178, + "libraryid": 11022, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 179, + "libraryid": 11022, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 180, + "libraryid": 11022, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 181, + "libraryid": 11022, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 182, + "libraryid": 11023, + "attr": [ + "def", + "33" + ], + "probability": 1000 + }, + { + "key": 183, + "libraryid": 11024, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 184, + "libraryid": 11024, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 185, + "libraryid": 11024, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 186, + "libraryid": 11024, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 187, + "libraryid": 11024, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 188, + "libraryid": 11024, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 189, + "libraryid": 11025, + "attr": [ + "hp", + "169" + ], + "probability": 1000 + }, + { + "key": 190, + "libraryid": 11026, + "attr": [ + "atk", + "33" + ], + "probability": 150 + }, + { + "key": 191, + "libraryid": 11026, + "attr": [ + "def", + "33" + ], + "probability": 150 + }, + { + "key": 192, + "libraryid": 11026, + "attr": [ + "hp", + "169" + ], + "probability": 400 + }, + { + "key": 193, + "libraryid": 11026, + "attr": [ + "atkpro", + "33" + ], + "probability": 100 + }, + { + "key": 194, + "libraryid": 11026, + "attr": [ + "defpro", + "33" + ], + "probability": 100 + }, + { + "key": 195, + "libraryid": 11026, + "attr": [ + "hppro", + "33" + ], + "probability": 100 + }, + { + "key": 196, + "libraryid": 11031, + "attr": [ + "atk", + "42" + ], + "probability": 1000 + }, + { + "key": 197, + "libraryid": 11032, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 198, + "libraryid": 11032, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 199, + "libraryid": 11032, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 200, + "libraryid": 11032, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 201, + "libraryid": 11032, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 202, + "libraryid": 11032, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 203, + "libraryid": 11033, + "attr": [ + "def", + "42" + ], + "probability": 1000 + }, + { + "key": 204, + "libraryid": 11034, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 205, + "libraryid": 11034, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 206, + "libraryid": 11034, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 207, + "libraryid": 11034, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 208, + "libraryid": 11034, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 209, + "libraryid": 11034, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 210, + "libraryid": 11035, + "attr": [ + "hp", + "219" + ], + "probability": 1000 + }, + { + "key": 211, + "libraryid": 11036, + "attr": [ + "atk", + "42" + ], + "probability": 150 + }, + { + "key": 212, + "libraryid": 11036, + "attr": [ + "def", + "42" + ], + "probability": 150 + }, + { + "key": 213, + "libraryid": 11036, + "attr": [ + "hp", + "219" + ], + "probability": 400 + }, + { + "key": 214, + "libraryid": 11036, + "attr": [ + "atkpro", + "42" + ], + "probability": 100 + }, + { + "key": 215, + "libraryid": 11036, + "attr": [ + "defpro", + "42" + ], + "probability": 100 + }, + { + "key": 216, + "libraryid": 11036, + "attr": [ + "hppro", + "42" + ], + "probability": 100 + }, + { + "key": 217, + "libraryid": 11041, + "attr": [ + "atk", + "54" + ], + "probability": 1000 + }, + { + "key": 218, + "libraryid": 11042, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 219, + "libraryid": 11042, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 220, + "libraryid": 11042, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 221, + "libraryid": 11042, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 222, + "libraryid": 11042, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 223, + "libraryid": 11042, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 224, + "libraryid": 11043, + "attr": [ + "def", + "54" + ], + "probability": 1000 + }, + { + "key": 225, + "libraryid": 11044, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 226, + "libraryid": 11044, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 227, + "libraryid": 11044, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 228, + "libraryid": 11044, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 229, + "libraryid": 11044, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 230, + "libraryid": 11044, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 231, + "libraryid": 11045, + "attr": [ + "hp", + "284" + ], + "probability": 1000 + }, + { + "key": 232, + "libraryid": 11046, + "attr": [ + "atk", + "54" + ], + "probability": 150 + }, + { + "key": 233, + "libraryid": 11046, + "attr": [ + "def", + "54" + ], + "probability": 150 + }, + { + "key": 234, + "libraryid": 11046, + "attr": [ + "hp", + "284" + ], + "probability": 400 + }, + { + "key": 235, + "libraryid": 11046, + "attr": [ + "atkpro", + "54" + ], + "probability": 100 + }, + { + "key": 236, + "libraryid": 11046, + "attr": [ + "defpro", + "54" + ], + "probability": 100 + }, + { + "key": 237, + "libraryid": 11046, + "attr": [ + "hppro", + "54" + ], + "probability": 100 + }, + { + "key": 238, + "libraryid": 11051, + "attr": [ + "atk", + "70" + ], + "probability": 1000 + }, + { + "key": 239, + "libraryid": 11052, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 240, + "libraryid": 11052, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 241, + "libraryid": 11052, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 242, + "libraryid": 11052, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 243, + "libraryid": 11052, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 244, + "libraryid": 11052, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 245, + "libraryid": 11053, + "attr": [ + "def", + "70" + ], + "probability": 1000 + }, + { + "key": 246, + "libraryid": 11054, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 247, + "libraryid": 11054, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 248, + "libraryid": 11054, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 249, + "libraryid": 11054, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 250, + "libraryid": 11054, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 251, + "libraryid": 11054, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 252, + "libraryid": 11055, + "attr": [ + "hp", + "369" + ], + "probability": 1000 + }, + { + "key": 253, + "libraryid": 11056, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 254, + "libraryid": 11056, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 255, + "libraryid": 11056, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 256, + "libraryid": 11056, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 257, + "libraryid": 11056, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 258, + "libraryid": 11056, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + }, + { + "key": 259, + "libraryid": 1101, + "attr": [ + "atk", + "70" + ], + "probability": 150 + }, + { + "key": 260, + "libraryid": 1101, + "attr": [ + "def", + "70" + ], + "probability": 150 + }, + { + "key": 261, + "libraryid": 1101, + "attr": [ + "hp", + "369" + ], + "probability": 400 + }, + { + "key": 262, + "libraryid": 1101, + "attr": [ + "atkpro", + "70" + ], + "probability": 100 + }, + { + "key": 263, + "libraryid": 1101, + "attr": [ + "defpro", + "70" + ], + "probability": 100 + }, + { + "key": 264, + "libraryid": 1101, + "attr": [ + "hppro", + "70" + ], + "probability": 100 + } +] \ No newline at end of file diff --git a/bin/json/game_equipintensify.json b/bin/json/game_equipintensify.json new file mode 100644 index 000000000..162fcf358 --- /dev/null +++ b/bin/json/game_equipintensify.json @@ -0,0 +1,1502 @@ +[ + { + "key": 1, + "star": 1, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 2, + "star": 1, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 3, + "star": 1, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 4, + "star": 1, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 900, + "activation": true, + "probability": 850, + "num": 4 + }, + { + "key": 5, + "star": 1, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 6, + "star": 1, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 7, + "star": 1, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 1800, + "activation": true, + "probability": 700, + "num": 7 + }, + { + "key": 8, + "star": 1, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 9, + "star": 1, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 10, + "star": 1, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 2700, + "activation": true, + "probability": 550, + "num": 10 + }, + { + "key": 11, + "star": 1, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 12, + "star": 1, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 13, + "star": 1, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 3600, + "activation": true, + "probability": 400, + "num": 13 + }, + { + "key": 14, + "star": 1, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 15, + "star": 1, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 10000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 16, + "star": 1, + "level": 15, + "need": [], + "bonus": 4500, + "activation": true, + "probability": 250, + "num": 16 + }, + { + "key": 17, + "star": 2, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 18, + "star": 2, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 19, + "star": 2, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 20, + "star": 2, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 900, + "activation": true, + "probability": 850, + "num": 4 + }, + { + "key": 21, + "star": 2, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 22, + "star": 2, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 23, + "star": 2, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 1800, + "activation": true, + "probability": 700, + "num": 7 + }, + { + "key": 24, + "star": 2, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 25, + "star": 2, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 26, + "star": 2, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 2700, + "activation": true, + "probability": 550, + "num": 10 + }, + { + "key": 27, + "star": 2, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 28, + "star": 2, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 29, + "star": 2, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 3600, + "activation": true, + "probability": 400, + "num": 13 + }, + { + "key": 30, + "star": 2, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 31, + "star": 2, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 20000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 32, + "star": 2, + "level": 15, + "need": [], + "bonus": 4500, + "activation": false, + "probability": 250, + "num": 16 + }, + { + "key": 33, + "star": 3, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 34, + "star": 3, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 35, + "star": 3, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 36, + "star": 3, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 900, + "activation": false, + "probability": 850, + "num": 4 + }, + { + "key": 37, + "star": 3, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 38, + "star": 3, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 39, + "star": 3, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 1800, + "activation": false, + "probability": 700, + "num": 7 + }, + { + "key": 40, + "star": 3, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 41, + "star": 3, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 42, + "star": 3, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 2700, + "activation": false, + "probability": 550, + "num": 10 + }, + { + "key": 43, + "star": 3, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 44, + "star": 3, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 45, + "star": 3, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 3600, + "activation": false, + "probability": 400, + "num": 13 + }, + { + "key": 46, + "star": 3, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 47, + "star": 3, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 30000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 48, + "star": 3, + "level": 15, + "need": [], + "bonus": 4500, + "activation": false, + "probability": 250, + "num": 16 + }, + { + "key": 49, + "star": 4, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 50, + "star": 4, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 51, + "star": 4, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 52, + "star": 4, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 900, + "activation": false, + "probability": 850, + "num": 4 + }, + { + "key": 53, + "star": 4, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 54, + "star": 4, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 55, + "star": 4, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 1800, + "activation": false, + "probability": 700, + "num": 7 + }, + { + "key": 56, + "star": 4, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 57, + "star": 4, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 58, + "star": 4, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 2700, + "activation": false, + "probability": 550, + "num": 10 + }, + { + "key": 59, + "star": 4, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 60, + "star": 4, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 61, + "star": 4, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 3600, + "activation": false, + "probability": 400, + "num": 13 + }, + { + "key": 62, + "star": 4, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 63, + "star": 4, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 40000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 64, + "star": 4, + "level": 15, + "need": [], + "bonus": 4500, + "activation": false, + "probability": 250, + "num": 16 + }, + { + "key": 65, + "star": 5, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 66, + "star": 5, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 67, + "star": 5, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 68, + "star": 5, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 900, + "activation": false, + "probability": 850, + "num": 4 + }, + { + "key": 69, + "star": 5, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 70, + "star": 5, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 71, + "star": 5, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 1800, + "activation": false, + "probability": 700, + "num": 7 + }, + { + "key": 72, + "star": 5, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 73, + "star": 5, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 74, + "star": 5, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 2700, + "activation": false, + "probability": 550, + "num": 10 + }, + { + "key": 75, + "star": 5, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 76, + "star": 5, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 77, + "star": 5, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 3600, + "activation": false, + "probability": 400, + "num": 13 + }, + { + "key": 78, + "star": 5, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 79, + "star": 5, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 50000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 80, + "star": 5, + "level": 15, + "need": [], + "bonus": 4500, + "activation": false, + "probability": 250, + "num": 16 + }, + { + "key": 81, + "star": 6, + "level": 0, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 0, + "activation": false, + "probability": 1000, + "num": 1 + }, + { + "key": 82, + "star": 6, + "level": 1, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 300, + "activation": false, + "probability": 1000, + "num": 2 + }, + { + "key": 83, + "star": 6, + "level": 2, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 600, + "activation": false, + "probability": 900, + "num": 3 + }, + { + "key": 84, + "star": 6, + "level": 3, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 900, + "activation": false, + "probability": 850, + "num": 4 + }, + { + "key": 85, + "star": 6, + "level": 4, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 1200, + "activation": false, + "probability": 800, + "num": 5 + }, + { + "key": 86, + "star": 6, + "level": 5, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 1500, + "activation": false, + "probability": 750, + "num": 6 + }, + { + "key": 87, + "star": 6, + "level": 6, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 1800, + "activation": false, + "probability": 700, + "num": 7 + }, + { + "key": 88, + "star": 6, + "level": 7, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 2100, + "activation": false, + "probability": 650, + "num": 8 + }, + { + "key": 89, + "star": 6, + "level": 8, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 2400, + "activation": false, + "probability": 600, + "num": 9 + }, + { + "key": 90, + "star": 6, + "level": 9, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 2700, + "activation": false, + "probability": 550, + "num": 10 + }, + { + "key": 91, + "star": 6, + "level": 10, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 3000, + "activation": false, + "probability": 500, + "num": 11 + }, + { + "key": 92, + "star": 6, + "level": 11, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 3300, + "activation": false, + "probability": 450, + "num": 12 + }, + { + "key": 93, + "star": 6, + "level": 12, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 3600, + "activation": false, + "probability": 400, + "num": 13 + }, + { + "key": 94, + "star": 6, + "level": 13, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 3900, + "activation": false, + "probability": 350, + "num": 14 + }, + { + "key": 95, + "star": 6, + "level": 14, + "need": [ + { + "a": "attr", + "t": "gold", + "n": 60000 + } + ], + "bonus": 4200, + "activation": false, + "probability": 300, + "num": 15 + }, + { + "key": 96, + "star": 6, + "level": 15, + "need": [], + "bonus": 4500, + "activation": false, + "probability": 250, + "num": 16 + } +] \ No newline at end of file diff --git a/bin/json/game_equipment.json b/bin/json/game_equipment.json deleted file mode 100644 index 0637a088a..000000000 --- a/bin/json/game_equipment.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json new file mode 100644 index 000000000..9bab661d9 --- /dev/null +++ b/bin/json/game_equipsuit.json @@ -0,0 +1,87 @@ +[ + { + "suittype": 0, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 1, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 2, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 3, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 4, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 5, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 6, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 7, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 8, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 9, + "suitnum": 4, + "skill": 100012000 + }, + { + "suittype": 100, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 101, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 102, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 103, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 104, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 105, + "suitnum": 2, + "skill": 100012000 + }, + { + "suittype": 106, + "suitnum": 2, + "skill": 100012000 + } +] \ No newline at end of file diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json new file mode 100644 index 000000000..093b0cb74 --- /dev/null +++ b/bin/json/game_hero.json @@ -0,0 +1,596 @@ +[ + { + "id": 11001, + "name": "阿宝", + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "prefab": "Person/11001.prefab", + "icon": 11001, + "sound": 121323, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 110001, + "skill2": 110002, + "skill3": 110003 + }, + { + "id": 11002, + "name": "原始人", + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "prefab": "Person/11002.prefab", + "icon": 11002, + "sound": 11002, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11002.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11003, + "name": "波比", + "star": 5, + "color": 4, + "race": 2, + "job": 1, + "type": 1, + "prefab": "Person/11003.prefab", + "icon": 11003, + "sound": 11003, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11003.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.69, + "z": 0 + }, + "skill1": 110004, + "skill2": 110005, + "skill3": 110012 + }, + { + "id": 11004, + "name": "布兰", + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "prefab": "11004", + "icon": 11004, + "sound": 11004, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11005, + "name": "无牙仔", + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "prefab": "Person/11001.prefab", + "icon": 11005, + "sound": 121323, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11006, + "name": "亚丝翠", + "star": 5, + "color": 4, + "race": 1, + "job": 1, + "type": 1, + "prefab": "11006", + "icon": 11006, + "sound": 11006, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11009, + "name": "希卡普", + "star": 4, + "color": 3, + "race": 3, + "job": 2, + "type": 1, + "prefab": "11009", + "icon": 11009, + "sound": 11009, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11009.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0.33, + "y": -0.1, + "z": 0.02 + }, + "skill1": 110010, + "skill2": 110011, + "skill3": 110013 + }, + { + "id": 22002, + "name": "沈王爷青春版", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "22002", + "icon": 22002, + "sound": 22002, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 90001, + "name": "邪恶阿宝", + "star": 4, + "color": 3, + "race": 1, + "job": 1, + "type": 1, + "prefab": "Person/90001.prefab", + "icon": 90001, + "sound": 90001, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_90001", + "cite": "11001", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11011, + "name": "浣熊", + "star": 4, + "color": 3, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11011", + "icon": 11011, + "sound": 11011, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11011.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11008, + "name": "悍娇虎", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11008", + "icon": 11008, + "sound": 11008, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11017, + "name": "冰霜杰克", + "star": 5, + "color": 4, + "race": 4, + "job": 2, + "type": 1, + "prefab": "11017", + "icon": 11017, + "sound": 11017, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11017.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 110006, + "skill2": 110007, + "skill3": 110014 + }, + { + "id": 11018, + "name": "睡神", + "star": 5, + "color": 4, + "race": 4, + "job": 2, + "type": 1, + "prefab": "11018", + "icon": 11018, + "sound": 11018, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11018.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": -0.31, + "z": 0 + }, + "skill1": 110008, + "skill2": 110009, + "skill3": 110015 + }, + { + "id": 11019, + "name": "莫甘娜", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11019", + "icon": 11019, + "sound": 11019, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11019.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11020, + "name": "莫甘娜二阶段", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11020", + "icon": 11020, + "sound": 11020, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11020.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11021, + "name": "莫甘娜巨怪", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11021", + "icon": 11021, + "sound": 11021, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11021.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 11099, + "name": "触手", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "11099", + "icon": 11099, + "sound": 11099, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11099.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 12001, + "name": "黑化阿宝", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "Person/12001.prefab", + "icon": 12001, + "sound": 121323, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_12001.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 12003, + "name": "黑化包比", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "Person/11003.prefab", + "icon": 12003, + "sound": 12003, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11003.asset", + "cite": "11003", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 12009, + "name": "黑化希卡普", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "12009", + "icon": 11009, + "sound": 11009, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11009.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 12017, + "name": "黑化杰克", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "12017", + "icon": 12017, + "sound": 12017, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11017.asset", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + }, + { + "id": 12018, + "name": "黑化睡神", + "star": 5, + "color": 4, + "race": 2, + "job": 2, + "type": 1, + "prefab": "12018", + "icon": 12018, + "sound": 12018, + "tujing": [ + 1 + ], + "intr": "", + "events": "EventDataSet/Hero_11018.asset", + "cite": "11018", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill1": 0, + "skill2": 0, + "skill3": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_herolevelgrow.json b/bin/json/game_herolevelgrow.json index 1b5e7ac5d..c60770ada 100644 --- a/bin/json/game_herolevelgrow.json +++ b/bin/json/game_herolevelgrow.json @@ -1,255 +1,13 @@ [ - { - "id": 11001, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 174, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 11002, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 193, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11003, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 193, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11004, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 193, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 11005, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 174, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 11006, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 193, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11009, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 165, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 22002, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 90001, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 174, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 11011, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 165, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11008, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11017, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 11018, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 11019, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11020, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 11021, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 11099, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 12001, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 174, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 12003, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 193, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 12009, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 165, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 12017, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, - "speedgrow": 0 - }, - { - "id": 12018, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, - "speedgrow": 0 - }, { "id": 15001, "hp": 0, "atk": 0, "def": 0, "speed": 183, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, "speedgrow": 0 }, { @@ -258,9 +16,9 @@ "atk": 0, "def": 0, "speed": 183, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, + "hpgrow": 1100, + "atkgrow": 1300, + "defgrow": 1150, "speedgrow": 0 }, { @@ -269,9 +27,9 @@ "atk": 0, "def": 0, "speed": 174, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, + "hpgrow": 1150, + "atkgrow": 1100, + "defgrow": 1300, "speedgrow": 0 }, { @@ -280,9 +38,9 @@ "atk": 0, "def": 0, "speed": 193, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, + "hpgrow": 1250, + "atkgrow": 1000, + "defgrow": 1250, "speedgrow": 0 }, { @@ -291,31 +49,9 @@ "atk": 0, "def": 0, "speed": 165, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, - "speedgrow": 0 - }, - { - "id": 44902, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, - "speedgrow": 0 - }, - { - "id": 44903, - "hp": 0, - "atk": 0, - "def": 0, - "speed": 183, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, "speedgrow": 0 }, { @@ -324,9 +60,9 @@ "atk": 0, "def": 0, "speed": 183, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, + "hpgrow": 1250, + "atkgrow": 1000, + "defgrow": 1250, "speedgrow": 0 }, { @@ -335,9 +71,9 @@ "atk": 0, "def": 0, "speed": 183, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, "speedgrow": 0 }, { @@ -346,9 +82,9 @@ "atk": 0, "def": 0, "speed": 174, - "hpgrow": 1.1, - "atkgrow": 1.3, - "defgrow": 1.15, + "hpgrow": 1100, + "atkgrow": 1300, + "defgrow": 1150, "speedgrow": 0 }, { @@ -357,9 +93,9 @@ "atk": 0, "def": 0, "speed": 193, - "hpgrow": 1.15, - "atkgrow": 1.1, - "defgrow": 1.3, + "hpgrow": 1150, + "atkgrow": 1100, + "defgrow": 1300, "speedgrow": 0 }, { @@ -368,9 +104,9 @@ "atk": 0, "def": 0, "speed": 165, - "hpgrow": 1.25, - "atkgrow": 1, - "defgrow": 1.25, + "hpgrow": 1250, + "atkgrow": 1000, + "defgrow": 1250, "speedgrow": 0 }, { @@ -379,9 +115,9 @@ "atk": 0, "def": 0, "speed": 183, - "hpgrow": 1, - "atkgrow": 1.3, - "defgrow": 1.25, + "hpgrow": 1000, + "atkgrow": 1300, + "defgrow": 1250, "speedgrow": 0 } ] \ No newline at end of file diff --git a/bin/json/game_herolevelup.json b/bin/json/game_herolevelup.json index f918099e0..816313fd0 100644 --- a/bin/json/game_herolevelup.json +++ b/bin/json/game_herolevelup.json @@ -2,6 +2,7 @@ { "level": 1, "heroexp": 300, + "gold": 300, "hp": 1857, "atk": 137, "def": 137 @@ -9,6 +10,7 @@ { "level": 2, "heroexp": 320, + "gold": 320, "hp": 1953, "atk": 142.7, "def": 143.7 @@ -16,6 +18,7 @@ { "level": 3, "heroexp": 340, + "gold": 340, "hp": 2049, "atk": 148.4, "def": 150.4 @@ -23,6 +26,7 @@ { "level": 4, "heroexp": 360, + "gold": 360, "hp": 2145, "atk": 154.1, "def": 157.1 @@ -30,6 +34,7 @@ { "level": 5, "heroexp": 380, + "gold": 380, "hp": 2241, "atk": 159.8, "def": 163.8 @@ -37,6 +42,7 @@ { "level": 6, "heroexp": 400, + "gold": 400, "hp": 2337, "atk": 165.5, "def": 170.5 @@ -44,6 +50,7 @@ { "level": 7, "heroexp": 420, + "gold": 420, "hp": 2433, "atk": 171.2, "def": 177.2 @@ -51,6 +58,7 @@ { "level": 8, "heroexp": 440, + "gold": 440, "hp": 2529, "atk": 176.9, "def": 183.9 @@ -58,6 +66,7 @@ { "level": 9, "heroexp": 460, + "gold": 460, "hp": 2625, "atk": 182.6, "def": 190.6 @@ -65,6 +74,7 @@ { "level": 10, "heroexp": 480, + "gold": 480, "hp": 2721, "atk": 188.3, "def": 197.3 @@ -72,6 +82,7 @@ { "level": 11, "heroexp": 1100, + "gold": 1100, "hp": 2817, "atk": 194, "def": 204 @@ -79,6 +90,7 @@ { "level": 12, "heroexp": 1200, + "gold": 1200, "hp": 2913, "atk": 199.7, "def": 210.7 @@ -86,6 +98,7 @@ { "level": 13, "heroexp": 1300, + "gold": 1300, "hp": 3009, "atk": 205.4, "def": 217.4 @@ -93,6 +106,7 @@ { "level": 14, "heroexp": 1400, + "gold": 1400, "hp": 3105, "atk": 211.1, "def": 224.1 @@ -100,6 +114,7 @@ { "level": 15, "heroexp": 1500, + "gold": 1500, "hp": 3201, "atk": 216.8, "def": 230.8 @@ -107,6 +122,7 @@ { "level": 16, "heroexp": 1600, + "gold": 1600, "hp": 3297, "atk": 222.5, "def": 237.5 @@ -114,6 +130,7 @@ { "level": 17, "heroexp": 1700, + "gold": 1700, "hp": 3393, "atk": 228.2, "def": 244.2 @@ -121,6 +138,7 @@ { "level": 18, "heroexp": 1800, + "gold": 1800, "hp": 3489, "atk": 233.9, "def": 250.9 @@ -128,6 +146,7 @@ { "level": 19, "heroexp": 1900, + "gold": 1900, "hp": 3585, "atk": 239.6, "def": 257.6 @@ -135,6 +154,7 @@ { "level": 20, "heroexp": 2000, + "gold": 2000, "hp": 3681, "atk": 245.3, "def": 264.3 @@ -142,6 +162,7 @@ { "level": 21, "heroexp": 6300, + "gold": 6300, "hp": 3777, "atk": 251, "def": 271 @@ -149,6 +170,7 @@ { "level": 22, "heroexp": 6600, + "gold": 6600, "hp": 3873, "atk": 256.7, "def": 277.7 @@ -156,6 +178,7 @@ { "level": 23, "heroexp": 6900, + "gold": 6900, "hp": 3969, "atk": 262.4, "def": 284.4 @@ -163,6 +186,7 @@ { "level": 24, "heroexp": 7200, + "gold": 7200, "hp": 4065, "atk": 268.1, "def": 291.1 @@ -170,6 +194,7 @@ { "level": 25, "heroexp": 7500, + "gold": 7500, "hp": 4161, "atk": 273.8, "def": 297.8 @@ -177,6 +202,7 @@ { "level": 26, "heroexp": 7800, + "gold": 7800, "hp": 4257, "atk": 279.5, "def": 304.5 @@ -184,6 +210,7 @@ { "level": 27, "heroexp": 8100, + "gold": 8100, "hp": 4353, "atk": 285.2, "def": 311.2 @@ -191,6 +218,7 @@ { "level": 28, "heroexp": 8400, + "gold": 8400, "hp": 4449, "atk": 290.9, "def": 317.9 @@ -198,6 +226,7 @@ { "level": 29, "heroexp": 8700, + "gold": 8700, "hp": 4545, "atk": 296.6, "def": 324.6 @@ -205,6 +234,7 @@ { "level": 30, "heroexp": 9000, + "gold": 9000, "hp": 4641, "atk": 302.3, "def": 331.3 @@ -212,6 +242,7 @@ { "level": 31, "heroexp": 15500, + "gold": 15500, "hp": 4737, "atk": 308, "def": 338 @@ -219,6 +250,7 @@ { "level": 32, "heroexp": 16000, + "gold": 16000, "hp": 4833, "atk": 313.7, "def": 344.7 @@ -226,6 +258,7 @@ { "level": 33, "heroexp": 16500, + "gold": 16500, "hp": 4929, "atk": 319.4, "def": 351.4 @@ -233,6 +266,7 @@ { "level": 34, "heroexp": 17000, + "gold": 17000, "hp": 5025, "atk": 325.1, "def": 358.1 @@ -240,6 +274,7 @@ { "level": 35, "heroexp": 17500, + "gold": 17500, "hp": 5121, "atk": 330.8, "def": 364.8 @@ -247,6 +282,7 @@ { "level": 36, "heroexp": 18000, + "gold": 18000, "hp": 5217, "atk": 336.5, "def": 371.5 @@ -254,6 +290,7 @@ { "level": 37, "heroexp": 18500, + "gold": 18500, "hp": 5313, "atk": 342.2, "def": 378.2 @@ -261,6 +298,7 @@ { "level": 38, "heroexp": 19000, + "gold": 19000, "hp": 5409, "atk": 347.9, "def": 384.9 @@ -268,6 +306,7 @@ { "level": 39, "heroexp": 19500, + "gold": 19500, "hp": 5505, "atk": 353.6, "def": 391.6 @@ -275,6 +314,7 @@ { "level": 40, "heroexp": 20000, + "gold": 20000, "hp": 5601, "atk": 359.3, "def": 398.3 @@ -282,6 +322,7 @@ { "level": 41, "heroexp": 24600, + "gold": 24600, "hp": 5697, "atk": 365, "def": 405 @@ -289,6 +330,7 @@ { "level": 42, "heroexp": 25200, + "gold": 25200, "hp": 5793, "atk": 370.7, "def": 411.7 @@ -296,6 +338,7 @@ { "level": 43, "heroexp": 25800, + "gold": 25800, "hp": 5889, "atk": 376.4, "def": 418.4 @@ -303,6 +346,7 @@ { "level": 44, "heroexp": 26400, + "gold": 26400, "hp": 5985, "atk": 382.1, "def": 425.1 @@ -310,6 +354,7 @@ { "level": 45, "heroexp": 27000, + "gold": 27000, "hp": 6081, "atk": 387.8, "def": 431.8 @@ -317,6 +362,7 @@ { "level": 46, "heroexp": 27600, + "gold": 27600, "hp": 6177, "atk": 393.5, "def": 438.5 @@ -324,6 +370,7 @@ { "level": 47, "heroexp": 28200, + "gold": 28200, "hp": 6273, "atk": 399.2, "def": 445.2 @@ -331,6 +378,7 @@ { "level": 48, "heroexp": 28800, + "gold": 28800, "hp": 6369, "atk": 404.9, "def": 451.9 @@ -338,6 +386,7 @@ { "level": 49, "heroexp": 29400, + "gold": 29400, "hp": 6465, "atk": 410.6, "def": 458.6 @@ -345,6 +394,7 @@ { "level": 50, "heroexp": 30000, + "gold": 30000, "hp": 6561, "atk": 416.3, "def": 465.3 @@ -352,6 +402,7 @@ { "level": 51, "heroexp": 48450, + "gold": 48450, "hp": 6657, "atk": 422, "def": 472 @@ -359,6 +410,7 @@ { "level": 52, "heroexp": 49400, + "gold": 49400, "hp": 6753, "atk": 427.7, "def": 478.7 @@ -366,6 +418,7 @@ { "level": 53, "heroexp": 50350, + "gold": 50350, "hp": 6849, "atk": 433.4, "def": 485.4 @@ -373,6 +426,7 @@ { "level": 54, "heroexp": 51300, + "gold": 51300, "hp": 6945, "atk": 439.1, "def": 492.1 @@ -380,6 +434,7 @@ { "level": 55, "heroexp": 52250, + "gold": 52250, "hp": 7041, "atk": 444.8, "def": 498.8 @@ -387,6 +442,7 @@ { "level": 56, "heroexp": 53200, + "gold": 53200, "hp": 7137, "atk": 450.5, "def": 505.5 @@ -394,6 +450,7 @@ { "level": 57, "heroexp": 54150, + "gold": 54150, "hp": 7233, "atk": 456.2, "def": 512.2 @@ -401,6 +458,7 @@ { "level": 58, "heroexp": 55100, + "gold": 55100, "hp": 7329, "atk": 461.9, "def": 518.9 @@ -408,6 +466,7 @@ { "level": 59, "heroexp": 56050, + "gold": 56050, "hp": 7425, "atk": 467.6, "def": 525.6 @@ -415,6 +474,7 @@ { "level": 60, "heroexp": 57000, + "gold": 57000, "hp": 7521, "atk": 473.3, "def": 532.3 diff --git a/bin/json/game_herostargrow.json b/bin/json/game_herostargrow.json index a801c78fc..4e994d8bd 100644 --- a/bin/json/game_herostargrow.json +++ b/bin/json/game_herostargrow.json @@ -1,41 +1,47 @@ [ { - "color": 1, + "star": 1, + "level": 1, "starup_hp": 0, "starup_atk": 0, "starup_def": 0, "starup_speed": 0 }, { - "color": 2, + "star": 2, + "level": 10, "starup_hp": 9.5, "starup_atk": 9.5, "starup_def": 9.5, "starup_speed": 9.5 }, { - "color": 3, + "star": 3, + "level": 20, "starup_hp": 19, "starup_atk": 19, "starup_def": 19, "starup_speed": 19 }, { - "color": 4, + "star": 4, + "level": 30, "starup_hp": 28.5, "starup_atk": 28.5, "starup_def": 28.5, "starup_speed": 28.5 }, { - "color": 5, + "star": 5, + "level": 40, "starup_hp": 38, "starup_atk": 38, "starup_def": 38, "starup_speed": 38 }, { - "color": 6, + "star": 6, + "level": 50, "starup_hp": 47.5, "starup_atk": 47.5, "starup_def": 47.5, diff --git a/bin/json/game_herostarup.json b/bin/json/game_herostarup.json index a8fd33172..fac7dc911 100644 --- a/bin/json/game_herostarup.json +++ b/bin/json/game_herostarup.json @@ -11,7 +11,8 @@ 1 ], "needracestar": 4, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 2, @@ -25,19 +26,21 @@ 1 ], "needracestar": 5, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 3, "id": 15001, "star": 6, "maxlevel": 60, - "needhero": 15001, + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], "needracestar": 0, - "needracenum": 0 + "needracenum": 0, + "gold": 0 }, { "key": 4, @@ -51,19 +54,21 @@ 2 ], "needracestar": 5, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 5, "id": 25001, "star": 6, "maxlevel": 60, - "needhero": 25001, + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], "needracestar": 0, - "needracenum": 0 + "needracenum": 0, + "gold": 0 }, { "key": 6, @@ -77,19 +82,21 @@ 3 ], "needracestar": 5, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 7, "id": 35001, "star": 6, "maxlevel": 60, - "needhero": 35001, + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], "needracestar": 0, - "needracenum": 0 + "needracenum": 0, + "gold": 0 }, { "key": 8, @@ -103,26 +110,28 @@ 4 ], "needracestar": 5, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 9, "id": 44001, "star": 6, "maxlevel": 60, - "needhero": 44001, + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], "needracestar": 0, - "needracenum": 0 + "needracenum": 0, + "gold": 0 }, { "key": 10, - "id": 44901, + "id": 43901, "star": 3, "maxlevel": 30, - "needhero": 44901, + "needhero": 43901, "needherostar": 3, "needheronum": 1, "needrace": [ @@ -132,14 +141,15 @@ 4 ], "needracestar": 3, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 11, - "id": 44901, + "id": 43901, "star": 4, "maxlevel": 40, - "needhero": 44901, + "needhero": 43901, "needherostar": 4, "needheronum": 1, "needrace": [ @@ -149,14 +159,15 @@ 4 ], "needracestar": 4, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 12, - "id": 44901, + "id": 43901, "star": 5, "maxlevel": 50, - "needhero": 44901, + "needhero": 43901, "needherostar": 5, "needheronum": 1, "needrace": [ @@ -166,93 +177,20 @@ 4 ], "needracestar": 5, - "needracenum": 4 + "needracenum": 4, + "gold": 10000 }, { "key": 13, - "id": 44901, + "id": 43901, "star": 6, "maxlevel": 60, - "needhero": 44901, + "needhero": 0, "needherostar": 0, "needheronum": 0, "needrace": [], "needracestar": 0, - "needracenum": 0 - }, - { - "key": 14, - "id": 44902, - "star": 4, - "maxlevel": 40, - "needhero": 44902, - "needherostar": 4, - "needheronum": 1, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 4, - "needracenum": 4 - }, - { - "key": 15, - "id": 44902, - "star": 5, - "maxlevel": 50, - "needhero": 44902, - "needherostar": 5, - "needheronum": 1, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 5, - "needracenum": 4 - }, - { - "key": 16, - "id": 44902, - "star": 6, - "maxlevel": 60, - "needhero": 44902, - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0 - }, - { - "key": 17, - "id": 44903, - "star": 5, - "maxlevel": 50, - "needhero": 44903, - "needherostar": 5, - "needheronum": 1, - "needrace": [ - 1, - 2, - 3, - 4 - ], - "needracestar": 5, - "needracenum": 4 - }, - { - "key": 18, - "id": 44903, - "star": 6, - "maxlevel": 60, - "needhero": 44903, - "needherostar": 0, - "needheronum": 0, - "needrace": [], - "needracestar": 0, - "needracenum": 0 + "needracenum": 0, + "gold": 0 } ] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index 0637a088a..a01cc548c 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -1 +1,278 @@ -[] \ No newline at end of file +[ + { + "itemid": 10001, + "name": "1阵营觉醒材料", + "usetype": 9, + "color": 2, + "race": 1, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10002, + "name": "1阵营觉醒材料", + "usetype": 9, + "color": 3, + "race": 1, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10003, + "name": "1阵营觉醒材料", + "usetype": 9, + "color": 4, + "race": 1, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10011, + "name": "2阵营觉醒材料", + "usetype": 9, + "color": 2, + "race": 2, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10012, + "name": "2阵营觉醒材料", + "usetype": 9, + "color": 3, + "race": 2, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10013, + "name": "2阵营觉醒材料", + "usetype": 9, + "color": 4, + "race": 2, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10021, + "name": "3阵营觉醒材料", + "usetype": 9, + "color": 2, + "race": 3, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10022, + "name": "3阵营觉醒材料", + "usetype": 9, + "color": 3, + "race": 3, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10023, + "name": "3阵营觉醒材料", + "usetype": 9, + "color": 4, + "race": 3, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10031, + "name": "4阵营觉醒材料", + "usetype": 9, + "color": 2, + "race": 4, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10032, + "name": "4阵营觉醒材料", + "usetype": 9, + "color": 3, + "race": 4, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + }, + { + "itemid": 10033, + "name": "4阵营觉醒材料", + "usetype": 9, + "color": 4, + "race": 4, + "bagtype": false, + "index": 10001, + "texiao": "", + "dlp": 0, + "composenum": 0, + "htype": 0, + "tujing": 0, + "usetz": 0, + "maxnum": 999, + "uselv": 1, + "ismutil": 1, + "type": 0, + "img": "", + "ico": "", + "intr": "", + "sale": "" + } +] \ No newline at end of file diff --git a/bin/json/game_msgdistrib.json b/bin/json/game_msgdistrib.json deleted file mode 100644 index 0637a088a..000000000 --- a/bin/json/game_msgdistrib.json +++ /dev/null @@ -1 +0,0 @@ -[] \ No newline at end of file diff --git a/bin/json/game_newhero.json b/bin/json/game_newhero.json index 83a8932cb..02662660f 100644 --- a/bin/json/game_newhero.json +++ b/bin/json/game_newhero.json @@ -1,6 +1,6 @@ [ { - "id": 15001, + "hid": 15001, "name": "阿宝", "star": 5, "color": 4, @@ -28,7 +28,7 @@ "skill3": 0 }, { - "id": 25001, + "hid": 25001, "name": "亚丝翠", "star": 5, "color": 4, @@ -56,7 +56,7 @@ "skill3": 0 }, { - "id": 35001, + "hid": 35001, "name": "波比", "star": 5, "color": 4, @@ -84,7 +84,7 @@ "skill3": 0 }, { - "id": 44001, + "hid": 44001, "name": "悍娇虎", "star": 4, "color": 3, @@ -112,16 +112,16 @@ "skill3": 0 }, { - "id": 44901, - "name": "升星精灵·稀有", + "hid": 43901, + "name": "升星精灵", "star": 3, "color": 2, "race": 4, "job": 5, "type": 2, - "prefab": "44901", - "icon": 44901, - "sound": 44901, + "prefab": "43901", + "icon": 43901, + "sound": 43901, "tujing": [ 1 ], @@ -140,69 +140,69 @@ "skill3": 0 }, { - "id": 44902, - "name": "升星精灵·史诗", - "star": 4, - "color": 3, - "race": 4, - "job": 5, - "type": 2, - "prefab": "44902", - "icon": 44902, - "sound": 44902, - "tujing": [ - 1 - ], - "intr": "", - "events": "hero_2011", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 - }, - { - "id": 44903, - "name": "升星精灵·传说", - "star": 5, - "color": 4, - "race": 4, - "job": 5, - "type": 2, - "prefab": "44903", - "icon": 44903, - "sound": 44903, - "tujing": [ - 1 - ], - "intr": "", - "events": "hero_2011", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 0, - "skill2": 0, - "skill3": 0 - }, - { - "id": 44911, + "hid": 42911, "name": "初级经验精灵", "star": 2, "color": 1, "race": 4, "job": 5, "type": 3, + "prefab": "42911", + "icon": 42911, + "sound": 42911, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 0, + "skill1": 100044911, + "skill2": 100044911, + "skill3": 0 + }, + { + "hid": 43911, + "name": "中级经验精灵", + "star": 3, + "color": 2, + "race": 4, + "job": 5, + "type": 3, + "prefab": "43911", + "icon": 43911, + "sound": 43911, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 0, + "skill1": 100044912, + "skill2": 100044911, + "skill3": 0 + }, + { + "hid": 44911, + "name": "高级经验精灵", + "star": 4, + "color": 3, + "race": 4, + "job": 5, + "type": 3, "prefab": "44911", "icon": 44911, "sound": 44911, @@ -219,74 +219,46 @@ "z": 0 }, "skill": 0, - "skill1": 100044911, - "skill2": 100044911, - "skill3": 0 - }, - { - "id": 44912, - "name": "中级经验精灵", - "star": 2, - "color": 1, - "race": 4, - "job": 5, - "type": 3, - "prefab": "44912", - "icon": 44912, - "sound": 44912, - "tujing": [ - 1 - ], - "intr": "", - "events": "hero_2011", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, - "skill1": 100044912, - "skill2": 100044911, - "skill3": 0 - }, - { - "id": 44913, - "name": "高级经验精灵", - "star": 2, - "color": 1, - "race": 4, - "job": 5, - "type": 3, - "prefab": "44913", - "icon": 44913, - "sound": 44913, - "tujing": [ - 1 - ], - "intr": "", - "events": "hero_2011", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, "skill1": 100044913, "skill2": 100044911, "skill3": 0 }, { - "id": 44921, + "hid": 43921, "name": "技能精灵·稀有", "star": 3, "color": 2, "race": 4, "job": 5, "type": 4, + "prefab": "43921", + "icon": 43921, + "sound": 43921, + "tujing": [ + 1 + ], + "intr": "", + "events": "hero_2011", + "cite": "", + "effectstay": [], + "hpspace": { + "x": 0, + "y": 0, + "z": 0 + }, + "skill": 0, + "skill1": 100044921, + "skill2": 100044911, + "skill3": 0 + }, + { + "hid": 44921, + "name": "技能精灵·史诗", + "star": 4, + "color": 3, + "race": 4, + "job": 5, + "type": 4, "prefab": "44921", "icon": 44921, "sound": 44921, @@ -303,49 +275,21 @@ "z": 0 }, "skill": 0, - "skill1": 100044921, - "skill2": 100044911, - "skill3": 0 - }, - { - "id": 44922, - "name": "技能精灵·史诗", - "star": 4, - "color": 3, - "race": 4, - "job": 5, - "type": 4, - "prefab": "44922", - "icon": 44922, - "sound": 44922, - "tujing": [ - 1 - ], - "intr": "", - "events": "hero_2011", - "cite": "", - "effectstay": [], - "hpspace": { - "x": 0, - "y": 0, - "z": 0 - }, - "skill": 0, "skill1": 100044922, "skill2": 100044911, "skill3": 0 }, { - "id": 44923, + "hid": 45921, "name": "技能精灵·传说", "star": 5, "color": 4, "race": 4, "job": 5, "type": 4, - "prefab": "44923", - "icon": 44923, - "sound": 44923, + "prefab": "45921", + "icon": 45921, + "sound": 45921, "tujing": [ 1 ], diff --git a/bin/json/game_skill.json b/bin/json/game_skill.json index 2de4b3b73..3d1f81201 100644 --- a/bin/json/game_skill.json +++ b/bin/json/game_skill.json @@ -2,78 +2,106 @@ { "sameid": 110001, "act": "Atk", - "tubiao": "skillicon_1", + "tubiao": "skillicon_001", "name": "太极一式", "describe": "" }, { "sameid": 110002, "act": "Skill1", - "tubiao": "skillicon_1", + "tubiao": "skillicon_002", "name": "太极零式", "describe": "" }, { "sameid": 110003, "act": "Skill2", - "tubiao": "skillicon_3", + "tubiao": "skillicon_003", "name": "太极最终式", "describe": "" }, { "sameid": 110004, "act": "Atk", - "tubiao": "skillicon_1", + "tubiao": "skillicon_004", "name": "和谐音律", "describe": "" }, { "sameid": 110005, "act": "Skill1", - "tubiao": "skillicon_2", + "tubiao": "skillicon_005", "name": "彩虹音符", "describe": "" }, { "sameid": 110006, "act": "Atk", - "tubiao": "skillicon_1", + "tubiao": "skillicon_010", "name": "冰霜之语", "describe": "" }, { "sameid": 110007, "act": "Skill1", - "tubiao": "skillicon_2", + "tubiao": "skillicon_011", "name": "极寒领域", "describe": "" }, { "sameid": 110008, "act": "Atk", - "tubiao": "skillicon_1", + "tubiao": "skillicon_013", "name": "梦·呓语", "describe": "" }, { "sameid": 110009, "act": "Skill1", - "tubiao": "skillicon_2", + "tubiao": "skillicon_014", "name": "梦·创世", "describe": "" }, { "sameid": 110010, "act": "Atk", - "tubiao": "skillicon_1", + "tubiao": "skillicon_007", "name": "一往无前", "describe": "" }, { "sameid": 110011, "act": "Skill1", - "tubiao": "skillicon_2", + "tubiao": "skillicon_008", "name": "自由之往", "describe": "" + }, + { + "sameid": 110012, + "act": "Skill2", + "tubiao": "skillicon_006", + "name": "彩虹音符", + "describe": "" + }, + { + "sameid": 110013, + "act": "Skill2", + "tubiao": "skillicon_009", + "name": "自由之往", + "describe": "" + }, + { + "sameid": 110014, + "act": "Skill2", + "tubiao": "skillicon_012", + "name": "极寒领域", + "describe": "" + }, + { + "sameid": 110015, + "act": "Skill2", + "tubiao": "skillicon_015", + "name": "梦·创世", + "describe": "" } ] \ No newline at end of file diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index 986b381d4..d6228dcc2 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -1,771 +1,42 @@ [ + { + "Id": 200011101, + "Desc": "对敌方1个目标造成攻击力80%", + "Target": "", + "EmitPR": 0, + "Type": "tongyongshanghai", + "Argu": [ + "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800," + ], + "AddEffect": false, + "FollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [] + }, { "Id": 200012101, - "Desc": "给自己加回合结束后触发的BUFF", + "Desc": "对全体1个目标造成攻击力80%以及防御力120%的伤害", "Target": "", + "EmitPR": 0, + "Type": "tongyongshanghai", + "Argu": [ + "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800,ProSou2=0,Pro2=Total_Def,ProPar2=1200" + ], + "AddEffect": false, + "FollowSK": [], + "FailFollowSK": [], + "MustHit": false, + "Tags": [] + }, + { + "Id": 200013101, + "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害", + "Target": "Action=ProJudge,JudgeType=0,Key=Total_Atk,Op=0", "EmitPR": 1000, - "Type": "AddBuff", + "Type": "tongyongshanghai", "Argu": [ - "400011101", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012102, - "Desc": "给自己加引雷BUFF1（伤害触发）的子技能", - "Target": "", - "EmitPR": 1001, - "Type": "AddBuff", - "Argu": [ - "400011102", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012103, - "Desc": "给自己加引雷BUFF2（受击触发）的子技能", - "Target": "", - "EmitPR": 1002, - "Type": "AddBuff", - "Argu": [ - "400011103", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012104, - "Desc": "给自己加引雷BUFF3（受控触发）的子技能", - "Target": "", - "EmitPR": 1003, - "Type": "AddBuff", - "Argu": [ - "400011104", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012105, - "Desc": "造成全体伤害", - "Target": "", - "EmitPR": 1004, - "Type": "DefDam", - "Argu": [ - "850" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [ - "shanghai", - "xxx" - ] - }, - { - "Id": 200012106, - "Desc": "给自己加防御提升BUFF", - "Target": "", - "EmitPR": 1005, - "Type": "AddBuff", - "Argu": [ - "300011107", - "1", - "Buff_Per_Def", - "1", - "200" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012107, - "Desc": "驱散自身 引雷 标签所有BUFF", - "Target": "", - "EmitPR": 1006, - "Type": "qushanbiaoqian", - "Argu": [ - "yinlei" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012201, - "Desc": "给自己加回合结束后触发的BUFF", - "Target": "", - "EmitPR": 1007, - "Type": "AddBuff", - "Argu": [ - "400011201", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012202, - "Desc": "给自己加引雷BUFF1（伤害触发）的子技能", - "Target": "", - "EmitPR": 1008, - "Type": "AddBuff", - "Argu": [ - "400012202", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012203, - "Desc": "给自己加引雷BUFF2（受击触发）的子技能", - "Target": "", - "EmitPR": 1009, - "Type": "AddBuff", - "Argu": [ - "400012203", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012204, - "Desc": "给自己加引雷BUFF3（受控触发）的子技能", - "Target": "", - "EmitPR": 1010, - "Type": "AddBuff", - "Argu": [ - "400012204", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012205, - "Desc": "造成全体伤害", - "Target": "", - "EmitPR": 1011, - "Type": "DefDam", - "Argu": [ - "900" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [ - "shanghai" - ] - }, - { - "Id": 200012206, - "Desc": "给自己加防御提升BUFF", - "Target": "", - "EmitPR": 1012, - "Type": "AddBuff", - "Argu": [ - "300012207", - "1", - "Buff_Per_Def", - "1", - "200" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012207, - "Desc": "驱散自身 引雷 标签所有BUFF", - "Target": "", - "EmitPR": 1013, - "Type": "qushanbiaoqian", - "Argu": [ - "yinlei" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012301, - "Desc": "给自己加回合结束后触发的BUFF", - "Target": "", - "EmitPR": 1014, - "Type": "AddBuff", - "Argu": [ - "400012301", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012302, - "Desc": "给自己加引雷BUFF1（伤害触发）的子技能", - "Target": "", - "EmitPR": 1015, - "Type": "AddBuff", - "Argu": [ - "400012302", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012303, - "Desc": "给自己加引雷BUFF2（受击触发）的子技能", - "Target": "", - "EmitPR": 1016, - "Type": "AddBuff", - "Argu": [ - "400012303", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012304, - "Desc": "给自己加引雷BUFF3（受控触发）的子技能", - "Target": "", - "EmitPR": 1017, - "Type": "AddBuff", - "Argu": [ - "400012304", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012305, - "Desc": "造成全体伤害", - "Target": "", - "EmitPR": 1018, - "Type": "DefDam", - "Argu": [ - "950" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [ - "shanghai" - ] - }, - { - "Id": 200012306, - "Desc": "给自己加防御提升BUFF", - "Target": "", - "EmitPR": 1019, - "Type": "AddBuff", - "Argu": [ - "300011307", - "1", - "Buff_Per_Def", - "1", - "200" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012307, - "Desc": "驱散自身 引雷 标签所有BUFF", - "Target": "", - "EmitPR": 1020, - "Type": "qushanbiaoqian", - "Argu": [ - "yinlei" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012401, - "Desc": "给自己加回合结束后触发的BUFF", - "Target": "", - "EmitPR": 1021, - "Type": "AddBuff", - "Argu": [ - "400012401", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012402, - "Desc": "给自己加引雷BUFF1（伤害触发）的子技能", - "Target": "", - "EmitPR": 1022, - "Type": "AddBuff", - "Argu": [ - "400012402", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012403, - "Desc": "给自己加引雷BUFF2（受击触发）的子技能", - "Target": "", - "EmitPR": 1023, - "Type": "AddBuff", - "Argu": [ - "400012403", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012404, - "Desc": "给自己加引雷BUFF3（受控触发）的子技能", - "Target": "", - "EmitPR": 1024, - "Type": "AddBuff", - "Argu": [ - "400012404", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012405, - "Desc": "造成全体伤害", - "Target": "", - "EmitPR": 1025, - "Type": "DefDam", - "Argu": [ - "1000" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [ - "shanghai" - ] - }, - { - "Id": 200012406, - "Desc": "给自己加防御提升BUFF", - "Target": "", - "EmitPR": 1026, - "Type": "AddBuff", - "Argu": [ - "30012407", - "1", - "Buff_Per_Def", - "1", - "200" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012407, - "Desc": "驱散自身 引雷 标签所有BUFF", - "Target": "", - "EmitPR": 1027, - "Type": "qushanbiaoqian", - "Argu": [ - "yinlei" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012501, - "Desc": "给自己加回合结束后触发的BUFF", - "Target": "", - "EmitPR": 1028, - "Type": "AddBuff", - "Argu": [ - "400012501", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012502, - "Desc": "给自己加引雷BUFF1（伤害触发）的子技能", - "Target": "", - "EmitPR": 1029, - "Type": "AddBuff", - "Argu": [ - "400012502", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012503, - "Desc": "给自己加引雷BUFF2（受击触发）的子技能", - "Target": "", - "EmitPR": 1030, - "Type": "AddBuff", - "Argu": [ - "400012503", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012504, - "Desc": "给自己加引雷BUFF3（受控触发）的子技能", - "Target": "", - "EmitPR": 1031, - "Type": "AddBuff", - "Argu": [ - "400012504", - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012505, - "Desc": "造成全体伤害", - "Target": "", - "EmitPR": 1032, - "Type": "DefDam", - "Argu": [ - "1100" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012506, - "Desc": "给自己加防御提升BUFF", - "Target": "", - "EmitPR": 1033, - "Type": "AddBuff", - "Argu": [ - "30012507", - "1", - "Buff_Per_Def", - "1", - "200" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200012507, - "Desc": "驱散自身 引雷 标签所有BUFF", - "Target": "", - "EmitPR": 1034, - "Type": "qushanbiaoqian", - "Argu": [ - "yinlei" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200015101, - "Desc": "加暴击检测触发的BUFF", - "Target": "", - "EmitPR": 1035, - "Type": "AddBuff", - "Argu": [ - "400015101", - "-1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200015102, - "Desc": "减少当前角色第几个技能的CD", - "Target": "", - "EmitPR": 1036, - "Type": "yingxiangCD", - "Argu": [ - "1", - "1", - "2" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200222001, - "Desc": "给自己加 受击触发调用子技能效果的 子技能", - "Target": "", - "EmitPR": 1037, - "Type": "AddBuff", - "Argu": [ - "400222001" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200222002, - "Desc": "给自己加公牛之怒，每层可提升自身10%的基础防御力", - "Target": "", - "EmitPR": 1038, - "Type": "AddBuff", - "Argu": [ - "300222002", - "-1", - "Buff_Per_Def", - "1", - "100" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200222003, - "Desc": "给自己加公牛之怒，每层5%的效果抵抗，最多可叠加10层", - "Target": "", - "EmitPR": 1039, - "Type": "AddBuff", - "Argu": [ - "300222003", - "-1", - "Add_EffRe", - "1", - "50" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200225004, - "Desc": "给自己加 BUFF10层触发调用子技能效果的 子技能", - "Target": "", - "EmitPR": 1040, - "Type": "AddBuff", - "Argu": [ - "400225004", - "-1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200225005, - "Desc": "自身获得10层【公牛之怒】时将立即获得回合", - "Target": "", - "EmitPR": 1041, - "Type": "huodehuihe", - "Argu": [ - "1" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200223001, - "Desc": "若自身拥有10层【公牛之怒】，则本次伤害额外提升50%", - "Target": "", - "EmitPR": 1042, - "Type": "AddBuff", - "Argu": [ - "300223001", - "0", - "CauseDam", - "1", - "500" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200223002, - "Desc": "对敌方1个目标造成攻击力80%以及防御力120%的伤害", - "Target": "", - "EmitPR": 1043, - "Type": "AtkDefDam", - "Argu": [ - "800", - "1000" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [ - "shanghai" - ] - }, - { - "Id": 200223003, - "Desc": "并【挑衅】1名敌人2回合", - "Target": "", - "EmitPR": 1044, - "Type": "AddBuff", - "Argu": [ - "400223003", - "2" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200223004, - "Desc": "驱散公牛之怒", - "Target": "", - "EmitPR": 1045, - "Type": "qushanbiaoqian", - "Argu": [ - "gongniuzhinu" - ], - "AddEffect": false, - "FollowSK": [], - "FailFollowSK": [], - "MustHit": false, - "Tags": [] - }, - { - "Id": 200223005, - "Desc": "每层【公牛之怒】效果为自身回复5%的最大生命值。", - "Target": "", - "EmitPR": 1046, - "Type": "canshuhuifubaifenbishengming", - "Argu": [ - "50" + "DoVal=1,ProSou1=0,Pro1=Total_Atk,ProPar1=800," ], "AddEffect": false, "FollowSK": [], diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index 2db0d7810..eacb3d6ca 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -1,147 +1,144 @@ [ { - "Id": 100012000, - "Name": "雷神之怒", - "Type": 2, - "Desc": "每回合结束后，会进入【引雷】状态，持续1回合，在自身新回合开始时，对敌方全体造成防御力110%的伤害。【引雷】期间自身每次收到攻击时都会获得1层【雷之庇佑】，但出于不可行动状态时解除【引雷】状态。", - "MaxLV": 5, + "Id": 100011000, + "Name": "", + "Type": 1, + "Desc": "对敌方1个目标造成攻击力80%", + "MaxLV": 6, "CD": [ 4, 4, 4, 4, - 3 + 4, + 4 ], "Target": 1, "ChildSkill": [ { "Id": [ - 20001210 + 200011101 ] }, { "Id": [ - 200012201 + 200011101 ] }, { "Id": [ - 200012301, - 200015101 + 200011101 ] }, { "Id": [ - 200012401, - 200015101 + 200011101 ] }, { "Id": [ - 200012501 + 200011101 + ] + }, + { + "Id": [ + 200011101 ] } ] }, { - "Id": 100015000, - "Name": "雷神之怒", - "Type": 2, - "Desc": "每回合结束后，会进入【引雷】状态，持续1回合，在自身新回合开始时，对敌方全体造成防御力110%的伤害。【引雷】期间自身每次收到攻击时都会获得1层【雷之庇佑】，但出于不可行动状态时解除【引雷】状态。自身的任意主动技能命中敌人触发暴击时降低此技能1回合冷却（技能无论触发多少次暴击都只执行1次，也就是被动每回合只执行1次）", - "MaxLV": 5, + "Id": 100012000, + "Name": "", + "Type": 1, + "Desc": "对敌方全体造成攻击力80%以及防御力120%的伤害", + "MaxLV": 6, "CD": [ 4, 4, 4, 4, - 3 + 4, + 4 ], "Target": 2, "ChildSkill": [ { "Id": [ - 200012101, - 200015101 + 200012101 ] }, { "Id": [ - 200012201, - 200015101 + 200012101 ] }, { "Id": [ - 200012301, - 200015101 + 200012101 ] }, { "Id": [ - 200012401, - 200015101 + 200012101 ] }, { "Id": [ - 200012501, - 200015101 + 200012101 + ] + }, + { + "Id": [ + 200012101 ] } ] }, { - "Id": 100222000, - "Name": "蓄势待发", - "Type": 2, - "Desc": "每次受到攻击时，自身获得1层【公牛之怒】，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。", - "MaxLV": 1, - "CD": [], - "Target": 3, - "ChildSkill": [ - { - "Id": [ - 200222001 - ] - } - ] - }, - { - "Id": 100225000, - "Name": "蓄势待发", - "Type": 2, - "Desc": "每次受到攻击时，自身获得1层【公牛之怒】，每层可提升自身10%的基础防御力和5%的效果抵抗，最多可叠加10层。自身获得10层【公牛之怒】时将立即获得回合", - "MaxLV": 1, - "CD": [], - "Target": 4, - "ChildSkill": [ - { - "Id": [ - 200222001, - 200225004 - ] - } - ] - }, - { - "Id": 100223000, - "Name": "烈阳暴吼", + "Id": 100013000, + "Name": "", "Type": 1, - "Desc": "对敌方1个目标造成攻击力80%以及防御力120%的伤害，并【挑衅】1名敌人2回合。若自身拥有10层【公牛之怒】，则本次伤害额外提升50%。随后消耗全部【公牛之怒】效果，每层【公牛之怒】效果为自身回复5%的最大生命值。", + "Desc": "对全体攻击小于自身的目标造成攻击力80%的伤害", "MaxLV": 6, "CD": [ - 5, - 5, - 5, - 5, - 5, + 4, + 4, + 4, + 4, + 4, 4 ], - "Target": 5, + "Target": 2, "ChildSkill": [ { "Id": [ - 200223001 + 200013101 + ] + }, + { + "Id": [ + 200013101 + ] + }, + { + "Id": [ + 200013101 + ] + }, + { + "Id": [ + 200013101 + ] + }, + { + "Id": [ + 200013101 + ] + }, + { + "Id": [ + 200013101 ] } ] diff --git a/bin/json/game_skillbuff.json b/bin/json/game_skillbuff.json index 95c5fa7f7..0637a088a 100644 --- a/bin/json/game_skillbuff.json +++ b/bin/json/game_skillbuff.json @@ -1,88 +1 @@ -[ - { - "Id": 300012106, - "Type": "ModifyAttribute1", - "Name": "雷之庇佑", - "Desc": "每次受到攻击提升20%的防御，最多叠加5层", - "Tags": [ - "yinlei" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300012206, - "Type": "ModifyAttribute1", - "Name": "雷之庇佑", - "Desc": "每次受到攻击提升20%的防御，最多叠加5层", - "Tags": [ - "yinlei" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300012306, - "Type": "ModifyAttribute1", - "Name": "雷之庇佑", - "Desc": "每次受到攻击提升20%的防御，最多叠加5层", - "Tags": [ - "yinlei" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300012406, - "Type": "ModifyAttribute1", - "Name": "雷之庇佑", - "Desc": "每次受到攻击提升20%的防御，最多叠加5层", - "Tags": [ - "yinlei" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300012506, - "Type": "ModifyAttribute1", - "Name": "雷之庇佑", - "Desc": "每次受到攻击提升20%的防御，最多叠加5层", - "Tags": [ - "yinlei" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300222002, - "Type": "ModifyAttribute1", - "Name": "公牛之怒", - "Desc": "给自己加公牛之怒，每层可提升自身10%的基础防御力", - "Tags": [ - "gongniuzhinu" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300222003, - "Type": "ModifyAttribute1", - "Name": "公牛之怒", - "Desc": "给自己加公牛之怒，每层5%的效果抵抗，最多可叠加10层", - "Tags": [ - "gongniuzhinu" - ], - "OverlayTimes": 5, - "SameID": false - }, - { - "Id": 300223001, - "Type": "ModifyAttribute1", - "Name": "", - "Desc": "临时的伤害额外提升50%", - "Tags": [], - "OverlayTimes": 0, - "SameID": false - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/bin/json/game_skillpassive.json b/bin/json/game_skillpassive.json index 503e25b25..0637a088a 100644 --- a/bin/json/game_skillpassive.json +++ b/bin/json/game_skillpassive.json @@ -1,307 +1 @@ -[ - { - "Id": 400012101, - "Desc": "回合结束后调用附加 引雷 的子技能", - "When": "xingdonghou", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011102", - "200011103", - "200011104" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012102, - "Desc": "引雷1 回合结束前触发 调用 打伤害 子技能", - "When": "xingdongqian", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011105" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012103, - "Desc": "引雷2 受击触发 调用 加防御 子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011106" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012104, - "Desc": "引雷3 受到不可行动标签效果触发 调用 驱散 子技能", - "When": "shoudaobukexingdong", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011107" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400012201, - "Desc": "回合结束后调用附加 引雷 的子技能", - "When": "xingdonghou", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011202", - "200011203", - "200011204" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012202, - "Desc": "引雷1 回合结束前触发 调用 打伤害 子技能", - "When": "xingdongqian", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011205" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012203, - "Desc": "引雷2 受击触发 调用 加防御 子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011206" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012204, - "Desc": "引雷3 受到不可行动标签效果触发 调用 驱散 子技能", - "When": "shoudaobukexingdong", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011207" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400012301, - "Desc": "回合结束后调用附加 引雷 的子技能", - "When": "xingdonghou", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011302", - "200011303", - "200011304" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012302, - "Desc": "引雷1 回合结束前触发 调用 打伤害 子技能", - "When": "xingdongqian", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011305" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012303, - "Desc": "引雷2 受击触发 调用 加防御 子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011306" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012304, - "Desc": "引雷3 受到不可行动标签效果触发 调用 驱散 子技能", - "When": "shoudaobukexingdong", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011307" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400012401, - "Desc": "回合结束后调用附加 引雷 的子技能", - "When": "xingdonghou", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011402", - "200011403", - "200011404" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012402, - "Desc": "引雷1 回合结束前触发 调用 打伤害 子技能", - "When": "xingdongqian", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011405" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012403, - "Desc": "引雷2 受击触发 调用 加防御 子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011406" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012404, - "Desc": "引雷3 受到不可行动标签效果触发 调用 驱散 子技能", - "When": "shoudaobukexingdong", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011407" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400012501, - "Desc": "回合结束后调用附加 引雷 的子技能", - "When": "xingdonghou", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011502", - "200011503", - "200011504" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012502, - "Desc": "引雷1 回合结束前触发 调用 打伤害 子技能", - "When": "xingdongqian", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011505" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012503, - "Desc": "引雷2 受击触发 调用 加防御 子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011506" - ], - "MaxEmitTimes": 0, - "Tags": [ - "yinlei" - ] - }, - { - "Id": 400012504, - "Desc": "引雷3 受到不可行动标签效果触发 调用 驱散 子技能", - "When": "shoudaobukexingdong", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200011507" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400015101, - "Desc": "自身技能造成暴击触发 调用 减少技能CD的 子技能", - "When": "chufabaoji", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200015102" - ], - "MaxEmitTimes": 1, - "Tags": [] - }, - { - "Id": 400222001, - "Desc": "受击调用加 公牛之怒 的子技能", - "When": "shoudaoshanghai", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200222002", - "200222003" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400225004, - "Desc": "给自己加 公牛之怒 10层触发调用子技能效果", - "When": "shoudaozengyi", - "Type": "CallAfterAtkSkill", - "Argu": [ - "200225005" - ], - "MaxEmitTimes": 0, - "Tags": [] - }, - { - "Id": 400223003, - "Desc": "挑衅", - "When": "xingdongqian", - "Type": "tiaoxing", - "Argu": [], - "MaxEmitTimes": 0, - "Tags": [ - "jianyi" - ] - } -] \ No newline at end of file +[] \ No newline at end of file diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json index 391450a07..c16149869 100644 --- a/bin/json/game_ui.json +++ b/bin/json/game_ui.json @@ -428,7 +428,7 @@ "blur": 0, "package": "zhandou/zhandou", "packagename": "zhandou", - "comname": "battlereadywindow", + "comname": "battlereadywindow2", "des": "战斗布阵界面" } ] \ No newline at end of file diff --git a/comm/core.go b/comm/core.go index cfed1b7a6..9331de077 100644 --- a/comm/core.go +++ b/comm/core.go @@ -73,6 +73,14 @@ type ISC_GateRouteComp interface { RegisterRouteCheck(methodName string, comp reflect.Value, msg reflect.Type, fn reflect.Method) } +//游戏类资源类型 +const ( + AttrType = "attr" //用户属性资源 例如货币 经验 之类的 + ItemType = "item" //道具物品资源 + CardType = "card" //卡片资源 例如英雄卡,检验卡 + EquipmentType = "equi" //武器资源 +) + type Autogenerated struct { ID string `json:"ID,omitempty" bson:"_id"` UID string `json:"uid"` diff --git a/comm/imodule.go b/comm/imodule.go index 7e7ebc97a..fd29c9759 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -14,28 +14,45 @@ type ( //道具背包接口 IItems interface { //查询用户背包物品数量 - QueryUserPackItemAmount(uId string, itemid int32) (amount uint32) + QueryItemAmount(uId string, itemid int32) (amount uint32) //查询用户背包多个物品数量 - QueryUserPackItemsAmount(uId string, itemid ...int32) (result map[int32]uint32) + QueryItemsAmount(uId string, itemid ...int32) (result map[int32]uint32) ///添加单个物品到背包 (可以加物品和减物品) - AddItemToUserPack(uId string, itemid, addnum int32) (code pb.ErrorCode) + AddItem(uId string, itemid, addnum int32) (code pb.ErrorCode) ///添加多个物品到背包 (可以加物品和减物品) - AddItemsToUserPack(uId string, items map[int32]int32) (code pb.ErrorCode) + AddItems(uId string, items map[int32]int32) (code pb.ErrorCode) } //英雄 IHero interface { + //查询用户卡片数量 + QueryCardAmount(uId string, cardId int32) (amount uint32) + //添加/减少卡片 + AddCard(uId string, cardId int32, add int32) (code pb.ErrorCode) // 获取英雄 // heroId 英雄ID GetHero(heroId string) (*pb.DB_HeroData, pb.ErrorCode) // 佩戴装备 - UpdateEquipment(hero *pb.DB_HeroData, equip []*pb.DB_Equipment) pb.ErrorCode + UpdateEquipment(hero *pb.DB_HeroData, equip []*pb.DB_Equipment) (code pb.ErrorCode) } //玩家 IUser interface { + //查询用户属性值 例如 金币 经验 + QueryAttributeValue(uid string, attr string) (value int32) + //添加/减少属性值 + AddAttributeValue(uid string, attr string, add int32) (code pb.ErrorCode) //获取玩家英雄列表 //uid 玩家ID GetHeroList(uid string) []*pb.DB_HeroData } + //武器模块 + IEquipment interface { + //查询服务资源数量 db id + QueryEquipment(uid string, Id int32) (equipment pb.DB_Equipment, code pb.ErrorCode) + //查询服务资源数量 参数武器配置id + QueryEquipmentAmount(uid string, equipmentId int32) (amount uint32) + //新加武器 + AddNewEquipments(uid string, eid int, add int32) (code pb.ErrorCode) + } ) diff --git a/modules/core.go b/modules/core.go index 0e3ef535a..b6628b3d5 100644 --- a/modules/core.go +++ b/modules/core.go @@ -1,8 +1,10 @@ package modules import ( + "go_dreamfactory/comm" "go_dreamfactory/lego/core" "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" "github.com/golang/protobuf/proto" ) @@ -11,9 +13,11 @@ type ( //业务模块基类接口 定义所有业务模块都可以使用的接口 IModule interface { core.IModule - // ///向指定用户发送消息 + //向指定用户发送消息 SendMsgToUser(mainType, subType string, msg proto.Message, user *pb.Cache_UserData) (err error) - // ///向多个用户发送消息 + //向多个用户发送消息 SendMsgToUsers(mainType, subType string, msg proto.Message, user ...*pb.Cache_UserData) (err error) + //校验消耗资源 + CheckConsumeRes(uid string, res []*cfg.Game_atn) (code comm.ErrorCode) } ) diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 486195d12..78de1f481 100644 --- a/modules/equipment/api_equip.go +++ b/modules/equipment/api_equip.go @@ -12,11 +12,11 @@ func (this *Api_Comp) Equip_Check(session comm.IUserSession, req *pb.Equipment_E var ( err error errorCode pb.ErrorCode - confs []*cfg.Game_equipmentData + confs []*cfg.Game_equipData equipments []*pb.DB_Equipment hero *pb.DB_HeroData ) - confs = make([]*cfg.Game_equipmentData, len(req.EquipmentId)) + confs = make([]*cfg.Game_equipData, len(req.EquipmentId)) equipments = make([]*pb.DB_Equipment, len(req.EquipmentId)) for i, v := range req.EquipmentId { if v != "" { @@ -49,7 +49,7 @@ func (this *Api_Comp) Equip_Check(session comm.IUserSession, req *pb.Equipment_E func (this *Api_Comp) Equip(session comm.IUserSession, agrs map[string]interface{}, req *pb.Equipment_Equip_Req) (code pb.ErrorCode) { var ( err error - confs []*cfg.Game_equipmentData + confs []*cfg.Game_equipData equipment *pb.DB_Equipment equipments []*pb.DB_Equipment updatequipment []*pb.DB_Equipment @@ -60,7 +60,7 @@ func (this *Api_Comp) Equip(session comm.IUserSession, agrs map[string]interface session.SendMsg(string(this.module.GetType()), "", &pb.Equipment_Equip_Resp{}) } }() - confs = agrs["conf"].([]*cfg.Game_equipmentData) + confs = agrs["conf"].([]*cfg.Game_equipData) equipments = agrs["equipment"].([]*pb.DB_Equipment) updatequipment = make([]*pb.DB_Equipment, 0) hero = agrs["hero"].(*pb.DB_HeroData) @@ -93,7 +93,7 @@ func (this *Api_Comp) Equip(session comm.IUserSession, agrs map[string]interface } } for i, _ := range equipments { - if i != int(confs[i].Station) { + if i != int(confs[i].Pos) { log.Errorf("Equip conf:%v Target:%d Incorrect range!", confs[i], i) code = pb.ErrorCode_SystemError return diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go index 2cb1b278f..efc41fca5 100644 --- a/modules/equipment/api_upgrade.go +++ b/modules/equipment/api_upgrade.go @@ -15,7 +15,8 @@ import ( func (this *Api_Comp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment_Upgrade_Req) (result map[string]interface{}, code comm.ErrorCode) { var ( err error - conf *cfg.Game_equipmentData + conf *cfg.Game_equipData + intensify *cfg.Game_equipIntensifyData equipment *pb.DB_Equipment ) if req.EquipmentId == "" { @@ -33,13 +34,16 @@ func (this *Api_Comp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment code.Code = pb.ErrorCode_EquipmentOnFoundEquipment return } - if equipment.Lv >= conf.MaxLv { - log.Errorf("Equip_Check Lv:%v MaxLv:%v", equipment.Lv, conf.MaxLv) + //找到下一个等级的相关配置 + if intensify, err = this.module.configure_comp.GetEquipmentIntensifyConfigureById(equipment.Lv + 1); err != nil { + log.Errorf("Equip_Check err:%v", err) code.Code = pb.ErrorCode_EquipmentLvlimitReached + return } result = map[string]interface{}{ "equipment": equipment, "conf": conf, + "intensify": intensify, } return } @@ -47,35 +51,37 @@ func (this *Api_Comp) Upgrade_Check(session comm.IUserSession, req *pb.Equipment ///英雄挂在装备 func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interface{}, req *pb.Equipment_Upgrade_Req) (code pb.ErrorCode) { var ( - err error - conf *cfg.Game_equipmentData - equipment *pb.DB_Equipment - hero *pb.DB_HeroData - equipments []*pb.DB_Equipment - probability int32 - guaranteed int32 - issucc bool + err error + conf *cfg.Game_equipData + intensify *cfg.Game_equipIntensifyData + equipment *pb.DB_Equipment + hero *pb.DB_HeroData + equipments []*pb.DB_Equipment + issucc bool ) defer func() { if code == pb.ErrorCode_Success { session.SendMsg(string(this.module.GetType()), "", &pb.Equipment_Upgrade_Resp{}) } }() - conf = agrs["conf"].(*cfg.Game_equipmentData) + conf = agrs["conf"].(*cfg.Game_equipData) + intensify = agrs["intensify"].(*cfg.Game_equipIntensifyData) equipment = agrs["equipment"].(*pb.DB_Equipment) - probability = conf.UpgradeProbability[equipment.Lv] - guaranteed = conf.UpgradeGuaranteed[equipment.Lv] - if equipment.KeepFailNum >= guaranteed { //没有达到保底次数 根据概率随机成功失败 + if equipment.KeepFailNum >= intensify.Num { //没有达到保底次数 根据概率随机成功失败 issucc = true - } else { //随机 - n, _ := rand.Int(rand.Reader, big.NewInt(100)) - if int32(n.Int64()) < probability { + } else { //随机 千分比 + n, _ := rand.Int(rand.Reader, big.NewInt(1000)) + if int32(n.Int64()) < intensify.Probability { issucc = true } else { issucc = false } } if issucc { + if code = this.module.CheckConsumeRes(session.GetUserId(), intensify.Need); err != nil { + return + } + //叠加装备 拆分处理 if equipment.IsInitialState && equipment.OverlayNum > 1 { equipment.OverlayNum-- @@ -116,7 +122,7 @@ func (this *Api_Comp) Upgrade(session comm.IUserSession, agrs map[string]interfa log.Errorf("Upgrade code:%d", code) return } - hero.EquipID[conf.Station] = equipment.Id //拆分后的装备是一个新的 + hero.EquipID[conf.Pos] = equipment.Id //拆分后的装备是一个新的 for i, v := range hero.EquipID { if v != "" { if v != equipment.Id { diff --git a/modules/equipment/configure_comp.go b/modules/equipment/configure_comp.go index dc56d920c..d390aefbd 100644 --- a/modules/equipment/configure_comp.go +++ b/modules/equipment/configure_comp.go @@ -9,7 +9,10 @@ import ( ) const ( - game_equipment = "game_equipment.json" + game_equip = "game_equip.json" //装备信息表 + equip_attrlibrary = "equip_attrlibrary.json" //装备属性配置表 + equip_intensify = "equip_intensify.json" //装备等级消耗表 + equip_suit = "equip_suit.json" //装备套装表 ) ///背包配置管理组件 @@ -20,20 +23,21 @@ type Configure_Comp struct { //组件初始化接口 func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.ModuleCompBase.Init(service, module, comp, options) - this.LoadConfigure(game_equipment, cfg.NewGame_equipment) + this.LoadConfigure(game_equip, cfg.NewGame_equip) + this.LoadConfigure(equip_attrlibrary, cfg.NewGame_equipAttrlibrary) return } //获取装备配置数据 -func (this *Configure_Comp) GetEquipmentConfigure() (configure *cfg.Game_equipment, err error) { +func (this *Configure_Comp) GetEquipmentConfigure() (configure *cfg.Game_equip, err error) { var ( v interface{} ok bool ) - if v, err = this.GetConfigure(game_equipment); err != nil { + if v, err = this.GetConfigure(game_equip); err != nil { return } else { - if configure, ok = v.(*cfg.Game_equipment); !ok { + if configure, ok = v.(*cfg.Game_equip); !ok { err = fmt.Errorf("%T no is *cfg.Game_equipment", v) return } @@ -42,18 +46,87 @@ func (this *Configure_Comp) GetEquipmentConfigure() (configure *cfg.Game_equipme } //获取装备配置数据 -func (this *Configure_Comp) GetEquipmentConfigureById(equipmentId int32) (configure *cfg.Game_equipmentData, err error) { +func (this *Configure_Comp) GetEquipmentConfigureById(equipmentId int32) (configure *cfg.Game_equipData, err error) { var ( v interface{} ok bool ) - if v, err = this.GetConfigure(game_equipment); err != nil { + if v, err = this.GetConfigure(game_equip); err != nil { return } else { - if configure, ok = v.(*cfg.Game_equipment).GetDataMap()[equipmentId]; !ok { + if configure, ok = v.(*cfg.Game_equip).GetDataMap()[equipmentId]; !ok { err = fmt.Errorf("EquipmentConfigure not found:%d ", equipmentId) return } } return } + +//获取装备属性表 +func (this *Configure_Comp) GetEquipmentAttrlibraryConfigure() (configure *cfg.Game_equipAttrlibrary, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(equip_attrlibrary); err != nil { + return + } else { + if configure, ok = v.(*cfg.Game_equipAttrlibrary); !ok { + err = fmt.Errorf("%T no is *cfg.Game_equipment", v) + return + } + } + return +} + +//获取属性词列表 +func (this *Configure_Comp) GetEquipmentAttrlibraryConfigureById(Id int32) (configure []*cfg.Game_equipAttrlibraryData, err error) { + var ( + v interface{} + ) + if v, err = this.GetConfigure(equip_attrlibrary); err != nil { + return + } else { + configure = make([]*cfg.Game_equipAttrlibraryData, 0) + for _, v1 := range v.(*cfg.Game_equipAttrlibrary).GetDataList() { + if v1.Libraryid == Id { + configure = append(configure, v1) + } + } + } + return +} + +//获取装备属性表 +func (this *Configure_Comp) GetEquipmentIntensifyConfigure() (configure *cfg.Game_equipIntensify, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(equip_intensify); err != nil { + return + } else { + if configure, ok = v.(*cfg.Game_equipIntensify); !ok { + err = fmt.Errorf("%T no is *cfg.Game_equipment", v) + return + } + } + return +} + +//获取属性词列表 +func (this *Configure_Comp) GetEquipmentIntensifyConfigureById(Id int32) (configure *cfg.Game_equipIntensifyData, err error) { + var ( + v interface{} + ok bool + ) + if v, err = this.GetConfigure(equip_intensify); err != nil { + return + } else { + if configure, ok = v.(*cfg.Game_equipIntensify).GetDataMap()[Id]; !ok { + err = fmt.Errorf("EquipmentConfigure not found:%d ", Id) + return + } + } + return +} diff --git a/modules/equipment/model_equipment_comp.go b/modules/equipment/model_equipment_comp.go index 14acc98a3..b85237731 100644 --- a/modules/equipment/model_equipment_comp.go +++ b/modules/equipment/model_equipment_comp.go @@ -47,7 +47,7 @@ func (this *Model_Equipment_Comp) Equipment_QueryUserEquipmentsPack(uId string) //添加装备 func (this *Model_Equipment_Comp) Equipment_AddEquipmentsToPack(uId string, cIds map[int32]uint32) (err error) { var ( - configure *cfg.Game_equipment + configure *cfg.Game_equip equipments []*pb.DB_Equipment iskeep bool add map[string]*pb.DB_Equipment diff --git a/modules/forum/configure_comp.go b/modules/forum/configure_comp.go index 811381c69..03090d3b2 100644 --- a/modules/forum/configure_comp.go +++ b/modules/forum/configure_comp.go @@ -1,9 +1,7 @@ package forum import ( - "fmt" "go_dreamfactory/modules" - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/lego/core" ) @@ -20,23 +18,6 @@ type Configure_Comp struct { //组件初始化接口 func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.ModuleCompBase.Init(service, module, comp, options) - this.LoadConfigure(game_equipment, cfg.NewGame_equipment) - return -} -//获取装备配置数据 -func (this *Configure_Comp) GetEquipmentConfigure() (configure *cfg.Game_equipment, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_equipment); err != nil { - return - } else { - if configure, ok = v.(*cfg.Game_equipment); !ok { - err = fmt.Errorf("%T no is *cfg.Game_equipment", v) - return - } - } return } diff --git a/modules/game/configure_comp.go b/modules/game/configure_comp.go index ef8da7ee6..ffe336450 100644 --- a/modules/game/configure_comp.go +++ b/modules/game/configure_comp.go @@ -1,9 +1,7 @@ package game import ( - "fmt" "go_dreamfactory/modules" - cfg "go_dreamfactory/sys/configure/structs" "go_dreamfactory/lego/core" ) @@ -20,23 +18,6 @@ type Configure_Comp struct { //组件初始化接口 func (this *Configure_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.ModuleCompBase.Init(service, module, comp, options) - this.LoadConfigure(game_equipment, cfg.NewGame_equipment) - return -} -//获取装备配置数据 -func (this *Configure_Comp) GetEquipmentConfigure() (configure *cfg.Game_equipment, err error) { - var ( - v interface{} - ok bool - ) - if v, err = this.GetConfigure(game_equipment); err != nil { - return - } else { - if configure, ok = v.(*cfg.Game_equipment); !ok { - err = fmt.Errorf("%T no is *cfg.Game_equipment", v) - return - } - } return } diff --git a/modules/items/model_pack_comp.go b/modules/items/model_pack_comp.go index 53a66c4b2..982f8170e 100644 --- a/modules/items/model_pack_comp.go +++ b/modules/items/model_pack_comp.go @@ -21,7 +21,7 @@ type Model_Pack_Comp struct { func (this *Model_Pack_Comp) Init(service core.IService, module core.IModule, comp core.IModuleComp, opt core.IModuleOptions) (err error) { this.Model_Comp.Init(service, module, comp, opt) this.module = module.(*Items) - this.TableName = "pack" + this.TableName = "items" //创建uid索引 this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, diff --git a/modules/items/module.go b/modules/items/module.go index 52630e4ae..46800627f 100644 --- a/modules/items/module.go +++ b/modules/items/module.go @@ -70,9 +70,9 @@ func (this *Items) AddItemToUserPack(uId string, itemid, addnum int32) (code pb. if err = this.model_pack_comp.Pack_AddItemToUserPack(uId, itemid, addnum); err != nil { log.Errorf("给用户添加物品 uId:%s itemid:%d addnum:%d err:%v", uId, itemid, addnum, err) if err == ItemNotEnoughError { - code = pb.ErrorCode_PackNoEnough + code = pb.ErrorCode_ItemsNoEnough } else if err == PackGridNumUpper { - code = pb.ErrorCode_PackGridNumUpper + code = pb.ErrorCode_ItemsGridNumUpper } else { code = pb.ErrorCode_Unknown } @@ -87,9 +87,9 @@ func (this *Items) AddItemsToUserPack(uId string, items map[int32]int32) (code p if err = this.model_pack_comp.Pack_AddItemsToUserPack(uId, items); err != nil { log.Errorf("给用户添加物品 uId:%s items:%d err:%v", uId, items, err) if err == ItemNotEnoughError { - code = pb.ErrorCode_PackNoEnough + code = pb.ErrorCode_ItemsNoEnough } else if err == PackGridNumUpper { - code = pb.ErrorCode_PackGridNumUpper + code = pb.ErrorCode_ItemsGridNumUpper } else { code = pb.ErrorCode_Unknown } diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go index 91d27ccc2..e1a112738 100644 --- a/modules/mail/api_getAttachment.go +++ b/modules/mail/api_getAttachment.go @@ -35,7 +35,7 @@ func (this *Api_Comp) GetUserMailAttachment(session comm.IUserSession, agrs map[ for _, v := range _data { _items[int32(v.ItemId)] += int32(v.ItemCount) } - code = this.items.AddItemsToUserPack(mail.Uid, _items) + code = this.items.AddItems(mail.Uid, _items) if code == pb.ErrorCode_Success { // 修改状态 this.module.db_comp.Mail_UpdateMailAttachmentState(req.ObjID) diff --git a/modules/modulebase.go b/modules/modulebase.go index e615975cc..c69a8c8b6 100644 --- a/modules/modulebase.go +++ b/modules/modulebase.go @@ -4,12 +4,13 @@ import ( "context" "fmt" "go_dreamfactory/comm" - "go_dreamfactory/pb" - "go_dreamfactory/lego/base" "go_dreamfactory/lego/core" "go_dreamfactory/lego/core/cbase" "go_dreamfactory/lego/sys/log" + "go_dreamfactory/pb" + cfg "go_dreamfactory/sys/configure/structs" + "strconv" "github.com/golang/protobuf/proto" "github.com/golang/protobuf/ptypes" @@ -73,3 +74,86 @@ func (this *ModuleBase) SendMsgToUsers(mainType, subType string, msg proto.Messa } return } + +//校验消耗资源 +func (this *ModuleBase) CheckConsumeRes(uid string, res []*cfg.Game_atn) (code pb.ErrorCode) { + var ( + module core.IModule + err error + resID int + amount int32 + user comm.IUser //用户模块 + items comm.IItems //道具背包模块 + hero comm.IHero //英雄模块 + equipment comm.IEquipment //装备模块 + ) + if module, err = this.service.GetModule(comm.SM_UserModule); err == nil { + return + } + user = module.(comm.IUser) + if module, err = this.service.GetModule(comm.SM_UserModule); err == nil { + return + } + items = module.(comm.IItems) + if module, err = this.service.GetModule(comm.SM_UserModule); err == nil { + return + } + hero = module.(comm.IHero) + if module, err = this.service.GetModule(comm.SM_UserModule); err == nil { + return + } + equipment = module.(comm.IEquipment) + //校验消费资源是否充足 + for _, v := range res { + if v.A == comm.AttrType { //用户属性资源 + if amount = user.QueryAttributeValue(uid, v.T); amount < v.N { + code = pb.ErrorCode_ResNoEnough + return + } + } else if v.A == comm.ItemType { //道具资源 + if resID, err = strconv.Atoi(v.T); err != nil { + code = pb.ErrorCode_ConfigurationException + return + } + if amount = int32(items.QueryItemAmount(uid, int32(resID))); amount < v.N { + code = pb.ErrorCode_ResNoEnough + return + } + } else if v.A == comm.CardType { //卡片资源 + if resID, err = strconv.Atoi(v.T); err != nil { + code = pb.ErrorCode_ConfigurationException + return + } + if amount = int32(hero.QueryCardAmount(uid, int32(resID))); amount < v.N { + code = pb.ErrorCode_ResNoEnough + return + } + } else if v.A == comm.EquipmentType { + if resID, err = strconv.Atoi(v.T); err != nil { + code = pb.ErrorCode_ConfigurationException + return + } + if amount = int32(equipment.QueryEquipmentAmount(uid, int32(resID))); amount < v.N { + code = pb.ErrorCode_ResNoEnough + return + } + } + } + + for _, v := range res { + if v.A == comm.AttrType { //用户属性资源 + user.AddAttributeValue(uid, v.T, -1*v.N) + } else if v.A == comm.ItemType { //道具资源 + resID, _ = strconv.Atoi(v.T) + items.AddItem(uid, int32(resID), -1*v.N) + } else if v.A == comm.CardType { //卡片资源 + resID, _ = strconv.Atoi(v.T) + hero.AddCard(uid, int32(resID), -1*v.N) + } else if v.A == comm.EquipmentType { + resID, _ = strconv.Atoi(v.T) + equipment.AddNewEquipments(uid, resID, -1*v.N) + } + } + + return +} diff --git a/pb.bat b/pb.bat index 036938b9a..c9dbbd78c 100644 --- a/pb.bat +++ b/pb.bat @@ -11,7 +11,7 @@ protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\notify\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\user\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\friend\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\pack\*.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\items\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\mail\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\equipment\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\hero\*.proto diff --git a/pb/errorcode.pb.go b/pb/errorcode.pb.go index 11ab43e0d..1e4921219 100644 --- a/pb/errorcode.pb.go +++ b/pb/errorcode.pb.go @@ -39,6 +39,8 @@ const ( ErrorCode_SystemError ErrorCode = 22 //通用错误 ErrorCode_Exception ErrorCode = 100 //程序执行异常 ErrorCode_Unknown ErrorCode = 101 //未知错误 + ErrorCode_ResNoEnough ErrorCode = 102 //资源不足 + ErrorCode_ConfigurationException ErrorCode = 103 //配置异常 // user ErrorCode_SecKeyInvalid ErrorCode = 1000 //秘钥无效 ErrorCode_SecKey ErrorCode = 1001 //秘钥格式错误 @@ -56,11 +58,11 @@ const ( ErrorCode_FriendApplyError ErrorCode = 1109 //申请失败 ErrorCode_FriendBlackMax ErrorCode = 1110 //黑名单最大数量 ErrorCode_FriendSearchNameEmpty ErrorCode = 1111 //查询昵称为空 - // pack - ErrorCode_PackNoEnough ErrorCode = 1200 //背包物品不足 - ErrorCode_PackNoFoundGird ErrorCode = 1201 //背包未找到物品格子 - ErrorCode_PackGridNumUpper ErrorCode = 1202 //背包格子数量已达上限 - ErrorCode_PackGirdAmountUpper ErrorCode = 1203 //背包格子容量已达上限 + // item + ErrorCode_ItemsNoEnough ErrorCode = 1200 //背包物品不足 + ErrorCode_ItemsNoFoundGird ErrorCode = 1201 //背包未找到物品格子 + ErrorCode_ItemsGridNumUpper ErrorCode = 1202 //背包格子数量已达上限 + ErrorCode_ItemsGirdAmountUpper ErrorCode = 1203 //背包格子容量已达上限 // hero ErrorCode_HeroNoExist ErrorCode = 1300 //英雄不存在 //equipment @@ -87,6 +89,8 @@ var ( 22: "SystemError", 100: "Exception", 101: "Unknown", + 102: "ResNoEnough", + 103: "ConfigurationException", 1000: "SecKeyInvalid", 1001: "SecKey", 1002: "BindUser", @@ -102,10 +106,10 @@ var ( 1109: "FriendApplyError", 1110: "FriendBlackMax", 1111: "FriendSearchNameEmpty", - 1200: "PackNoEnough", - 1201: "PackNoFoundGird", - 1202: "PackGridNumUpper", - 1203: "PackGirdAmountUpper", + 1200: "ItemsNoEnough", + 1201: "ItemsNoFoundGird", + 1202: "ItemsGridNumUpper", + 1203: "ItemsGirdAmountUpper", 1300: "HeroNoExist", 1400: "EquipmentOnFoundEquipment", 1401: "EquipmentLvlimitReached", @@ -127,6 +131,8 @@ var ( "SystemError": 22, "Exception": 100, "Unknown": 101, + "ResNoEnough": 102, + "ConfigurationException": 103, "SecKeyInvalid": 1000, "SecKey": 1001, "BindUser": 1002, @@ -142,10 +148,10 @@ var ( "FriendApplyError": 1109, "FriendBlackMax": 1110, "FriendSearchNameEmpty": 1111, - "PackNoEnough": 1200, - "PackNoFoundGird": 1201, - "PackGridNumUpper": 1202, - "PackGirdAmountUpper": 1203, + "ItemsNoEnough": 1200, + "ItemsNoFoundGird": 1201, + "ItemsGridNumUpper": 1202, + "ItemsGirdAmountUpper": 1203, "HeroNoExist": 1300, "EquipmentOnFoundEquipment": 1400, "EquipmentLvlimitReached": 1401, @@ -183,7 +189,7 @@ var File_errorcode_proto protoreflect.FileDescriptor var file_errorcode_proto_rawDesc = []byte{ 0x0a, 0x0f, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x63, 0x6f, 0x64, 0x65, 0x2e, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x2a, 0xab, 0x06, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, + 0x6f, 0x2a, 0xdc, 0x06, 0x0a, 0x09, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x0b, 0x0a, 0x07, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x11, 0x0a, 0x0d, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, 0x10, 0x0a, 0x12, 0x1b, 0x0a, 0x17, 0x4e, 0x6f, 0x46, 0x69, 0x6e, 0x64, 0x53, 0x65, 0x72, 0x76, 0x69, 0x63, 0x65, @@ -203,38 +209,41 @@ var file_errorcode_proto_rawDesc = []byte{ 0x44, 0x42, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x15, 0x12, 0x0f, 0x0a, 0x0b, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x16, 0x12, 0x0d, 0x0a, 0x09, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, 0x6e, 0x10, 0x64, 0x12, 0x0b, 0x0a, 0x07, 0x55, 0x6e, 0x6b, - 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x65, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, - 0x49, 0x6e, 0x76, 0x61, 0x6c, 0x69, 0x64, 0x10, 0xe8, 0x07, 0x12, 0x0b, 0x0a, 0x06, 0x53, 0x65, - 0x63, 0x4b, 0x65, 0x79, 0x10, 0xe9, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x42, 0x69, 0x6e, 0x64, 0x55, - 0x73, 0x65, 0x72, 0x10, 0xea, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, - 0x4e, 0x6f, 0x74, 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, - 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, - 0x0a, 0x0f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, - 0x78, 0x10, 0xce, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, - 0x6c, 0x66, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, - 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, - 0x61, 0x10, 0xd0, 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, - 0x74, 0x10, 0xd1, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, - 0x70, 0x6c, 0x79, 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, - 0xd3, 0x08, 0x12, 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, - 0x65, 0x74, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, - 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, - 0x72, 0x10, 0xd5, 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, - 0x61, 0x63, 0x6b, 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, - 0x65, 0x6e, 0x64, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, - 0x74, 0x79, 0x10, 0xd7, 0x08, 0x12, 0x11, 0x0a, 0x0c, 0x50, 0x61, 0x63, 0x6b, 0x4e, 0x6f, 0x45, - 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x14, 0x0a, 0x0f, 0x50, 0x61, 0x63, 0x6b, - 0x4e, 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x15, - 0x0a, 0x10, 0x50, 0x61, 0x63, 0x6b, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, - 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x18, 0x0a, 0x13, 0x50, 0x61, 0x63, 0x6b, 0x47, 0x69, 0x72, - 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, 0x12, - 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, 0x94, - 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x6e, - 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, 0xf8, - 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, 0x76, - 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, 0x42, - 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x6f, 0x77, 0x6e, 0x10, 0x65, 0x12, 0x0f, 0x0a, 0x0b, 0x52, 0x65, 0x73, 0x4e, 0x6f, 0x45, + 0x6e, 0x6f, 0x75, 0x67, 0x68, 0x10, 0x66, 0x12, 0x1a, 0x0a, 0x16, 0x43, 0x6f, 0x6e, 0x66, 0x69, + 0x67, 0x75, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x45, 0x78, 0x63, 0x65, 0x70, 0x74, 0x69, 0x6f, + 0x6e, 0x10, 0x67, 0x12, 0x12, 0x0a, 0x0d, 0x53, 0x65, 0x63, 0x4b, 0x65, 0x79, 0x49, 0x6e, 0x76, + 0x61, 0x6c, 0x69, 0x64, 0x10, 0xe8, 0x07, 0x12, 0x0b, 0x0a, 0x06, 0x53, 0x65, 0x63, 0x4b, 0x65, + 0x79, 0x10, 0xe9, 0x07, 0x12, 0x0d, 0x0a, 0x08, 0x42, 0x69, 0x6e, 0x64, 0x55, 0x73, 0x65, 0x72, + 0x10, 0xea, 0x07, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x4e, 0x6f, 0x74, + 0x53, 0x65, 0x6c, 0x66, 0x10, 0xcc, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x46, 0x72, 0x69, 0x65, 0x6e, + 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4d, 0x61, 0x78, 0x10, 0xcd, 0x08, 0x12, 0x14, 0x0a, 0x0f, 0x46, + 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4d, 0x61, 0x78, 0x10, 0xce, + 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x53, 0x65, 0x6c, 0x66, 0x4e, + 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xcf, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, + 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x4e, 0x6f, 0x44, 0x61, 0x74, 0x61, 0x10, 0xd0, + 0x08, 0x12, 0x0e, 0x0a, 0x09, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x59, 0x65, 0x74, 0x10, 0xd1, + 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, + 0x59, 0x65, 0x74, 0x10, 0xd2, 0x08, 0x12, 0x17, 0x0a, 0x12, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x53, 0x65, 0x6c, 0x66, 0x42, 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd3, 0x08, 0x12, + 0x19, 0x0a, 0x14, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x42, + 0x6c, 0x61, 0x63, 0x6b, 0x59, 0x65, 0x74, 0x10, 0xd4, 0x08, 0x12, 0x15, 0x0a, 0x10, 0x46, 0x72, + 0x69, 0x65, 0x6e, 0x64, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0xd5, + 0x08, 0x12, 0x13, 0x0a, 0x0e, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x42, 0x6c, 0x61, 0x63, 0x6b, + 0x4d, 0x61, 0x78, 0x10, 0xd6, 0x08, 0x12, 0x1a, 0x0a, 0x15, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, + 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x10, + 0xd7, 0x08, 0x12, 0x12, 0x0a, 0x0d, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, 0x6f, 0x45, 0x6e, 0x6f, + 0x75, 0x67, 0x68, 0x10, 0xb0, 0x09, 0x12, 0x15, 0x0a, 0x10, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x4e, + 0x6f, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x47, 0x69, 0x72, 0x64, 0x10, 0xb1, 0x09, 0x12, 0x16, 0x0a, + 0x11, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x72, 0x69, 0x64, 0x4e, 0x75, 0x6d, 0x55, 0x70, 0x70, + 0x65, 0x72, 0x10, 0xb2, 0x09, 0x12, 0x19, 0x0a, 0x14, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x47, 0x69, + 0x72, 0x64, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x55, 0x70, 0x70, 0x65, 0x72, 0x10, 0xb3, 0x09, + 0x12, 0x10, 0x0a, 0x0b, 0x48, 0x65, 0x72, 0x6f, 0x4e, 0x6f, 0x45, 0x78, 0x69, 0x73, 0x74, 0x10, + 0x94, 0x0a, 0x12, 0x1e, 0x0a, 0x19, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4f, + 0x6e, 0x46, 0x6f, 0x75, 0x6e, 0x64, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x10, + 0xf8, 0x0a, 0x12, 0x1c, 0x0a, 0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x4c, + 0x76, 0x6c, 0x69, 0x6d, 0x69, 0x74, 0x52, 0x65, 0x61, 0x63, 0x68, 0x65, 0x64, 0x10, 0xf9, 0x0a, + 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/pb/items_db.pb.go b/pb/items_db.pb.go new file mode 100644 index 000000000..8882e13ad --- /dev/null +++ b/pb/items_db.pb.go @@ -0,0 +1,209 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: items/items_db.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//背包格子 +type DB_UserItemData struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GridId string `protobuf:"bytes,1,opt,name=gridId,proto3" json:"gridId" bson:"_id"` // 背包格子Id + UId string `protobuf:"bytes,2,opt,name=uId,proto3" json:"uId" bson:"uid"` // 用户id + IsEmpty bool `protobuf:"varint,3,opt,name=isEmpty,proto3" json:"isEmpty" bson:"isEmpty"` // 是否是空格子 + ItemId int32 `protobuf:"varint,4,opt,name=itemId,proto3" json:"itemId" bson:"itemId"` // 存放物品的Id + Amount uint32 `protobuf:"varint,5,opt,name=amount,proto3" json:"amount" bson:"amount"` // 存放物品的数量 + CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` // 物品获取时间 + ETime int64 `protobuf:"varint,7,opt,name=eTime,proto3" json:"eTime" bson:"eTime"` // 物品过期时间 + IsNewItem bool `protobuf:"varint,8,opt,name=isNewItem,proto3" json:"isNewItem" bson:"isNewItem"` // 是否是新的 +} + +func (x *DB_UserItemData) Reset() { + *x = DB_UserItemData{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_db_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *DB_UserItemData) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*DB_UserItemData) ProtoMessage() {} + +func (x *DB_UserItemData) ProtoReflect() protoreflect.Message { + mi := &file_items_items_db_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use DB_UserItemData.ProtoReflect.Descriptor instead. +func (*DB_UserItemData) Descriptor() ([]byte, []int) { + return file_items_items_db_proto_rawDescGZIP(), []int{0} +} + +func (x *DB_UserItemData) GetGridId() string { + if x != nil { + return x.GridId + } + return "" +} + +func (x *DB_UserItemData) GetUId() string { + if x != nil { + return x.UId + } + return "" +} + +func (x *DB_UserItemData) GetIsEmpty() bool { + if x != nil { + return x.IsEmpty + } + return false +} + +func (x *DB_UserItemData) GetItemId() int32 { + if x != nil { + return x.ItemId + } + return 0 +} + +func (x *DB_UserItemData) GetAmount() uint32 { + if x != nil { + return x.Amount + } + return 0 +} + +func (x *DB_UserItemData) GetCTime() int64 { + if x != nil { + return x.CTime + } + return 0 +} + +func (x *DB_UserItemData) GetETime() int64 { + if x != nil { + return x.ETime + } + return 0 +} + +func (x *DB_UserItemData) GetIsNewItem() bool { + if x != nil { + return x.IsNewItem + } + return false +} + +var File_items_items_db_proto protoreflect.FileDescriptor + +var file_items_items_db_proto_rawDesc = []byte{ + 0x0a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xcf, 0x01, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x55, 0x73, + 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x67, 0x72, + 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x67, 0x72, 0x69, 0x64, + 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, + 0x03, 0x75, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x08, 0x52, 0x07, 0x69, 0x73, 0x45, 0x6d, 0x70, 0x74, 0x79, 0x12, 0x16, + 0x0a, 0x06, 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, + 0x69, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x61, 0x6d, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x14, + 0x0a, 0x05, 0x63, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x63, + 0x54, 0x69, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x07, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x05, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x69, 0x73, + 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x08, 0x52, 0x09, 0x69, + 0x73, 0x4e, 0x65, 0x77, 0x49, 0x74, 0x65, 0x6d, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_items_items_db_proto_rawDescOnce sync.Once + file_items_items_db_proto_rawDescData = file_items_items_db_proto_rawDesc +) + +func file_items_items_db_proto_rawDescGZIP() []byte { + file_items_items_db_proto_rawDescOnce.Do(func() { + file_items_items_db_proto_rawDescData = protoimpl.X.CompressGZIP(file_items_items_db_proto_rawDescData) + }) + return file_items_items_db_proto_rawDescData +} + +var file_items_items_db_proto_msgTypes = make([]protoimpl.MessageInfo, 1) +var file_items_items_db_proto_goTypes = []interface{}{ + (*DB_UserItemData)(nil), // 0: DB_UserItemData +} +var file_items_items_db_proto_depIdxs = []int32{ + 0, // [0:0] is the sub-list for method output_type + 0, // [0:0] is the sub-list for method input_type + 0, // [0:0] is the sub-list for extension type_name + 0, // [0:0] is the sub-list for extension extendee + 0, // [0:0] is the sub-list for field type_name +} + +func init() { file_items_items_db_proto_init() } +func file_items_items_db_proto_init() { + if File_items_items_db_proto != nil { + return + } + if !protoimpl.UnsafeEnabled { + file_items_items_db_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*DB_UserItemData); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_items_items_db_proto_rawDesc, + NumEnums: 0, + NumMessages: 1, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_items_items_db_proto_goTypes, + DependencyIndexes: file_items_items_db_proto_depIdxs, + MessageInfos: file_items_items_db_proto_msgTypes, + }.Build() + File_items_items_db_proto = out.File + file_items_items_db_proto_rawDesc = nil + file_items_items_db_proto_goTypes = nil + file_items_items_db_proto_depIdxs = nil +} diff --git a/pb/items_msg.pb.go b/pb/items_msg.pb.go new file mode 100644 index 000000000..85ca34c2a --- /dev/null +++ b/pb/items_msg.pb.go @@ -0,0 +1,484 @@ +// Code generated by protoc-gen-go. DO NOT EDIT. +// versions: +// protoc-gen-go v1.28.0 +// protoc v3.20.0 +// source: items/items_msg.proto + +package pb + +import ( + protoreflect "google.golang.org/protobuf/reflect/protoreflect" + protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" +) + +const ( + // Verify that this generated code is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(20 - protoimpl.MinVersion) + // Verify that runtime/protoimpl is sufficiently up-to-date. + _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) +) + +//查询用户背包请求 +type Pack_Getlist_Req struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + IType int32 `protobuf:"varint,1,opt,name=IType,proto3" json:"IType"` //道具类型 +} + +func (x *Pack_Getlist_Req) Reset() { + *x = Pack_Getlist_Req{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[0] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_Getlist_Req) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_Getlist_Req) ProtoMessage() {} + +func (x *Pack_Getlist_Req) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[0] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_Getlist_Req.ProtoReflect.Descriptor instead. +func (*Pack_Getlist_Req) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{0} +} + +func (x *Pack_Getlist_Req) GetIType() int32 { + if x != nil { + return x.IType + } + return 0 +} + +//查询用户背包请求 回应 +type Pack_Getlist_Resp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + Grids []*DB_UserItemData `protobuf:"bytes,1,rep,name=Grids,proto3" json:"Grids"` //用户背包列表 +} + +func (x *Pack_Getlist_Resp) Reset() { + *x = Pack_Getlist_Resp{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[1] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_Getlist_Resp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_Getlist_Resp) ProtoMessage() {} + +func (x *Pack_Getlist_Resp) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[1] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_Getlist_Resp.ProtoReflect.Descriptor instead. +func (*Pack_Getlist_Resp) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{1} +} + +func (x *Pack_Getlist_Resp) GetGrids() []*DB_UserItemData { + if x != nil { + return x.Grids + } + return nil +} + +//使用物品请求 +type Pack_UseItem_Req struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId"` //格子Id + ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId"` //物品Id + Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量 +} + +func (x *Pack_UseItem_Req) Reset() { + *x = Pack_UseItem_Req{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_UseItem_Req) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_UseItem_Req) ProtoMessage() {} + +func (x *Pack_UseItem_Req) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_UseItem_Req.ProtoReflect.Descriptor instead. +func (*Pack_UseItem_Req) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{2} +} + +func (x *Pack_UseItem_Req) GetGridId() int32 { + if x != nil { + return x.GridId + } + return 0 +} + +func (x *Pack_UseItem_Req) GetItemId() int32 { + if x != nil { + return x.ItemId + } + return 0 +} + +func (x *Pack_UseItem_Req) GetAmount() uint32 { + if x != nil { + return x.Amount + } + return 0 +} + +//使用物品请求 回应 +type Pack_UseItem_Resp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Pack_UseItem_Resp) Reset() { + *x = Pack_UseItem_Resp{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_UseItem_Resp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_UseItem_Resp) ProtoMessage() {} + +func (x *Pack_UseItem_Resp) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_UseItem_Resp.ProtoReflect.Descriptor instead. +func (*Pack_UseItem_Resp) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{3} +} + +//出售道具请求sailitem +type Pack_SellItem_Req struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + GridId int32 `protobuf:"varint,1,opt,name=GridId,proto3" json:"GridId"` //格子Id + ItemId int32 `protobuf:"varint,2,opt,name=ItemId,proto3" json:"ItemId"` //物品Id + Amount uint32 `protobuf:"varint,3,opt,name=Amount,proto3" json:"Amount"` //使用数量 +} + +func (x *Pack_SellItem_Req) Reset() { + *x = Pack_SellItem_Req{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[4] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_SellItem_Req) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_SellItem_Req) ProtoMessage() {} + +func (x *Pack_SellItem_Req) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[4] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_SellItem_Req.ProtoReflect.Descriptor instead. +func (*Pack_SellItem_Req) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{4} +} + +func (x *Pack_SellItem_Req) GetGridId() int32 { + if x != nil { + return x.GridId + } + return 0 +} + +func (x *Pack_SellItem_Req) GetItemId() int32 { + if x != nil { + return x.ItemId + } + return 0 +} + +func (x *Pack_SellItem_Req) GetAmount() uint32 { + if x != nil { + return x.Amount + } + return 0 +} + +//出售道具请求 回应 +type Pack_SellItem_Resp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *Pack_SellItem_Resp) Reset() { + *x = Pack_SellItem_Resp{} + if protoimpl.UnsafeEnabled { + mi := &file_items_items_msg_proto_msgTypes[5] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *Pack_SellItem_Resp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*Pack_SellItem_Resp) ProtoMessage() {} + +func (x *Pack_SellItem_Resp) ProtoReflect() protoreflect.Message { + mi := &file_items_items_msg_proto_msgTypes[5] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use Pack_SellItem_Resp.ProtoReflect.Descriptor instead. +func (*Pack_SellItem_Resp) Descriptor() ([]byte, []int) { + return file_items_items_msg_proto_rawDescGZIP(), []int{5} +} + +var File_items_items_msg_proto protoreflect.FileDescriptor + +var file_items_items_msg_proto_rawDesc = []byte{ + 0x0a, 0x15, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x6d, 0x73, + 0x67, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x1a, 0x14, 0x69, 0x74, 0x65, 0x6d, 0x73, 0x2f, 0x69, + 0x74, 0x65, 0x6d, 0x73, 0x5f, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x28, 0x0a, + 0x10, 0x50, 0x61, 0x63, 0x6b, 0x5f, 0x47, 0x65, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, + 0x71, 0x12, 0x14, 0x0a, 0x05, 0x49, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x05, 0x49, 0x54, 0x79, 0x70, 0x65, 0x22, 0x3b, 0x0a, 0x11, 0x50, 0x61, 0x63, 0x6b, 0x5f, + 0x47, 0x65, 0x74, 0x6c, 0x69, 0x73, 0x74, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x12, 0x26, 0x0a, 0x05, + 0x47, 0x72, 0x69, 0x64, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x44, 0x42, + 0x5f, 0x55, 0x73, 0x65, 0x72, 0x49, 0x74, 0x65, 0x6d, 0x44, 0x61, 0x74, 0x61, 0x52, 0x05, 0x47, + 0x72, 0x69, 0x64, 0x73, 0x22, 0x5a, 0x0a, 0x10, 0x50, 0x61, 0x63, 0x6b, 0x5f, 0x55, 0x73, 0x65, + 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, 0x69, 0x64, + 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, 0x49, 0x64, + 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, + 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, 0x6e, 0x74, + 0x22, 0x13, 0x0a, 0x11, 0x50, 0x61, 0x63, 0x6b, 0x5f, 0x55, 0x73, 0x65, 0x49, 0x74, 0x65, 0x6d, + 0x5f, 0x52, 0x65, 0x73, 0x70, 0x22, 0x5b, 0x0a, 0x11, 0x50, 0x61, 0x63, 0x6b, 0x5f, 0x53, 0x65, + 0x6c, 0x6c, 0x49, 0x74, 0x65, 0x6d, 0x5f, 0x52, 0x65, 0x71, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x72, + 0x69, 0x64, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x72, 0x69, 0x64, + 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, + 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x6d, + 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x41, 0x6d, 0x6f, 0x75, + 0x6e, 0x74, 0x22, 0x14, 0x0a, 0x12, 0x50, 0x61, 0x63, 0x6b, 0x5f, 0x53, 0x65, 0x6c, 0x6c, 0x49, + 0x74, 0x65, 0x6d, 0x5f, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, +} + +var ( + file_items_items_msg_proto_rawDescOnce sync.Once + file_items_items_msg_proto_rawDescData = file_items_items_msg_proto_rawDesc +) + +func file_items_items_msg_proto_rawDescGZIP() []byte { + file_items_items_msg_proto_rawDescOnce.Do(func() { + file_items_items_msg_proto_rawDescData = protoimpl.X.CompressGZIP(file_items_items_msg_proto_rawDescData) + }) + return file_items_items_msg_proto_rawDescData +} + +var file_items_items_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 6) +var file_items_items_msg_proto_goTypes = []interface{}{ + (*Pack_Getlist_Req)(nil), // 0: Pack_Getlist_Req + (*Pack_Getlist_Resp)(nil), // 1: Pack_Getlist_Resp + (*Pack_UseItem_Req)(nil), // 2: Pack_UseItem_Req + (*Pack_UseItem_Resp)(nil), // 3: Pack_UseItem_Resp + (*Pack_SellItem_Req)(nil), // 4: Pack_SellItem_Req + (*Pack_SellItem_Resp)(nil), // 5: Pack_SellItem_Resp + (*DB_UserItemData)(nil), // 6: DB_UserItemData +} +var file_items_items_msg_proto_depIdxs = []int32{ + 6, // 0: Pack_Getlist_Resp.Grids:type_name -> DB_UserItemData + 1, // [1:1] is the sub-list for method output_type + 1, // [1:1] is the sub-list for method input_type + 1, // [1:1] is the sub-list for extension type_name + 1, // [1:1] is the sub-list for extension extendee + 0, // [0:1] is the sub-list for field type_name +} + +func init() { file_items_items_msg_proto_init() } +func file_items_items_msg_proto_init() { + if File_items_items_msg_proto != nil { + return + } + file_items_items_db_proto_init() + if !protoimpl.UnsafeEnabled { + file_items_items_msg_proto_msgTypes[0].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_Getlist_Req); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_items_items_msg_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_Getlist_Resp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_items_items_msg_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_UseItem_Req); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_items_items_msg_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_UseItem_Resp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_items_items_msg_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_SellItem_Req); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_items_items_msg_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*Pack_SellItem_Resp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + } + type x struct{} + out := protoimpl.TypeBuilder{ + File: protoimpl.DescBuilder{ + GoPackagePath: reflect.TypeOf(x{}).PkgPath(), + RawDescriptor: file_items_items_msg_proto_rawDesc, + NumEnums: 0, + NumMessages: 6, + NumExtensions: 0, + NumServices: 0, + }, + GoTypes: file_items_items_msg_proto_goTypes, + DependencyIndexes: file_items_items_msg_proto_depIdxs, + MessageInfos: file_items_items_msg_proto_msgTypes, + }.Build() + File_items_items_msg_proto = out.File + file_items_items_msg_proto_rawDesc = nil + file_items_items_msg_proto_goTypes = nil + file_items_items_msg_proto_depIdxs = nil +} diff --git a/pb/proto/errorcode.proto b/pb/proto/errorcode.proto index 730c67362..d98406364 100644 --- a/pb/proto/errorcode.proto +++ b/pb/proto/errorcode.proto @@ -18,7 +18,9 @@ enum ErrorCode { SystemError = 22; //通用错误 Exception = 100; //程序执行异常 Unknown = 101; //未知错误 - + ResNoEnough = 102; //资源不足 + ConfigurationException = 103; //配置异常 + // user SecKeyInvalid = 1000; //秘钥无效 SecKey = 1001; //秘钥格式错误 @@ -38,11 +40,11 @@ enum ErrorCode { FriendBlackMax = 1110; //黑名单最大数量 FriendSearchNameEmpty = 1111; //查询昵称为空 - // pack - PackNoEnough = 1200; //背包物品不足 - PackNoFoundGird = 1201; //背包未找到物品格子 - PackGridNumUpper = 1202; //背包格子数量已达上限 - PackGirdAmountUpper = 1203; //背包格子容量已达上限 + // item + ItemsNoEnough = 1200; //背包物品不足 + ItemsNoFoundGird = 1201; //背包未找到物品格子 + ItemsGridNumUpper = 1202; //背包格子数量已达上限 + ItemsGirdAmountUpper = 1203; //背包格子容量已达上限 // hero HeroNoExist = 1300; //英雄不存在 diff --git a/pb/proto/pack/pack_db.proto b/pb/proto/items/items_db.proto similarity index 100% rename from pb/proto/pack/pack_db.proto rename to pb/proto/items/items_db.proto diff --git a/pb/proto/pack/pack_msg.proto b/pb/proto/items/items_msg.proto similarity index 96% rename from pb/proto/pack/pack_msg.proto rename to pb/proto/items/items_msg.proto index 8f5ce51e2..30c089798 100644 --- a/pb/proto/pack/pack_msg.proto +++ b/pb/proto/items/items_msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; -import "pack/pack_db.proto"; +import "items/items_db.proto"; //查询用户背包请求 message Pack_Getlist_Req { diff --git a/sys/configure/structs/game.atn.go b/sys/configure/structs/game.atn.go index 67a89b5b5..d8352cb10 100644 --- a/sys/configure/structs/game.atn.go +++ b/sys/configure/structs/game.atn.go @@ -1,4 +1,3 @@ - //------------------------------------------------------------------------------ // // This code was generated by a tool. @@ -11,19 +10,39 @@ package cfg import "errors" type Game_atn struct { - A string - T string - N int32 + A string + T string + N int32 } func (Game_atn) GetTypeId() int { - return -1770297697 + return -1770297697 } func NewGame_atn(_buf map[string]interface{}) (_v *Game_atn, err error) { - _v = &Game_atn{} - { var _ok_ bool; if _v.A, _ok_ = _buf["a"].(string); !_ok_ { err = errors.New("a error"); return } } - { var _ok_ bool; if _v.T, _ok_ = _buf["t"].(string); !_ok_ { err = errors.New("t error"); return } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) } - return + _v = &Game_atn{} + { + var _ok_ bool + if _v.A, _ok_ = _buf["a"].(string); !_ok_ { + err = errors.New("a error") + return + } + } + { + var _ok_ bool + if _v.T, _ok_ = _buf["t"].(string); !_ok_ { + err = errors.New("t error") + return + } + } + { + var _ok_ bool + var _tempNum_ float64 + if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { + err = errors.New("n error") + return + } + _v.N = int32(_tempNum_) + } + return } diff --git a/sys/configure/structs/game.equipment.go b/sys/configure/structs/game.equipment.go deleted file mode 100644 index 282726c97..000000000 --- a/sys/configure/structs/game.equipment.go +++ /dev/null @@ -1,39 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ -package cfg - -type Game_equipment struct { - _dataMap map[int32]*Game_equipmentData - _dataList []*Game_equipmentData -} - -func NewGame_equipment(_buf []map[string]interface{}) (*Game_equipment, error) { - _dataList := make([]*Game_equipmentData, 0, len(_buf)) - dataMap := make(map[int32]*Game_equipmentData) - for _, _ele_ := range _buf { - if _v, err2 := NewGame_equipmentData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &Game_equipment{_dataList: _dataList, _dataMap: dataMap}, nil -} - -func (table *Game_equipment) GetDataMap() map[int32]*Game_equipmentData { - return table._dataMap -} - -func (table *Game_equipment) GetDataList() []*Game_equipmentData { - return table._dataList -} - -func (table *Game_equipment) Get(key int32) *Game_equipmentData { - return table._dataMap[key] -} diff --git a/sys/configure/structs/game.equipmentData.go b/sys/configure/structs/game.equipmentData.go deleted file mode 100644 index 24fe7d7ba..000000000 --- a/sys/configure/structs/game.equipmentData.go +++ /dev/null @@ -1,73 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ -package cfg - -import "errors" - -type Game_equipmentData struct { - Id int32 - Name string - Star int32 - Quality int32 - Station int32 - MaxLv int32 - UpgradeProbability []int32 - UpgradeGuaranteed []int32 -} - -func (Game_equipmentData) GetTypeId() int { - return 859081052 -} - -func NewGame_equipmentData(_buf map[string]interface{}) (_v *Game_equipmentData, err error) { - _v = &Game_equipmentData{} - { - 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 - if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { - err = errors.New("name error") - return - } - } - { - 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["quality"].(float64); !_ok_ { - err = errors.New("quality error") - return - } - _v.Quality = int32(_tempNum_) - } - { - var _ok_ bool - var _tempNum_ float64 - if _tempNum_, _ok_ = _buf["station"].(float64); !_ok_ { - err = errors.New("station error") - return - } - _v.Station = int32(_tempNum_) - } - return -}