diff --git a/bin/json/game_block.json b/bin/json/game_block.json new file mode 100644 index 000000000..3033fcfc2 --- /dev/null +++ b/bin/json/game_block.json @@ -0,0 +1,607 @@ +[ + { + "key": 1, + "color": 1, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 2, + "color": 2, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 3, + "color": 3, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 4, + "color": 4, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 5, + "color": 5, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 6, + "color": 6, + "belongto": 1, + "open": 1, + "icon": "", + "weight": 1500, + "score": 1, + "type": 0, + "value": 0 + }, + { + "key": 7, + "color": 1, + "belongto": 1, + "open": 2, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 8, + "color": 1, + "belongto": 1, + "open": 3, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 9, + "color": 2, + "belongto": 1, + "open": 4, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 10, + "color": 2, + "belongto": 1, + "open": 5, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 11, + "color": 3, + "belongto": 1, + "open": 6, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 12, + "color": 3, + "belongto": 1, + "open": 7, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 13, + "color": 4, + "belongto": 1, + "open": 8, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 14, + "color": 4, + "belongto": 1, + "open": 9, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 15, + "color": 5, + "belongto": 1, + "open": 10, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 16, + "color": 5, + "belongto": 1, + "open": 11, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 17, + "color": 6, + "belongto": 1, + "open": 12, + "icon": "", + "weight": 840, + "score": 1, + "type": 1, + "value": 0 + }, + { + "key": 18, + "color": 6, + "belongto": 1, + "open": 13, + "icon": "", + "weight": 840, + "score": 1, + "type": 2, + "value": 0 + }, + { + "key": 19, + "color": 1, + "belongto": 1, + "open": 14, + "icon": "", + "weight": 1000, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 20, + "color": 2, + "belongto": 1, + "open": 15, + "icon": "", + "weight": 1000, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 21, + "color": 3, + "belongto": 1, + "open": 16, + "icon": "", + "weight": 1500, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 22, + "color": 4, + "belongto": 1, + "open": 17, + "icon": "", + "weight": 1500, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 23, + "color": 5, + "belongto": 1, + "open": 18, + "icon": "", + "weight": 2500, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 24, + "color": 6, + "belongto": 1, + "open": 19, + "icon": "", + "weight": 2500, + "score": 1, + "type": 3, + "value": 6 + }, + { + "key": 25, + "color": 7, + "belongto": 2, + "open": 1, + "icon": "", + "weight": 1000, + "score": 3, + "type": 0, + "value": 0 + }, + { + "key": 26, + "color": 1, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 27, + "color": 2, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 28, + "color": 3, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 29, + "color": 4, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 30, + "color": 5, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 31, + "color": 6, + "belongto": 3, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 4, + "value": 9 + }, + { + "key": 32, + "color": 1, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 33, + "color": 1, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 34, + "color": 1, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 35, + "color": 1, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + }, + { + "key": 36, + "color": 2, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 37, + "color": 2, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 38, + "color": 2, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 39, + "color": 2, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + }, + { + "key": 40, + "color": 3, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 41, + "color": 3, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 42, + "color": 3, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 43, + "color": 3, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + }, + { + "key": 44, + "color": 4, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 45, + "color": 4, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 46, + "color": 4, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 47, + "color": 4, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + }, + { + "key": 48, + "color": 5, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 49, + "color": 5, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 50, + "color": 5, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 51, + "color": 5, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + }, + { + "key": 52, + "color": 6, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 5, + "value": 0 + }, + { + "key": 53, + "color": 6, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 6, + "value": 0 + }, + { + "key": 54, + "color": 6, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 7, + "value": 0 + }, + { + "key": 55, + "color": 6, + "belongto": 4, + "open": 1, + "icon": "", + "weight": 1000, + "score": 1, + "type": 8, + "value": 0 + } +] \ No newline at end of file diff --git a/bin/json/game_bukashiai.json b/bin/json/game_bukashiai.json new file mode 100644 index 000000000..655cd1742 --- /dev/null +++ b/bin/json/game_bukashiai.json @@ -0,0 +1,450 @@ +[ + { + "id": 1, + "MatchType": 1, + "QualifyingType": 1, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 60, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 2, + "MatchType": 1, + "QualifyingType": 2, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 50, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 3, + "MatchType": 1, + "QualifyingType": 3, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 40, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 4, + "MatchType": 1, + "QualifyingType": 4, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 30, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 5, + "MatchType": 1, + "QualifyingType": 5, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 6, + "MatchType": 1, + "QualifyingType": 6, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 7, + "MatchType": 1, + "QualifyingType": 7, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 8, + "MatchType": 1, + "QualifyingType": 8, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 9, + "MatchType": 2, + "QualifyingType": 1, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 60, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 10, + "MatchType": 2, + "QualifyingType": 2, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 50, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 11, + "MatchType": 2, + "QualifyingType": 3, + "BehaviorCD": 3, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 40, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 12, + "MatchType": 2, + "QualifyingType": 4, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 30, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 13, + "MatchType": 2, + "QualifyingType": 5, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 14, + "MatchType": 2, + "QualifyingType": 6, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 15, + "MatchType": 2, + "QualifyingType": 7, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + }, + { + "id": 16, + "MatchType": 2, + "QualifyingType": 8, + "BehaviorCD": 2, + "BumpWeight": 50, + "BumpCD": 4, + "BumpFailWeight": 20, + "BumpSuccessWeight": [ + 20, + 30, + 40, + 50 + ], + "HpBumpWeight": 100, + "HpBumpCD": 35, + "HpBumpFailWeight": 50, + "HpBumpSuccessWeight": 50, + "CatchQteWeight": 500, + "CatchQteCD": 30, + "CatchQteFailWeight": 10, + "CatchQteSuccessWeight": [ + 50, + 40, + 30 + ], + "EmptyWeight": 20 + } +] \ No newline at end of file diff --git a/bin/json/game_buriedcondi.json b/bin/json/game_buriedcondi.json index 62c50344e..8fc728728 100644 --- a/bin/json/game_buriedcondi.json +++ b/bin/json/game_buriedcondi.json @@ -1479,7 +1479,7 @@ "NPC": 0, "value": 1, "filter": [ - 1100105 + 1101005 ], "filter2": [ "关卡ID", @@ -2663,7 +2663,7 @@ "NPC": 0, "value": 1, "filter": [ - 1100101 + 1101001 ], "filter2": [ "关卡ID", @@ -18257,7 +18257,7 @@ "NPC": 0, "value": 1, "filter": [ - 1100105 + 1101005 ], "filter2": [ "关卡ID", @@ -21680,7 +21680,7 @@ "NPC": 10104, "value": 1, "filter": [ - 1100101 + 1101001 ], "filter2": [ "关卡ID", @@ -21710,7 +21710,7 @@ "NPC": 101014, "value": 1, "filter": [ - 1100103 + 1101003 ], "filter2": [] }, @@ -21735,7 +21735,7 @@ "NPC": 101024, "value": 1, "filter": [ - 1100107 + 1101007 ], "filter2": [] }, @@ -21760,7 +21760,7 @@ "NPC": 101034, "value": 1, "filter": [ - 1100110 + 1101010 ], "filter2": [] }, @@ -21785,7 +21785,7 @@ "NPC": 101044, "value": 1, "filter": [ - 1100112 + 1101012 ], "filter2": [] }, @@ -21810,7 +21810,7 @@ "NPC": 101054, "value": 1, "filter": [ - 1100116 + 1101016 ], "filter2": [] }, @@ -21835,7 +21835,7 @@ "NPC": 101064, "value": 1, "filter": [ - 1100117 + 1101017 ], "filter2": [] }, @@ -21860,7 +21860,7 @@ "NPC": 101074, "value": 1, "filter": [ - 1100119 + 1101019 ], "filter2": [] }, @@ -21885,7 +21885,7 @@ "NPC": 101084, "value": 1, "filter": [ - 1100120 + 1101020 ], "filter2": [] }, @@ -21910,7 +21910,7 @@ "NPC": 101094, "value": 1, "filter": [ - 1100124 + 1101024 ], "filter2": [] }, @@ -21935,7 +21935,7 @@ "NPC": 101104, "value": 1, "filter": [ - 1100127 + 1101027 ], "filter2": [] }, @@ -21960,7 +21960,7 @@ "NPC": 101114, "value": 1, "filter": [ - 1100129 + 1101029 ], "filter2": [] }, @@ -21985,7 +21985,7 @@ "NPC": 101124, "value": 1, "filter": [ - 1100131 + 1101031 ], "filter2": [] }, @@ -22010,7 +22010,7 @@ "NPC": 101134, "value": 1, "filter": [ - 1100132 + 1101032 ], "filter2": [] }, @@ -22035,7 +22035,7 @@ "NPC": 101144, "value": 1, "filter": [ - 1100133 + 1101033 ], "filter2": [] }, @@ -22565,7 +22565,7 @@ "NPC": 10254, "value": 1, "filter": [ - 1100224 + 1102024 ], "filter2": [ "关卡ID", @@ -22897,7 +22897,7 @@ "NPC": 10364, "value": 1, "filter": [ - 1100312 + 1103012 ], "filter2": [ "关卡ID", @@ -23106,7 +23106,7 @@ "NPC": 10334, "value": 1, "filter": [ - 1100413 + 1104013 ], "filter2": [ "剧情ID", @@ -29579,7 +29579,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100110 + 1101010 ], "filter2": [] }, @@ -29606,7 +29606,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100120 + 1101020 ], "filter2": [] }, @@ -29633,7 +29633,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100129 + 1101029 ], "filter2": [] }, @@ -29660,7 +29660,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100142 + 1101042 ], "filter2": [] }, @@ -29687,7 +29687,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100151 + 1101051 ], "filter2": [] }, @@ -29714,7 +29714,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100159 + 1101059 ], "filter2": [] }, @@ -29796,7 +29796,7 @@ "NPC": 0, "value": 0, "filter": [ - 1100187 + 1101087 ], "filter2": [] }, diff --git a/bin/json/game_buzkashigrade.json b/bin/json/game_buzkashigrade.json index 7e12c179c..02aa8ba0e 100644 --- a/bin/json/game_buzkashigrade.json +++ b/bin/json/game_buzkashigrade.json @@ -26,5 +26,12 @@ "value": 2, "energy": 5, "matchvalue": 2 + }, + { + "num": 5, + "distance": 30, + "value": 0, + "energy": 0, + "matchvalue": 0 } ] \ No newline at end of file diff --git a/bin/json/game_consumebox.json b/bin/json/game_consumebox.json new file mode 100644 index 000000000..206301d77 --- /dev/null +++ b/bin/json/game_consumebox.json @@ -0,0 +1,72 @@ +[ + { + "boxid": 1, + "type": 0, + "cd": 5, + "onereward": [], + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + } + }, + { + "boxid": 2, + "type": 0, + "cd": 10, + "onereward": [], + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + } + }, + { + "boxid": 3, + "type": 0, + "cd": 15, + "onereward": [], + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + } + }, + { + "boxid": 4, + "type": 0, + "cd": 20, + "onereward": [], + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + } + }, + { + "boxid": 5, + "type": 0, + "cd": 25, + "onereward": [], + "name": { + "key": "", + "text": "" + }, + "txt": { + "key": "", + "text": "" + } + } +] \ No newline at end of file diff --git a/bin/json/game_consumehero.json b/bin/json/game_consumehero.json new file mode 100644 index 000000000..5b719ea2f --- /dev/null +++ b/bin/json/game_consumehero.json @@ -0,0 +1,20 @@ +[ + { + "key": 25001, + "type": 1, + "txt": { + "key": "", + "text": "" + }, + "consume": 0 + }, + { + "key": 24006, + "type": 2, + "txt": { + "key": "", + "text": "" + }, + "consume": 1000 + } +] \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 424bb3e15..25b119672 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -858,6 +858,8 @@ "challenge_npc_story": [ 9999991 ], - "quickcard_aispeed": 400 + "quickcard_aispeed": 400, + "fastplay_interaction": 8, + "fastplay_item": "24013003" } ] \ No newline at end of file diff --git a/bin/json/game_integral.json b/bin/json/game_integral.json new file mode 100644 index 000000000..17f1acf25 --- /dev/null +++ b/bin/json/game_integral.json @@ -0,0 +1,405 @@ +[ + { + "key": 0, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 100, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 200, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 300, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 400, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 500, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 600, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 700, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 800, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 900, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1000, + "type": 1, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1100, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1200, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1300, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1400, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1500, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1600, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1700, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1800, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 1900, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2000, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2100, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2200, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2300, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2400, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2500, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2600, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2700, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2800, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 2900, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + }, + { + "key": 3000, + "type": 2, + "onereward": [], + "rewards": [], + "deductrewards": [], + "boxid": [], + "weight": [], + "name": { + "key": "", + "text": "" + } + } +] \ No newline at end of file diff --git a/bin/json/game_item.json b/bin/json/game_item.json index cda5e0f6f..f8bfa2d1f 100644 --- a/bin/json/game_item.json +++ b/bin/json/game_item.json @@ -20216,5 +20216,51 @@ }, "sale": [], "gm": 0 + }, + { + "id": "24013003", + "name": { + "key": "item_item_name_415", + "text": "扑克对决游玩次数" + }, + "usetype": 1, + "color": 2, + "bagtype": 0, + "index": 1, + "special_type": 0, + "time": 0, + "reddottype": 0, + "effects": "", + "modelName": "", + "box_id": 0, + "synthetize_num": 0, + "synthetize_deplete": [], + "synthetize_get": [], + "decompose_deplete": [], + "decompose_get": [], + "access": [], + "use_skip": 0, + "upper_limit": 0, + "img": "", + "intr": { + "key": "item_item_intr_410", + "text": "" + }, + "describe": { + "key": "item_item_describe_410", + "text": "" + }, + "dialogue": { + "key": "item_item_dialogue_408", + "text": "" + }, + "sale": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "gm": 1 } ] \ No newline at end of file diff --git a/bin/json/game_lattice.json b/bin/json/game_lattice.json new file mode 100644 index 000000000..ef9389b6a --- /dev/null +++ b/bin/json/game_lattice.json @@ -0,0 +1,50 @@ +[ + { + "key": 1, + "belongto": 5, + "regular": 1, + "place": { + "x": 4, + "y": 4 + }, + "number": [], + "reserve": 1, + "icon": "", + "type": 1, + "value": 0 + }, + { + "key": 2, + "belongto": 6, + "regular": 2, + "place": { + "x": 0, + "y": 0 + }, + "number": [ + 1, + 3 + ], + "reserve": 0, + "icon": "", + "type": 2, + "value": 1 + }, + { + "key": 3, + "belongto": 7, + "regular": 2, + "place": { + "x": 0, + "y": 0 + }, + "number": [ + 1, + 3 + ], + "reserve": 0, + "icon": "", + "type": 3, + "value": 9 + } +] \ No newline at end of file diff --git a/bin/json/game_mainstage.json b/bin/json/game_mainstage.json index 779048fc9..2561b517d 100644 --- a/bin/json/game_mainstage.json +++ b/bin/json/game_mainstage.json @@ -1,6 +1,6 @@ [ { - "id": 1100100, + "id": 1101000, "chapterid": 11001, "group_id": 100100, "previous_group_id": [], @@ -75,7 +75,7 @@ "challengeward": 0 }, { - "id": 1100101, + "id": 1101001, "chapterid": 11001, "group_id": 100101, "previous_group_id": [], @@ -188,7 +188,7 @@ "challengeward": 0 }, { - "id": 1100102, + "id": 1101002, "chapterid": 11001, "group_id": 100102, "previous_group_id": [ @@ -265,7 +265,7 @@ "challengeward": 0 }, { - "id": 1100103, + "id": 1101003, "chapterid": 11001, "group_id": 100103, "previous_group_id": [ @@ -342,7 +342,7 @@ "challengeward": 0 }, { - "id": 1100104, + "id": 1101004, "chapterid": 11001, "group_id": 100104, "previous_group_id": [ @@ -431,7 +431,7 @@ "challengeward": 0 }, { - "id": 1100105, + "id": 1101005, "chapterid": 11001, "group_id": 100105, "previous_group_id": [ @@ -546,7 +546,7 @@ "challengeward": 0 }, { - "id": 1100106, + "id": 1101006, "chapterid": 11001, "group_id": 100106, "previous_group_id": [ @@ -635,7 +635,7 @@ "challengeward": 0 }, { - "id": 1100107, + "id": 1101007, "chapterid": 11001, "group_id": 100107, "previous_group_id": [ @@ -726,7 +726,7 @@ "challengeward": 0 }, { - "id": 1100108, + "id": 1101008, "chapterid": 11001, "group_id": 100108, "previous_group_id": [ @@ -848,7 +848,7 @@ "challengeward": 0 }, { - "id": 1100109, + "id": 1101009, "chapterid": 11001, "group_id": 100109, "previous_group_id": [ @@ -925,7 +925,7 @@ "challengeward": 0 }, { - "id": 1100110, + "id": 1101010, "chapterid": 11001, "group_id": 100110, "previous_group_id": [ @@ -1014,7 +1014,7 @@ "challengeward": 0 }, { - "id": 1100111, + "id": 1101011, "chapterid": 11001, "group_id": 100111, "previous_group_id": [ @@ -1091,7 +1091,7 @@ "challengeward": 0 }, { - "id": 1100112, + "id": 1101012, "chapterid": 11001, "group_id": 100112, "previous_group_id": [ @@ -1170,7 +1170,7 @@ "challengeward": 0 }, { - "id": 1100113, + "id": 1101013, "chapterid": 11001, "group_id": 1001121, "previous_group_id": [ @@ -1287,7 +1287,7 @@ "challengeward": 0 }, { - "id": 1100114, + "id": 1101014, "chapterid": 11001, "group_id": 100113, "previous_group_id": [ @@ -1404,7 +1404,7 @@ "challengeward": 0 }, { - "id": 1100115, + "id": 1101015, "chapterid": 11001, "group_id": 100113, "previous_group_id": [ @@ -1521,7 +1521,7 @@ "challengeward": 0 }, { - "id": 1100116, + "id": 1101016, "chapterid": 11001, "group_id": 100113, "previous_group_id": [ @@ -1634,7 +1634,7 @@ "challengeward": 0 }, { - "id": 1100117, + "id": 1101017, "chapterid": 11001, "group_id": 100114, "previous_group_id": [ @@ -1711,7 +1711,7 @@ "challengeward": 0 }, { - "id": 1100118, + "id": 1101018, "chapterid": 11001, "group_id": 100115, "previous_group_id": [ @@ -1786,7 +1786,7 @@ "challengeward": 0 }, { - "id": 1100119, + "id": 1101019, "chapterid": 11001, "group_id": 100116, "previous_group_id": [ @@ -1861,7 +1861,7 @@ "challengeward": 0 }, { - "id": 1100120, + "id": 1101020, "chapterid": 11001, "group_id": 100117, "previous_group_id": [ @@ -1936,7 +1936,7 @@ "challengeward": 0 }, { - "id": 1100121, + "id": 1101021, "chapterid": 11001, "group_id": 100118, "previous_group_id": [ @@ -2015,7 +2015,7 @@ "challengeward": 0 }, { - "id": 1100122, + "id": 1101022, "chapterid": 11001, "group_id": 100119, "previous_group_id": [ @@ -2092,7 +2092,7 @@ "challengeward": 0 }, { - "id": 1100123, + "id": 1101023, "chapterid": 11001, "group_id": 100120, "previous_group_id": [ @@ -2165,7 +2165,7 @@ "challengeward": 0 }, { - "id": 1100124, + "id": 1101024, "chapterid": 11001, "group_id": 100121, "previous_group_id": [ @@ -2276,7 +2276,7 @@ "challengeward": 0 }, { - "id": 1100125, + "id": 1101025, "chapterid": 11001, "group_id": 100122, "previous_group_id": [ @@ -2353,7 +2353,7 @@ "challengeward": 0 }, { - "id": 1100126, + "id": 1101026, "chapterid": 11001, "group_id": 100123, "previous_group_id": [ @@ -2464,7 +2464,7 @@ "challengeward": 0 }, { - "id": 1100127, + "id": 1101027, "chapterid": 11001, "group_id": 100124, "previous_group_id": [ @@ -2537,7 +2537,7 @@ "challengeward": 0 }, { - "id": 1100128, + "id": 1101028, "chapterid": 11001, "group_id": 100125, "previous_group_id": [ @@ -2610,7 +2610,7 @@ "challengeward": 0 }, { - "id": 1100129, + "id": 1101029, "chapterid": 11001, "group_id": 100126, "previous_group_id": [ @@ -2723,7 +2723,7 @@ "challengeward": 0 }, { - "id": 1100130, + "id": 1101030, "chapterid": 11001, "group_id": 100127, "previous_group_id": [ @@ -2800,7 +2800,7 @@ "challengeward": 0 }, { - "id": 1100131, + "id": 1101031, "chapterid": 11001, "group_id": 100128, "previous_group_id": [ @@ -2873,7 +2873,7 @@ "challengeward": 0 }, { - "id": 1100132, + "id": 1101032, "chapterid": 11001, "group_id": 100129, "previous_group_id": [ @@ -2946,7 +2946,7 @@ "challengeward": 0 }, { - "id": 1100133, + "id": 1101033, "chapterid": 11001, "group_id": 100130, "previous_group_id": [ @@ -3019,7 +3019,7 @@ "challengeward": 0 }, { - "id": 1100134, + "id": 1101034, "chapterid": 11001, "group_id": 100131, "previous_group_id": [], @@ -3128,7 +3128,7 @@ "challengeward": 0 }, { - "id": 1100135, + "id": 1101035, "chapterid": 11001, "group_id": 100132, "previous_group_id": [ @@ -3201,7 +3201,7 @@ "challengeward": 0 }, { - "id": 1100136, + "id": 1101036, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3322,7 +3322,7 @@ "challengeward": 12001 }, { - "id": 1100137, + "id": 1101037, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3443,7 +3443,7 @@ "challengeward": 12001 }, { - "id": 1100138, + "id": 1101038, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3564,7 +3564,7 @@ "challengeward": 12001 }, { - "id": 1100139, + "id": 1101039, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3685,7 +3685,7 @@ "challengeward": 12001 }, { - "id": 1100140, + "id": 1101040, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3806,7 +3806,7 @@ "challengeward": 12001 }, { - "id": 1100141, + "id": 1101041, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -3927,7 +3927,7 @@ "challengeward": 12001 }, { - "id": 1100142, + "id": 1101042, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -4048,7 +4048,7 @@ "challengeward": 12001 }, { - "id": 1100143, + "id": 1101043, "chapterid": 11001, "group_id": 100133, "previous_group_id": [ @@ -4169,7 +4169,7 @@ "challengeward": 12001 }, { - "id": 1100144, + "id": 1101044, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4290,7 +4290,7 @@ "challengeward": 13001 }, { - "id": 1100145, + "id": 1101045, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4411,7 +4411,7 @@ "challengeward": 13001 }, { - "id": 1100146, + "id": 1101046, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4532,7 +4532,7 @@ "challengeward": 13001 }, { - "id": 1100147, + "id": 1101047, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4653,7 +4653,7 @@ "challengeward": 13001 }, { - "id": 1100148, + "id": 1101048, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4774,7 +4774,7 @@ "challengeward": 13001 }, { - "id": 1100149, + "id": 1101049, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -4895,7 +4895,7 @@ "challengeward": 13001 }, { - "id": 1100150, + "id": 1101050, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -5016,7 +5016,7 @@ "challengeward": 13001 }, { - "id": 1100151, + "id": 1101051, "chapterid": 11001, "group_id": 100134, "previous_group_id": [ @@ -5137,7 +5137,7 @@ "challengeward": 13001 }, { - "id": 1100152, + "id": 1101052, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5258,7 +5258,7 @@ "challengeward": 14001 }, { - "id": 1100153, + "id": 1101053, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5379,7 +5379,7 @@ "challengeward": 14001 }, { - "id": 1100154, + "id": 1101054, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5500,7 +5500,7 @@ "challengeward": 14001 }, { - "id": 1100155, + "id": 1101055, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5621,7 +5621,7 @@ "challengeward": 14001 }, { - "id": 1100156, + "id": 1101056, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5742,7 +5742,7 @@ "challengeward": 14001 }, { - "id": 1100157, + "id": 1101057, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5863,7 +5863,7 @@ "challengeward": 14001 }, { - "id": 1100158, + "id": 1101058, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -5984,7 +5984,7 @@ "challengeward": 14001 }, { - "id": 1100159, + "id": 1101059, "chapterid": 11001, "group_id": 100135, "previous_group_id": [ @@ -6105,7 +6105,7 @@ "challengeward": 14001 }, { - "id": 1100160, + "id": 1101060, "chapterid": 11001, "group_id": 100136, "previous_group_id": [ @@ -6181,7 +6181,7 @@ "challengeward": 0 }, { - "id": 1100161, + "id": 1101061, "chapterid": 11001, "group_id": 100137, "previous_group_id": [ @@ -6257,7 +6257,7 @@ "challengeward": 0 }, { - "id": 1100162, + "id": 1101062, "chapterid": 11001, "group_id": 100138, "previous_group_id": [ @@ -6333,7 +6333,7 @@ "challengeward": 0 }, { - "id": 1100163, + "id": 1101063, "chapterid": 11001, "group_id": 100139, "previous_group_id": [ @@ -6409,7 +6409,7 @@ "challengeward": 0 }, { - "id": 1100164, + "id": 1101064, "chapterid": 11001, "group_id": 100140, "previous_group_id": [ @@ -6485,7 +6485,7 @@ "challengeward": 0 }, { - "id": 1100165, + "id": 1101065, "chapterid": 11001, "group_id": 100141, "previous_group_id": [ @@ -6561,7 +6561,7 @@ "challengeward": 0 }, { - "id": 1100166, + "id": 1101066, "chapterid": 11001, "group_id": 100142, "previous_group_id": [ @@ -6646,7 +6646,7 @@ "challengeward": 0 }, { - "id": 1100167, + "id": 1101067, "chapterid": 11001, "group_id": 100143, "previous_group_id": [ @@ -6731,7 +6731,7 @@ "challengeward": 0 }, { - "id": 1100168, + "id": 1101068, "chapterid": 11001, "group_id": 100144, "previous_group_id": [ @@ -6816,7 +6816,7 @@ "challengeward": 0 }, { - "id": 1100169, + "id": 1101069, "chapterid": 11001, "group_id": 100145, "previous_group_id": [ @@ -6901,7 +6901,7 @@ "challengeward": 0 }, { - "id": 1100170, + "id": 1101070, "chapterid": 11001, "group_id": 100146, "previous_group_id": [ @@ -6986,7 +6986,7 @@ "challengeward": 0 }, { - "id": 1100171, + "id": 1101071, "chapterid": 11001, "group_id": 100147, "previous_group_id": [ @@ -7071,7 +7071,7 @@ "challengeward": 0 }, { - "id": 1100172, + "id": 1101072, "chapterid": 11001, "group_id": 100148, "previous_group_id": [ @@ -7156,7 +7156,7 @@ "challengeward": 0 }, { - "id": 1100173, + "id": 1101073, "chapterid": 11001, "group_id": 100149, "previous_group_id": [ @@ -7241,7 +7241,7 @@ "challengeward": 0 }, { - "id": 1100174, + "id": 1101074, "chapterid": 11001, "group_id": 100150, "previous_group_id": [ @@ -7329,7 +7329,7 @@ "challengeward": 0 }, { - "id": 1100175, + "id": 1101075, "chapterid": 11001, "group_id": 100151, "previous_group_id": [ @@ -7450,7 +7450,7 @@ "challengeward": 12001 }, { - "id": 1100176, + "id": 1101076, "chapterid": 11001, "group_id": 100152, "previous_group_id": [ @@ -7535,7 +7535,7 @@ "challengeward": 0 }, { - "id": 1100177, + "id": 1101077, "chapterid": 11001, "group_id": 100153, "previous_group_id": [ @@ -7620,7 +7620,7 @@ "challengeward": 0 }, { - "id": 1100178, + "id": 1101078, "chapterid": 11001, "group_id": 100154, "previous_group_id": [ @@ -7705,7 +7705,7 @@ "challengeward": 0 }, { - "id": 1100179, + "id": 1101079, "chapterid": 11001, "group_id": 100155, "previous_group_id": [ @@ -7816,7 +7816,7 @@ "challengeward": 12001 }, { - "id": 1100180, + "id": 1101080, "chapterid": 11001, "group_id": 100156, "previous_group_id": [ @@ -7906,7 +7906,7 @@ "challengeward": 0 }, { - "id": 1100181, + "id": 1101081, "chapterid": 11001, "group_id": 100157, "previous_group_id": [ @@ -7996,7 +7996,7 @@ "challengeward": 0 }, { - "id": 1100182, + "id": 1101082, "chapterid": 11001, "group_id": 100158, "previous_group_id": [ @@ -8086,7 +8086,7 @@ "challengeward": 0 }, { - "id": 1100183, + "id": 1101083, "chapterid": 11001, "group_id": 100159, "previous_group_id": [ @@ -8204,7 +8204,7 @@ "challengeward": 12001 }, { - "id": 1100185, + "id": 1101085, "chapterid": 11001, "group_id": 1001591, "previous_group_id": [ @@ -8283,7 +8283,7 @@ "challengeward": 0 }, { - "id": 1100186, + "id": 1101086, "chapterid": 11001, "group_id": 1001592, "previous_group_id": [ @@ -8362,7 +8362,7 @@ "challengeward": 0 }, { - "id": 1100187, + "id": 1101087, "chapterid": 11001, "group_id": 1001593, "previous_group_id": [ @@ -8441,7 +8441,7 @@ "challengeward": 0 }, { - "id": 1100188, + "id": 1101088, "chapterid": 11001, "group_id": 100160, "previous_group_id": [ @@ -8539,7 +8539,7 @@ "challengeward": 0 }, { - "id": 1100200, + "id": 1102000, "chapterid": 11002, "group_id": 100200, "previous_group_id": [ @@ -8612,7 +8612,7 @@ "challengeward": 0 }, { - "id": 1100201, + "id": 1102001, "chapterid": 11002, "group_id": 100201, "previous_group_id": [ @@ -8726,7 +8726,7 @@ "challengeward": 0 }, { - "id": 1100202, + "id": 1102002, "chapterid": 11002, "group_id": 100202, "previous_group_id": [ @@ -8842,7 +8842,7 @@ "challengeward": 0 }, { - "id": 1100203, + "id": 1102003, "chapterid": 11002, "group_id": 100203, "previous_group_id": [ @@ -8958,7 +8958,7 @@ "challengeward": 0 }, { - "id": 1100204, + "id": 1102004, "chapterid": 11002, "group_id": 100204, "previous_group_id": [ @@ -9079,7 +9079,7 @@ "challengeward": 0 }, { - "id": 1100205, + "id": 1102005, "chapterid": 11002, "group_id": 100205, "previous_group_id": [ @@ -9161,7 +9161,7 @@ "challengeward": 0 }, { - "id": 1100206, + "id": 1102006, "chapterid": 11002, "group_id": 100206, "previous_group_id": [ @@ -9277,7 +9277,7 @@ "challengeward": 0 }, { - "id": 1100207, + "id": 1102007, "chapterid": 11002, "group_id": 100207, "previous_group_id": [ @@ -9350,7 +9350,7 @@ "challengeward": 0 }, { - "id": 1100208, + "id": 1102008, "chapterid": 11002, "group_id": 100208, "previous_group_id": [ @@ -9429,7 +9429,7 @@ "challengeward": 0 }, { - "id": 1100209, + "id": 1102009, "chapterid": 11002, "group_id": 100209, "previous_group_id": [ @@ -9508,7 +9508,7 @@ "challengeward": 0 }, { - "id": 1100210, + "id": 1102010, "chapterid": 11002, "group_id": 100210, "previous_group_id": [ @@ -9587,7 +9587,7 @@ "challengeward": 0 }, { - "id": 1100211, + "id": 1102011, "chapterid": 11002, "group_id": 100211, "previous_group_id": [ @@ -9662,7 +9662,7 @@ "challengeward": 0 }, { - "id": 1100212, + "id": 1102012, "chapterid": 11002, "group_id": 100212, "previous_group_id": [ @@ -9737,7 +9737,7 @@ "challengeward": 0 }, { - "id": 1100213, + "id": 1102013, "chapterid": 11002, "group_id": 100213, "previous_group_id": [ @@ -9853,7 +9853,7 @@ "challengeward": 0 }, { - "id": 1100214, + "id": 1102014, "chapterid": 11002, "group_id": 100213, "previous_group_id": [ @@ -9969,7 +9969,7 @@ "challengeward": 0 }, { - "id": 1100215, + "id": 1102015, "chapterid": 11002, "group_id": 100213, "previous_group_id": [ @@ -10085,7 +10085,7 @@ "challengeward": 0 }, { - "id": 1100216, + "id": 1102016, "chapterid": 11002, "group_id": 100214, "previous_group_id": [ @@ -10201,7 +10201,7 @@ "challengeward": 0 }, { - "id": 1100217, + "id": 1102017, "chapterid": 11002, "group_id": 100214, "previous_group_id": [ @@ -10317,7 +10317,7 @@ "challengeward": 0 }, { - "id": 1100218, + "id": 1102018, "chapterid": 11002, "group_id": 100214, "previous_group_id": [ @@ -10431,7 +10431,7 @@ "challengeward": 0 }, { - "id": 1100219, + "id": 1102019, "chapterid": 11002, "group_id": 100215, "previous_group_id": [ @@ -10504,7 +10504,7 @@ "challengeward": 0 }, { - "id": 1100220, + "id": 1102020, "chapterid": 11002, "group_id": 100216, "previous_group_id": [ @@ -10588,7 +10588,7 @@ "challengeward": 0 }, { - "id": 1100221, + "id": 1102021, "chapterid": 11002, "group_id": 100217, "previous_group_id": [ @@ -10672,7 +10672,7 @@ "challengeward": 0 }, { - "id": 1100222, + "id": 1102022, "chapterid": 11002, "group_id": 100218, "previous_group_id": [ @@ -10746,7 +10746,7 @@ "challengeward": 0 }, { - "id": 1100223, + "id": 1102023, "chapterid": 11002, "group_id": 100219, "previous_group_id": [ @@ -10865,7 +10865,7 @@ "challengeward": 0 }, { - "id": 1100224, + "id": 1102024, "chapterid": 11002, "group_id": 100220, "previous_group_id": [ @@ -10944,7 +10944,7 @@ "challengeward": 0 }, { - "id": 1100225, + "id": 1102025, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11065,7 +11065,7 @@ "challengeward": 12001 }, { - "id": 1100226, + "id": 1102026, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11186,7 +11186,7 @@ "challengeward": 12001 }, { - "id": 1100227, + "id": 1102027, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11307,7 +11307,7 @@ "challengeward": 12001 }, { - "id": 1100228, + "id": 1102028, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11428,7 +11428,7 @@ "challengeward": 12001 }, { - "id": 1100229, + "id": 1102029, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11549,7 +11549,7 @@ "challengeward": 12001 }, { - "id": 1100230, + "id": 1102030, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11670,7 +11670,7 @@ "challengeward": 12001 }, { - "id": 1100231, + "id": 1102031, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11791,7 +11791,7 @@ "challengeward": 12001 }, { - "id": 1100232, + "id": 1102032, "chapterid": 11002, "group_id": 100221, "previous_group_id": [ @@ -11912,7 +11912,7 @@ "challengeward": 12001 }, { - "id": 1100233, + "id": 1102033, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12033,7 +12033,7 @@ "challengeward": 13001 }, { - "id": 1100234, + "id": 1102034, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12154,7 +12154,7 @@ "challengeward": 13001 }, { - "id": 1100235, + "id": 1102035, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12275,7 +12275,7 @@ "challengeward": 13001 }, { - "id": 1100236, + "id": 1102036, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12396,7 +12396,7 @@ "challengeward": 13001 }, { - "id": 1100237, + "id": 1102037, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12517,7 +12517,7 @@ "challengeward": 13001 }, { - "id": 1100238, + "id": 1102038, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12638,7 +12638,7 @@ "challengeward": 13001 }, { - "id": 1100239, + "id": 1102039, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12759,7 +12759,7 @@ "challengeward": 13001 }, { - "id": 1100240, + "id": 1102040, "chapterid": 11002, "group_id": 100222, "previous_group_id": [ @@ -12880,7 +12880,7 @@ "challengeward": 13001 }, { - "id": 1100241, + "id": 1102041, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13001,7 +13001,7 @@ "challengeward": 14001 }, { - "id": 1100242, + "id": 1102042, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13122,7 +13122,7 @@ "challengeward": 14001 }, { - "id": 1100243, + "id": 1102043, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13243,7 +13243,7 @@ "challengeward": 14001 }, { - "id": 1100244, + "id": 1102044, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13364,7 +13364,7 @@ "challengeward": 14001 }, { - "id": 1100245, + "id": 1102045, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13485,7 +13485,7 @@ "challengeward": 14001 }, { - "id": 1100246, + "id": 1102046, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13606,7 +13606,7 @@ "challengeward": 14001 }, { - "id": 1100247, + "id": 1102047, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13727,7 +13727,7 @@ "challengeward": 14001 }, { - "id": 1100248, + "id": 1102048, "chapterid": 11002, "group_id": 100223, "previous_group_id": [ @@ -13848,7 +13848,7 @@ "challengeward": 14001 }, { - "id": 1100249, + "id": 1102049, "chapterid": 11002, "group_id": 100224, "previous_group_id": [ @@ -13969,7 +13969,7 @@ "challengeward": 0 }, { - "id": 1100250, + "id": 1102050, "chapterid": 11002, "group_id": 100225, "previous_group_id": [ @@ -14048,7 +14048,7 @@ "challengeward": 0 }, { - "id": 1100251, + "id": 1102051, "chapterid": 11002, "group_id": 100226, "previous_group_id": [ @@ -14127,7 +14127,7 @@ "challengeward": 0 }, { - "id": 1100252, + "id": 1102052, "chapterid": 11002, "group_id": 100227, "previous_group_id": [ @@ -14206,7 +14206,7 @@ "challengeward": 0 }, { - "id": 1100253, + "id": 1102053, "chapterid": 11002, "group_id": 100228, "previous_group_id": [ @@ -14286,7 +14286,7 @@ "challengeward": 0 }, { - "id": 1100254, + "id": 1102054, "chapterid": 11002, "group_id": 100229, "previous_group_id": [ @@ -14365,7 +14365,7 @@ "challengeward": 0 }, { - "id": 1100255, + "id": 1102055, "chapterid": 11002, "group_id": 100230, "previous_group_id": [ @@ -14438,7 +14438,7 @@ "challengeward": 0 }, { - "id": 1100256, + "id": 1102056, "chapterid": 11002, "group_id": 100231, "previous_group_id": [ @@ -14517,7 +14517,7 @@ "challengeward": 0 }, { - "id": 1100257, + "id": 1102057, "chapterid": 11002, "group_id": 100232, "previous_group_id": [ @@ -14596,7 +14596,7 @@ "challengeward": 0 }, { - "id": 1100258, + "id": 1102058, "chapterid": 11002, "group_id": 100233, "previous_group_id": [ @@ -14669,7 +14669,7 @@ "challengeward": 0 }, { - "id": 1100259, + "id": 1102059, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -14790,7 +14790,7 @@ "challengeward": 0 }, { - "id": 1100260, + "id": 1102060, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -14911,7 +14911,7 @@ "challengeward": 0 }, { - "id": 1100261, + "id": 1102061, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -15032,7 +15032,7 @@ "challengeward": 0 }, { - "id": 1100262, + "id": 1102062, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -15153,7 +15153,7 @@ "challengeward": 0 }, { - "id": 1100263, + "id": 1102063, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -15274,7 +15274,7 @@ "challengeward": 0 }, { - "id": 1100264, + "id": 1102064, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -15395,7 +15395,7 @@ "challengeward": 0 }, { - "id": 1100265, + "id": 1102065, "chapterid": 11002, "group_id": 100234, "previous_group_id": [ @@ -15516,7 +15516,7 @@ "challengeward": 0 }, { - "id": 1100266, + "id": 1102066, "chapterid": 11002, "group_id": 100235, "previous_group_id": [ @@ -15595,7 +15595,7 @@ "challengeward": 0 }, { - "id": 1100267, + "id": 1102067, "chapterid": 11002, "group_id": 100236, "previous_group_id": [ @@ -15674,7 +15674,7 @@ "challengeward": 0 }, { - "id": 1100268, + "id": 1102068, "chapterid": 11002, "group_id": 100237, "previous_group_id": [ @@ -15753,7 +15753,7 @@ "challengeward": 0 }, { - "id": 1100269, + "id": 1102069, "chapterid": 11002, "group_id": 100238, "previous_group_id": [ @@ -15834,7 +15834,7 @@ "challengeward": 0 }, { - "id": 1100270, + "id": 1102070, "chapterid": 11002, "group_id": 100239, "previous_group_id": [ @@ -15913,7 +15913,7 @@ "challengeward": 0 }, { - "id": 1100271, + "id": 1102071, "chapterid": 11002, "group_id": 100240, "previous_group_id": [ @@ -15992,7 +15992,7 @@ "challengeward": 0 }, { - "id": 1100272, + "id": 1102072, "chapterid": 11002, "group_id": 100241, "previous_group_id": [ @@ -16071,7 +16071,7 @@ "challengeward": 0 }, { - "id": 1100273, + "id": 1102073, "chapterid": 11002, "group_id": 100242, "previous_group_id": [ @@ -16152,7 +16152,7 @@ "challengeward": 0 }, { - "id": 1100274, + "id": 1102074, "chapterid": 11002, "group_id": 100243, "previous_group_id": [ @@ -16231,7 +16231,7 @@ "challengeward": 0 }, { - "id": 1100275, + "id": 1102075, "chapterid": 11002, "group_id": 100244, "previous_group_id": [ @@ -16310,7 +16310,7 @@ "challengeward": 0 }, { - "id": 1100276, + "id": 1102076, "chapterid": 11002, "group_id": 100245, "previous_group_id": [ @@ -16389,7 +16389,7 @@ "challengeward": 0 }, { - "id": 1100277, + "id": 1102077, "chapterid": 11002, "group_id": 100246, "previous_group_id": [ @@ -16470,7 +16470,7 @@ "challengeward": 0 }, { - "id": 1100278, + "id": 1102078, "chapterid": 11002, "group_id": 100247, "previous_group_id": [ @@ -16593,7 +16593,7 @@ "challengeward": 0 }, { - "id": 1100279, + "id": 1102079, "chapterid": 11002, "group_id": 100248, "previous_group_id": [ @@ -16672,7 +16672,7 @@ "challengeward": 0 }, { - "id": 1100280, + "id": 1102080, "chapterid": 11002, "group_id": 100249, "previous_group_id": [ @@ -16751,7 +16751,7 @@ "challengeward": 0 }, { - "id": 1100281, + "id": 1102081, "chapterid": 11002, "group_id": 100250, "previous_group_id": [ @@ -16830,7 +16830,7 @@ "challengeward": 0 }, { - "id": 1100282, + "id": 1102082, "chapterid": 11002, "group_id": 100251, "previous_group_id": [ @@ -16951,7 +16951,7 @@ "challengeward": 0 }, { - "id": 1100283, + "id": 1102083, "chapterid": 11002, "group_id": 100252, "previous_group_id": [ @@ -17036,7 +17036,7 @@ "challengeward": 0 }, { - "id": 1100284, + "id": 1102084, "chapterid": 11002, "group_id": 100253, "previous_group_id": [], @@ -17119,7 +17119,7 @@ "challengeward": 0 }, { - "id": 1100300, + "id": 1103000, "chapterid": 11003, "group_id": 100300, "previous_group_id": [ @@ -17192,7 +17192,7 @@ "challengeward": 0 }, { - "id": 1100301, + "id": 1103001, "chapterid": 11003, "group_id": 100301, "previous_group_id": [ @@ -17313,7 +17313,7 @@ "challengeward": 0 }, { - "id": 1100302, + "id": 1103002, "chapterid": 11003, "group_id": 100302, "previous_group_id": [ @@ -17434,7 +17434,7 @@ "challengeward": 0 }, { - "id": 1100303, + "id": 1103003, "chapterid": 11003, "group_id": 100303, "previous_group_id": [ @@ -17555,7 +17555,7 @@ "challengeward": 0 }, { - "id": 1100304, + "id": 1103004, "chapterid": 11003, "group_id": 100304, "previous_group_id": [ @@ -17676,7 +17676,7 @@ "challengeward": 0 }, { - "id": 1100305, + "id": 1103005, "chapterid": 11003, "group_id": 100305, "previous_group_id": [ @@ -17755,7 +17755,7 @@ "challengeward": 0 }, { - "id": 1100306, + "id": 1103006, "chapterid": 11003, "group_id": 100306, "previous_group_id": [ @@ -17834,7 +17834,7 @@ "challengeward": 0 }, { - "id": 1100307, + "id": 1103007, "chapterid": 11003, "group_id": 100307, "previous_group_id": [ @@ -17955,7 +17955,7 @@ "challengeward": 0 }, { - "id": 1100308, + "id": 1103008, "chapterid": 11003, "group_id": 100308, "previous_group_id": [ @@ -18076,7 +18076,7 @@ "challengeward": 0 }, { - "id": 1100309, + "id": 1103009, "chapterid": 11003, "group_id": 100309, "previous_group_id": [ @@ -18155,7 +18155,7 @@ "challengeward": 0 }, { - "id": 1100310, + "id": 1103010, "chapterid": 11003, "group_id": 100310, "previous_group_id": [ @@ -18276,7 +18276,7 @@ "challengeward": 0 }, { - "id": 1100311, + "id": 1103011, "chapterid": 11003, "group_id": 100311, "previous_group_id": [ @@ -18397,7 +18397,7 @@ "challengeward": 0 }, { - "id": 1100312, + "id": 1103012, "chapterid": 11003, "group_id": 100312, "previous_group_id": [ @@ -18476,7 +18476,7 @@ "challengeward": 0 }, { - "id": 1100400, + "id": 1104000, "chapterid": 11004, "group_id": 100400, "previous_group_id": [ @@ -18549,7 +18549,7 @@ "challengeward": 0 }, { - "id": 1100401, + "id": 1104001, "chapterid": 11004, "group_id": 100401, "previous_group_id": [ @@ -18622,7 +18622,7 @@ "challengeward": 0 }, { - "id": 1100402, + "id": 1104002, "chapterid": 11004, "group_id": 100402, "previous_group_id": [ @@ -18743,7 +18743,7 @@ "challengeward": 0 }, { - "id": 1100403, + "id": 1104003, "chapterid": 11004, "group_id": 100403, "previous_group_id": [ @@ -18864,7 +18864,7 @@ "challengeward": 0 }, { - "id": 1100404, + "id": 1104004, "chapterid": 11004, "group_id": 100404, "previous_group_id": [ @@ -18937,7 +18937,7 @@ "challengeward": 0 }, { - "id": 1100405, + "id": 1104005, "chapterid": 11004, "group_id": 100405, "previous_group_id": [ @@ -19058,7 +19058,7 @@ "challengeward": 0 }, { - "id": 1100406, + "id": 1104006, "chapterid": 11004, "group_id": 100406, "previous_group_id": [ @@ -19179,7 +19179,7 @@ "challengeward": 0 }, { - "id": 1100407, + "id": 1104007, "chapterid": 11004, "group_id": 100407, "previous_group_id": [ @@ -19300,7 +19300,7 @@ "challengeward": 0 }, { - "id": 1100408, + "id": 1104008, "chapterid": 11004, "group_id": 100408, "previous_group_id": [ @@ -19373,7 +19373,7 @@ "challengeward": 0 }, { - "id": 1100409, + "id": 1104009, "chapterid": 11004, "group_id": 100409, "previous_group_id": [ @@ -19446,7 +19446,7 @@ "challengeward": 0 }, { - "id": 1100410, + "id": 1104010, "chapterid": 11004, "group_id": 100410, "previous_group_id": [ @@ -19567,7 +19567,7 @@ "challengeward": 0 }, { - "id": 1100411, + "id": 1104011, "chapterid": 11004, "group_id": 100411, "previous_group_id": [ @@ -19640,7 +19640,7 @@ "challengeward": 0 }, { - "id": 1100412, + "id": 1104012, "chapterid": 11004, "group_id": 100412, "previous_group_id": [ @@ -19761,7 +19761,7 @@ "challengeward": 0 }, { - "id": 1100413, + "id": 1104013, "chapterid": 11004, "group_id": 100413, "previous_group_id": [ @@ -19834,7 +19834,7 @@ "challengeward": 0 }, { - "id": 1100500, + "id": 1105000, "chapterid": 11005, "group_id": 100500, "previous_group_id": [ @@ -19955,7 +19955,7 @@ "challengeward": 0 }, { - "id": 1100501, + "id": 1105001, "chapterid": 11005, "group_id": 100501, "previous_group_id": [ @@ -20076,7 +20076,7 @@ "challengeward": 0 }, { - "id": 1100502, + "id": 1105002, "chapterid": 11005, "group_id": 100502, "previous_group_id": [ @@ -20197,7 +20197,7 @@ "challengeward": 0 }, { - "id": 1100503, + "id": 1105003, "chapterid": 11005, "group_id": 100503, "previous_group_id": [ @@ -20318,7 +20318,7 @@ "challengeward": 0 }, { - "id": 1100504, + "id": 1105004, "chapterid": 11005, "group_id": 100504, "previous_group_id": [ @@ -20439,7 +20439,7 @@ "challengeward": 0 }, { - "id": 1100505, + "id": 1105005, "chapterid": 11005, "group_id": 100505, "previous_group_id": [ @@ -20560,7 +20560,7 @@ "challengeward": 0 }, { - "id": 1100506, + "id": 1105006, "chapterid": 11005, "group_id": 100506, "previous_group_id": [ @@ -20681,7 +20681,7 @@ "challengeward": 0 }, { - "id": 1100507, + "id": 1105007, "chapterid": 11005, "group_id": 100507, "previous_group_id": [ @@ -20802,7 +20802,7 @@ "challengeward": 0 }, { - "id": 1100508, + "id": 1105008, "chapterid": 11007, "group_id": 100508, "previous_group_id": [ @@ -20923,7 +20923,7 @@ "challengeward": 0 }, { - "id": 1100509, + "id": 1105009, "chapterid": 11008, "group_id": 100509, "previous_group_id": [ @@ -21044,7 +21044,7 @@ "challengeward": 0 }, { - "id": 1100510, + "id": 1105010, "chapterid": 11008, "group_id": 100510, "previous_group_id": [ @@ -21165,7 +21165,7 @@ "challengeward": 0 }, { - "id": 1100511, + "id": 1105011, "chapterid": 11008, "group_id": 100511, "previous_group_id": [ @@ -21286,7 +21286,7 @@ "challengeward": 0 }, { - "id": 1100512, + "id": 1105012, "chapterid": 11008, "group_id": 100512, "previous_group_id": [ @@ -21407,7 +21407,7 @@ "challengeward": 0 }, { - "id": 1100513, + "id": 1105013, "chapterid": 11008, "group_id": 100513, "previous_group_id": [ @@ -21528,7 +21528,7 @@ "challengeward": 0 }, { - "id": 1100514, + "id": 1105014, "chapterid": 11008, "group_id": 100514, "previous_group_id": [ @@ -21649,7 +21649,7 @@ "challengeward": 0 }, { - "id": 1100515, + "id": 1105015, "chapterid": 11008, "group_id": 100515, "previous_group_id": [ @@ -21770,7 +21770,7 @@ "challengeward": 0 }, { - "id": 1100516, + "id": 1105016, "chapterid": 11008, "group_id": 100516, "previous_group_id": [ @@ -21891,7 +21891,7 @@ "challengeward": 0 }, { - "id": 1100517, + "id": 1105017, "chapterid": 11009, "group_id": 100517, "previous_group_id": [ @@ -22012,7 +22012,7 @@ "challengeward": 0 }, { - "id": 1100518, + "id": 1105018, "chapterid": 11009, "group_id": 100518, "previous_group_id": [ @@ -22133,7 +22133,7 @@ "challengeward": 0 }, { - "id": 1100519, + "id": 1105019, "chapterid": 11009, "group_id": 100519, "previous_group_id": [ @@ -22254,7 +22254,7 @@ "challengeward": 0 }, { - "id": 1100520, + "id": 1105020, "chapterid": 11009, "group_id": 100520, "previous_group_id": [ @@ -22375,7 +22375,7 @@ "challengeward": 0 }, { - "id": 1100521, + "id": 1105021, "chapterid": 11009, "group_id": 100521, "previous_group_id": [ @@ -22496,7 +22496,7 @@ "challengeward": 0 }, { - "id": 1100522, + "id": 1105022, "chapterid": 11009, "group_id": 100522, "previous_group_id": [ @@ -22617,7 +22617,7 @@ "challengeward": 0 }, { - "id": 1100523, + "id": 1105023, "chapterid": 11009, "group_id": 100523, "previous_group_id": [ @@ -22738,7 +22738,7 @@ "challengeward": 0 }, { - "id": 1100524, + "id": 1105024, "chapterid": 11009, "group_id": 100524, "previous_group_id": [ @@ -22859,7 +22859,7 @@ "challengeward": 0 }, { - "id": 1100525, + "id": 1105025, "chapterid": 11010, "group_id": 100525, "previous_group_id": [ @@ -22980,7 +22980,7 @@ "challengeward": 0 }, { - "id": 1100526, + "id": 1105026, "chapterid": 11010, "group_id": 100526, "previous_group_id": [ @@ -23101,7 +23101,7 @@ "challengeward": 0 }, { - "id": 1100527, + "id": 1105027, "chapterid": 11010, "group_id": 100527, "previous_group_id": [ @@ -23222,7 +23222,7 @@ "challengeward": 0 }, { - "id": 1100528, + "id": 1105028, "chapterid": 11010, "group_id": 100528, "previous_group_id": [ @@ -23343,7 +23343,7 @@ "challengeward": 0 }, { - "id": 1100529, + "id": 1105029, "chapterid": 11010, "group_id": 100529, "previous_group_id": [ @@ -23464,7 +23464,7 @@ "challengeward": 0 }, { - "id": 1100530, + "id": 1105030, "chapterid": 11010, "group_id": 100530, "previous_group_id": [ @@ -23585,7 +23585,7 @@ "challengeward": 0 }, { - "id": 1100531, + "id": 1105031, "chapterid": 11010, "group_id": 100531, "previous_group_id": [ @@ -23706,7 +23706,7 @@ "challengeward": 0 }, { - "id": 1100532, + "id": 1105032, "chapterid": 11010, "group_id": 100532, "previous_group_id": [ @@ -23827,7 +23827,7 @@ "challengeward": 0 }, { - "id": 1100533, + "id": 1105033, "chapterid": 11011, "group_id": 100533, "previous_group_id": [ @@ -23948,7 +23948,7 @@ "challengeward": 0 }, { - "id": 1100534, + "id": 1105034, "chapterid": 11011, "group_id": 100534, "previous_group_id": [ @@ -24069,7 +24069,7 @@ "challengeward": 0 }, { - "id": 1100535, + "id": 1105035, "chapterid": 11011, "group_id": 100535, "previous_group_id": [ @@ -24190,7 +24190,7 @@ "challengeward": 0 }, { - "id": 1100536, + "id": 1105036, "chapterid": 11011, "group_id": 100536, "previous_group_id": [ @@ -24311,7 +24311,7 @@ "challengeward": 0 }, { - "id": 1100537, + "id": 1105037, "chapterid": 11011, "group_id": 100537, "previous_group_id": [ @@ -24432,7 +24432,7 @@ "challengeward": 0 }, { - "id": 1100538, + "id": 1105038, "chapterid": 11011, "group_id": 100538, "previous_group_id": [ @@ -24553,7 +24553,7 @@ "challengeward": 0 }, { - "id": 1100539, + "id": 1105039, "chapterid": 11011, "group_id": 100539, "previous_group_id": [ @@ -24674,7 +24674,7 @@ "challengeward": 0 }, { - "id": 1100540, + "id": 1105040, "chapterid": 11011, "group_id": 100540, "previous_group_id": [ @@ -24795,7 +24795,7 @@ "challengeward": 0 }, { - "id": 1100541, + "id": 1105041, "chapterid": 11012, "group_id": 100541, "previous_group_id": [ @@ -24916,7 +24916,7 @@ "challengeward": 0 }, { - "id": 1100542, + "id": 1105042, "chapterid": 11012, "group_id": 100542, "previous_group_id": [ @@ -25037,7 +25037,7 @@ "challengeward": 0 }, { - "id": 1100543, + "id": 1105043, "chapterid": 11012, "group_id": 100543, "previous_group_id": [ @@ -25158,7 +25158,7 @@ "challengeward": 0 }, { - "id": 1100544, + "id": 1105044, "chapterid": 11012, "group_id": 100544, "previous_group_id": [ @@ -25279,7 +25279,7 @@ "challengeward": 0 }, { - "id": 1100545, + "id": 1105045, "chapterid": 11012, "group_id": 100545, "previous_group_id": [ @@ -25400,7 +25400,7 @@ "challengeward": 0 }, { - "id": 1100546, + "id": 1105046, "chapterid": 11012, "group_id": 100546, "previous_group_id": [ @@ -25521,7 +25521,7 @@ "challengeward": 0 }, { - "id": 1100547, + "id": 1105047, "chapterid": 11012, "group_id": 100547, "previous_group_id": [ @@ -25642,7 +25642,7 @@ "challengeward": 0 }, { - "id": 1100548, + "id": 1105048, "chapterid": 11012, "group_id": 100548, "previous_group_id": [ diff --git a/bin/json/game_playerskill.json b/bin/json/game_playerskill.json new file mode 100644 index 000000000..4e42f3a0d --- /dev/null +++ b/bin/json/game_playerskill.json @@ -0,0 +1,22 @@ +[ + { + "key": 1, + "open": [], + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "number": 1 + }, + { + "key": 2, + "open": [], + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "number": 1 + } +] \ No newline at end of file diff --git a/bin/json/game_playingmethod.json b/bin/json/game_playingmethod.json new file mode 100644 index 000000000..303c3a31e --- /dev/null +++ b/bin/json/game_playingmethod.json @@ -0,0 +1,86 @@ +[ + { + "key": 1, + "open": 0, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 1, + "detail": 1, + "weight": 0 + }, + { + "key": 2, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 1, + "weight": 2000 + }, + { + "key": 3, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 1, + "weight": 2000 + }, + { + "key": 4, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 1, + "weight": 2000 + }, + { + "key": 5, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 2, + "weight": 2000 + }, + { + "key": 6, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 2, + "weight": 2000 + }, + { + "key": 7, + "open": 999999, + "icon": "", + "txt": { + "key": "", + "text": "" + }, + "type": 2, + "detail": 2, + "weight": 2000 + } +] \ No newline at end of file diff --git a/comm/imodule.go b/comm/imodule.go index bd9e725fd..41a9ec082 100644 --- a/comm/imodule.go +++ b/comm/imodule.go @@ -242,6 +242,8 @@ type ( //GM接口 获取全部装备 GMGetAllEquip(session IUserSession, ismaxlv bool) (errdata *pb.ErrorData) + //创建最高名字装备 + NewMaxQualityEquipment(session IUserSession, cid []string) (eruips []*pb.DB_Equipment, errdata *pb.ErrorData) } //任务 diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go index be1c88c31..d393cee47 100644 --- a/modules/equipment/modelEquipment.go +++ b/modules/equipment/modelEquipment.go @@ -186,6 +186,31 @@ func (this *modelEquipmentComp) addEquipment(equip *pb.DB_Equipment) (err error) } return } +func (this *modelEquipmentComp) addEquipments(uid string, equips []*pb.DB_Equipment) (err error) { + var ( + model *db.DBModel + equipsMap map[string]*pb.DB_Equipment = make(map[string]*pb.DB_Equipment) + ) + for _, v := range equips { + equipsMap[v.Id] = v + } + if this.module.IsCross() { + if model, err = this.module.GetDBModelByUid(uid, this.TableName); err != nil { + this.module.Errorln(err) + } else { + if err = model.AddLists(uid, &equipsMap); err != nil { + this.module.Errorf("err:%v", err) + return + } + } + } else { + if err = model.AddLists(uid, &equipsMap); err != nil { + this.module.Errorf("err:%v", err) + return + } + } + return +} // 删除装备 func (this *modelEquipmentComp) DelEquipments(uId string, eIds []string) (change []*pb.DB_Equipment, err error) { diff --git a/modules/equipment/module.go b/modules/equipment/module.go index 5e807ad81..81fdb4493 100644 --- a/modules/equipment/module.go +++ b/modules/equipment/module.go @@ -277,6 +277,62 @@ func (this *Equipment) AddEquipment(session comm.IUserSession, equip *pb.DB_Equi return } +// 创建新的装备 +func (this *Equipment) addEquipments(session comm.IUserSession, equips []*pb.DB_Equipment) (errdata *pb.ErrorData) { + var ( + err error + configure *cfg.GameEquipData + ) + if err = this.modelEquipment.addEquipments(session.GetUserId(), equips); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + tasks := make([]*pb.BuriedParam, 0) + for _, equip := range equips { + if configure, err = this.configure.GetEquipmentConfigureById(equip.CId); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.ToString(), + Message: err.Error(), + } + return + } + + //随机任务 + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype50, 1, configure.Color)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype97, 1, configure.Suittype, configure.Color)) + unm := int32(1) + if equip.AdverbEntry != nil { + unm += int32(len(equip.AdverbEntry)) + } + if equip.Adverbskill != nil { + unm += int32(len(equip.Adverbskill)) + } + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype99, 1, unm, configure.Color)) + if configure.Pos == 7 { + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype103, 1, configure.Color)) + } else if configure.Pos == 6 { + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype101, 1, configure.Color)) + } + } + if err = this.equipmentsChangePush(session, equips); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.String(), + Message: err.Error(), + } + return + } + go this.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { + this.ModuleBuried.TriggerBuried(session, tasks...) + }) + return +} + // /出售装备 func (this *Equipment) SellEquipments(session comm.IUserSession, equs []string) (errdata *pb.ErrorData, atno []*pb.UserAtno) { var ( @@ -575,6 +631,30 @@ func (this *Equipment) GetForgeEquip(session comm.IUserSession, suiteId int32, p } } +func (this *Equipment) NewMaxQualityEquipment(session comm.IUserSession, cid []string) (eruips []*pb.DB_Equipment, errdata *pb.ErrorData) { + var ( + conf *cfg.GameEquipData + err error + ) + eruips = make([]*pb.DB_Equipment, len(cid)) + for i, v := range cid { + if conf, err = this.configure.GetEquipmentConfigureById(v); err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_ConfigNoFound, + Title: pb.ErrorCode_ConfigNoFound.String(), + Message: fmt.Sprintf("found id:%s", v), + } + return + } + if eruips[i], err = this.modelEquipment.newEquipment(session.GetUserId(), conf, nil, true); err == nil { + if errdata = this.addEquipments(session, eruips); errdata != nil { + return + } + } + } + return +} + /* GM 命令接口 获取全部装备 diff --git a/modules/parkour/configure.go b/modules/parkour/configure.go index d04255f51..d78d1c99f 100644 --- a/modules/parkour/configure.go +++ b/modules/parkour/configure.go @@ -10,6 +10,7 @@ import ( ) const ( + game_bukashiai = "game_bukashiai.json" game_buzkashiopen = "game_buzkashiopen.json" game_buzkashigrade = "game_buzkashigrade.json" game_buzkashilv = "game_buzkashilv.json" @@ -28,6 +29,7 @@ type configureComp struct { func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { this.MCompConfigure.Init(service, module, comp, options) this.module = module.(*Parkour) + this.LoadConfigure(game_bukashiai, cfg.NewGameBukashiAi) this.LoadConfigure(game_buzkashiopen, cfg.NewGameBuzkashiOpen) this.LoadConfigure(game_buzkashigrade, cfg.NewGameBuzkashiGrade) this.LoadConfigure(game_buzkashilv, cfg.NewGameBuzkashiLv) diff --git a/sys/configure/structs/Game.Block.go b/sys/configure/structs/Game.Block.go new file mode 100644 index 000000000..e625ca70f --- /dev/null +++ b/sys/configure/structs/Game.Block.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBlock struct { + _dataMap map[int32]*GameBlockData + _dataList []*GameBlockData +} + +func NewGameBlock(_buf []map[string]interface{}) (*GameBlock, error) { + _dataList := make([]*GameBlockData, 0, len(_buf)) + dataMap := make(map[int32]*GameBlockData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameBlockData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameBlock{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameBlock) GetDataMap() map[int32]*GameBlockData { + return table._dataMap +} + +func (table *GameBlock) GetDataList() []*GameBlockData { + return table._dataList +} + +func (table *GameBlock) Get(key int32) *GameBlockData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.BlockData.go b/sys/configure/structs/Game.BlockData.go new file mode 100644 index 000000000..d481e389d --- /dev/null +++ b/sys/configure/structs/Game.BlockData.go @@ -0,0 +1,51 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBlockData struct { + Key int32 + Color int32 + Belongto int32 + Open int32 + Icon string + Weight int32 + Score int32 + Type int32 + Value int32 +} + +const TypeId_GameBlockData = -1717313829 + +func (*GameBlockData) GetTypeId() int32 { + return -1717313829 +} + +func (_v *GameBlockData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open"].(float64); !_ok_ { err = errors.New("open error"); return }; _v.Open = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["score"].(float64); !_ok_ { err = errors.New("score error"); return }; _v.Score = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameBlockData(_buf map[string]interface{}) (*GameBlockData, error) { + v := &GameBlockData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.BukashiAi.go b/sys/configure/structs/Game.BukashiAi.go new file mode 100644 index 000000000..8c6faf257 --- /dev/null +++ b/sys/configure/structs/Game.BukashiAi.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBukashiAi struct { + _dataMap map[int32]*GameBukashiAiData + _dataList []*GameBukashiAiData +} + +func NewGameBukashiAi(_buf []map[string]interface{}) (*GameBukashiAi, error) { + _dataList := make([]*GameBukashiAiData, 0, len(_buf)) + dataMap := make(map[int32]*GameBukashiAiData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameBukashiAiData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameBukashiAi{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameBukashiAi) GetDataMap() map[int32]*GameBukashiAiData { + return table._dataMap +} + +func (table *GameBukashiAi) GetDataList() []*GameBukashiAiData { + return table._dataList +} + +func (table *GameBukashiAi) Get(key int32) *GameBukashiAiData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.BukashiAiData.go b/sys/configure/structs/Game.BukashiAiData.go new file mode 100644 index 000000000..f4e8b34b3 --- /dev/null +++ b/sys/configure/structs/Game.BukashiAiData.go @@ -0,0 +1,93 @@ +//------------------------------------------------------------------------------ +// +// 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 GameBukashiAiData struct { + Id int32 + MatchType int32 + QualifyingType int32 + BehaviorCD int32 + BumpWeight int32 + BumpCD int32 + BumpFailWeight int32 + BumpSuccessWeight []int32 + HpBumpWeight int32 + HpBumpCD int32 + HpBumpFailWeight int32 + HpBumpSuccessWeight int32 + CatchQteWeight int32 + CatchQteCD int32 + CatchQteFailWeight int32 + CatchQteSuccessWeight []int32 + EmptyWeight int32 +} + +const TypeId_GameBukashiAiData = -332024319 + +func (*GameBukashiAiData) GetTypeId() int32 { + return -332024319 +} + +func (_v *GameBukashiAiData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["MatchType"].(float64); !_ok_ { err = errors.New("MatchType error"); return }; _v.MatchType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["QualifyingType"].(float64); !_ok_ { err = errors.New("QualifyingType error"); return }; _v.QualifyingType = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BehaviorCD"].(float64); !_ok_ { err = errors.New("BehaviorCD error"); return }; _v.BehaviorCD = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BumpWeight"].(float64); !_ok_ { err = errors.New("BumpWeight error"); return }; _v.BumpWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BumpCD"].(float64); !_ok_ { err = errors.New("BumpCD error"); return }; _v.BumpCD = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["BumpFailWeight"].(float64); !_ok_ { err = errors.New("BumpFailWeight error"); return }; _v.BumpFailWeight = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["BumpSuccessWeight"].([]interface{}); !_ok_ { err = errors.New("BumpSuccessWeight error"); return } + + _v.BumpSuccessWeight = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.BumpSuccessWeight = append(_v.BumpSuccessWeight, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpWeight"].(float64); !_ok_ { err = errors.New("HpBumpWeight error"); return }; _v.HpBumpWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpCD"].(float64); !_ok_ { err = errors.New("HpBumpCD error"); return }; _v.HpBumpCD = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpFailWeight"].(float64); !_ok_ { err = errors.New("HpBumpFailWeight error"); return }; _v.HpBumpFailWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["HpBumpSuccessWeight"].(float64); !_ok_ { err = errors.New("HpBumpSuccessWeight error"); return }; _v.HpBumpSuccessWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CatchQteWeight"].(float64); !_ok_ { err = errors.New("CatchQteWeight error"); return }; _v.CatchQteWeight = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CatchQteCD"].(float64); !_ok_ { err = errors.New("CatchQteCD error"); return }; _v.CatchQteCD = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["CatchQteFailWeight"].(float64); !_ok_ { err = errors.New("CatchQteFailWeight error"); return }; _v.CatchQteFailWeight = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["CatchQteSuccessWeight"].([]interface{}); !_ok_ { err = errors.New("CatchQteSuccessWeight error"); return } + + _v.CatchQteSuccessWeight = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.CatchQteSuccessWeight = append(_v.CatchQteSuccessWeight, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["EmptyWeight"].(float64); !_ok_ { err = errors.New("EmptyWeight error"); return }; _v.EmptyWeight = int32(_tempNum_) } + return +} + +func DeserializeGameBukashiAiData(_buf map[string]interface{}) (*GameBukashiAiData, error) { + v := &GameBukashiAiData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.ConsumeBox.go b/sys/configure/structs/Game.ConsumeBox.go new file mode 100644 index 000000000..396baad77 --- /dev/null +++ b/sys/configure/structs/Game.ConsumeBox.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameConsumeBox struct { + _dataMap map[int32]*GameConsumeBoxData + _dataList []*GameConsumeBoxData +} + +func NewGameConsumeBox(_buf []map[string]interface{}) (*GameConsumeBox, error) { + _dataList := make([]*GameConsumeBoxData, 0, len(_buf)) + dataMap := make(map[int32]*GameConsumeBoxData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameConsumeBoxData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Boxid] = _v + } + } + return &GameConsumeBox{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameConsumeBox) GetDataMap() map[int32]*GameConsumeBoxData { + return table._dataMap +} + +func (table *GameConsumeBox) GetDataList() []*GameConsumeBoxData { + return table._dataList +} + +func (table *GameConsumeBox) Get(key int32) *GameConsumeBoxData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.ConsumeBoxData.go b/sys/configure/structs/Game.ConsumeBoxData.go new file mode 100644 index 000000000..148b0e309 --- /dev/null +++ b/sys/configure/structs/Game.ConsumeBoxData.go @@ -0,0 +1,58 @@ +//------------------------------------------------------------------------------ +// +// 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 GameConsumeBoxData struct { + Boxid int32 + Type int32 + Cd int32 + Onereward []*Gameatn + Name string + Txt string +} + +const TypeId_GameConsumeBoxData = -456316427 + +func (*GameConsumeBoxData) GetTypeId() int32 { + return -456316427 +} + +func (_v *GameConsumeBoxData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["boxid"].(float64); !_ok_ { err = errors.New("boxid error"); return }; _v.Boxid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["cd"].(float64); !_ok_ { err = errors.New("cd error"); return }; _v.Cd = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["onereward"].([]interface{}); !_ok_ { err = errors.New("onereward error"); return } + + _v.Onereward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Onereward = append(_v.Onereward, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameConsumeBoxData(_buf map[string]interface{}) (*GameConsumeBoxData, error) { + v := &GameConsumeBoxData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.ConsumeHero.go b/sys/configure/structs/Game.ConsumeHero.go new file mode 100644 index 000000000..31f762d44 --- /dev/null +++ b/sys/configure/structs/Game.ConsumeHero.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameConsumeHero struct { + _dataMap map[int32]*GameConsumeHeroData + _dataList []*GameConsumeHeroData +} + +func NewGameConsumeHero(_buf []map[string]interface{}) (*GameConsumeHero, error) { + _dataList := make([]*GameConsumeHeroData, 0, len(_buf)) + dataMap := make(map[int32]*GameConsumeHeroData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameConsumeHeroData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameConsumeHero{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameConsumeHero) GetDataMap() map[int32]*GameConsumeHeroData { + return table._dataMap +} + +func (table *GameConsumeHero) GetDataList() []*GameConsumeHeroData { + return table._dataList +} + +func (table *GameConsumeHero) Get(key int32) *GameConsumeHeroData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.ConsumeHeroData.go b/sys/configure/structs/Game.ConsumeHeroData.go new file mode 100644 index 000000000..ac48e36d5 --- /dev/null +++ b/sys/configure/structs/Game.ConsumeHeroData.go @@ -0,0 +1,41 @@ +//------------------------------------------------------------------------------ +// +// 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 GameConsumeHeroData struct { + Key int32 + Type int32 + Txt string + Consume int32 +} + +const TypeId_GameConsumeHeroData = 187972836 + +func (*GameConsumeHeroData) GetTypeId() int32 { + return 187972836 +} + +func (_v *GameConsumeHeroData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["consume"].(float64); !_ok_ { err = errors.New("consume error"); return }; _v.Consume = int32(_tempNum_) } + return +} + +func DeserializeGameConsumeHeroData(_buf map[string]interface{}) (*GameConsumeHeroData, error) { + v := &GameConsumeHeroData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.Integral.go b/sys/configure/structs/Game.Integral.go new file mode 100644 index 000000000..9ed8e9348 --- /dev/null +++ b/sys/configure/structs/Game.Integral.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameIntegral struct { + _dataMap map[int32]*GameIntegralData + _dataList []*GameIntegralData +} + +func NewGameIntegral(_buf []map[string]interface{}) (*GameIntegral, error) { + _dataList := make([]*GameIntegralData, 0, len(_buf)) + dataMap := make(map[int32]*GameIntegralData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameIntegralData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameIntegral{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameIntegral) GetDataMap() map[int32]*GameIntegralData { + return table._dataMap +} + +func (table *GameIntegral) GetDataList() []*GameIntegralData { + return table._dataList +} + +func (table *GameIntegral) Get(key int32) *GameIntegralData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.IntegralData.go b/sys/configure/structs/Game.IntegralData.go new file mode 100644 index 000000000..2a2e019ff --- /dev/null +++ b/sys/configure/structs/Game.IntegralData.go @@ -0,0 +1,114 @@ +//------------------------------------------------------------------------------ +// +// 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 GameIntegralData struct { + Key int32 + Type int32 + Onereward []*Gameatn + Rewards []*Gameatn + Deductrewards []*Gameatn + Boxid []int32 + Weight []int32 + Name string +} + +const TypeId_GameIntegralData = 1942319090 + +func (*GameIntegralData) GetTypeId() int32 { + return 1942319090 +} + +func (_v *GameIntegralData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["onereward"].([]interface{}); !_ok_ { err = errors.New("onereward error"); return } + + _v.Onereward = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Onereward = append(_v.Onereward, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["rewards"].([]interface{}); !_ok_ { err = errors.New("rewards error"); return } + + _v.Rewards = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Rewards = append(_v.Rewards, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["deductrewards"].([]interface{}); !_ok_ { err = errors.New("deductrewards error"); return } + + _v.Deductrewards = make([]*Gameatn, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ *Gameatn + { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } } + _v.Deductrewards = append(_v.Deductrewards, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["boxid"].([]interface{}); !_ok_ { err = errors.New("boxid error"); return } + + _v.Boxid = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Boxid = append(_v.Boxid, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["weight"].([]interface{}); !_ok_ { err = errors.New("weight error"); return } + + _v.Weight = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Weight = append(_v.Weight, _list_v_) + } + } + + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + return +} + +func DeserializeGameIntegralData(_buf map[string]interface{}) (*GameIntegralData, error) { + v := &GameIntegralData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.Lattice.go b/sys/configure/structs/Game.Lattice.go new file mode 100644 index 000000000..433043274 --- /dev/null +++ b/sys/configure/structs/Game.Lattice.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameLattice struct { + _dataMap map[int32]*GameLatticeData + _dataList []*GameLatticeData +} + +func NewGameLattice(_buf []map[string]interface{}) (*GameLattice, error) { + _dataList := make([]*GameLatticeData, 0, len(_buf)) + dataMap := make(map[int32]*GameLatticeData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLatticeData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GameLattice{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLattice) GetDataMap() map[int32]*GameLatticeData { + return table._dataMap +} + +func (table *GameLattice) GetDataList() []*GameLatticeData { + return table._dataList +} + +func (table *GameLattice) Get(key int32) *GameLatticeData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LatticeData.go b/sys/configure/structs/Game.LatticeData.go new file mode 100644 index 000000000..075e1591b --- /dev/null +++ b/sys/configure/structs/Game.LatticeData.go @@ -0,0 +1,71 @@ +//------------------------------------------------------------------------------ +// +// 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" +import "bright/serialization" + +type GameLatticeData struct { + Key int32 + Belongto int32 + Regular int32 + Place serialization.Vector2 + Number []int32 + Reserve int32 + Icon string + Type int32 + Value int32 +} + +const TypeId_GameLatticeData = -1468712828 + +func (*GameLatticeData) GetTypeId() int32 { + return -1468712828 +} + +func (_v *GameLatticeData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["belongto"].(float64); !_ok_ { err = errors.New("belongto error"); return }; _v.Belongto = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["regular"].(float64); !_ok_ { err = errors.New("regular error"); return }; _v.Regular = int32(_tempNum_) } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["place"].(map[string]interface{}); !_ok_ { err = errors.New("place error"); return } + var _x_, _y_ float32; + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) } + _v.Place = serialization.NewVector2(_x_, _y_) + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["number"].([]interface{}); !_ok_ { err = errors.New("number error"); return } + + _v.Number = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Number = append(_v.Number, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["reserve"].(float64); !_ok_ { err = errors.New("reserve error"); return }; _v.Reserve = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) } + return +} + +func DeserializeGameLatticeData(_buf map[string]interface{}) (*GameLatticeData, error) { + v := &GameLatticeData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.PlayerSkill.go b/sys/configure/structs/Game.PlayerSkill.go new file mode 100644 index 000000000..2a78ed400 --- /dev/null +++ b/sys/configure/structs/Game.PlayerSkill.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlayerSkill struct { + _dataMap map[int32]*GamePlayerSkillData + _dataList []*GamePlayerSkillData +} + +func NewGamePlayerSkill(_buf []map[string]interface{}) (*GamePlayerSkill, error) { + _dataList := make([]*GamePlayerSkillData, 0, len(_buf)) + dataMap := make(map[int32]*GamePlayerSkillData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlayerSkillData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GamePlayerSkill{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlayerSkill) GetDataMap() map[int32]*GamePlayerSkillData { + return table._dataMap +} + +func (table *GamePlayerSkill) GetDataList() []*GamePlayerSkillData { + return table._dataList +} + +func (table *GamePlayerSkill) Get(key int32) *GamePlayerSkillData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlayerSkillData.go b/sys/configure/structs/Game.PlayerSkillData.go new file mode 100644 index 000000000..86faa3d68 --- /dev/null +++ b/sys/configure/structs/Game.PlayerSkillData.go @@ -0,0 +1,56 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlayerSkillData struct { + Key int32 + Open []int32 + Icon string + Txt string + Number int32 +} + +const TypeId_GamePlayerSkillData = 244367806 + +func (*GamePlayerSkillData) GetTypeId() int32 { + return 244367806 +} + +func (_v *GamePlayerSkillData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["open"].([]interface{}); !_ok_ { err = errors.New("open error"); return } + + _v.Open = make([]int32, 0, len(_arr_)) + + for _, _e_ := range _arr_ { + var _list_v_ int32 + { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) } + _v.Open = append(_v.Open, _list_v_) + } + } + + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["number"].(float64); !_ok_ { err = errors.New("number error"); return }; _v.Number = int32(_tempNum_) } + return +} + +func DeserializeGamePlayerSkillData(_buf map[string]interface{}) (*GamePlayerSkillData, error) { + v := &GamePlayerSkillData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.PlayingMethod.go b/sys/configure/structs/Game.PlayingMethod.go new file mode 100644 index 000000000..ee29891d7 --- /dev/null +++ b/sys/configure/structs/Game.PlayingMethod.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlayingMethod struct { + _dataMap map[int32]*GamePlayingMethodData + _dataList []*GamePlayingMethodData +} + +func NewGamePlayingMethod(_buf []map[string]interface{}) (*GamePlayingMethod, error) { + _dataList := make([]*GamePlayingMethodData, 0, len(_buf)) + dataMap := make(map[int32]*GamePlayingMethodData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGamePlayingMethodData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Key] = _v + } + } + return &GamePlayingMethod{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GamePlayingMethod) GetDataMap() map[int32]*GamePlayingMethodData { + return table._dataMap +} + +func (table *GamePlayingMethod) GetDataList() []*GamePlayingMethodData { + return table._dataList +} + +func (table *GamePlayingMethod) Get(key int32) *GamePlayingMethodData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.PlayingMethodData.go b/sys/configure/structs/Game.PlayingMethodData.go new file mode 100644 index 000000000..7fec0b058 --- /dev/null +++ b/sys/configure/structs/Game.PlayingMethodData.go @@ -0,0 +1,47 @@ +//------------------------------------------------------------------------------ +// +// 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 GamePlayingMethodData struct { + Key int32 + Open int32 + Icon string + Txt string + Type int32 + Detail int32 + Weight int32 +} + +const TypeId_GamePlayingMethodData = -1379719171 + +func (*GamePlayingMethodData) GetTypeId() int32 { + return -1379719171 +} + +func (_v *GamePlayingMethodData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["open"].(float64); !_ok_ { err = errors.New("open error"); return }; _v.Open = int32(_tempNum_) } + { var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } } + {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["detail"].(float64); !_ok_ { err = errors.New("detail error"); return }; _v.Detail = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) } + return +} + +func DeserializeGamePlayingMethodData(_buf map[string]interface{}) (*GamePlayingMethodData, error) { + v := &GamePlayingMethodData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index cef173627..a83fdb180 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -266,6 +266,14 @@ type Tables struct { AchieveGroup *GameAchieveGroup AchieveTask *GameAchieveTask GameFast *GameGameFast + PlayingMethod *GamePlayingMethod + Block *GameBlock + Lattice *GameLattice + Integral *GameIntegral + ConsumeHero *GameConsumeHero + PlayerSkill *GamePlayerSkill + ConsumeBox *GameConsumeBox + BukashiAi *GameBukashiAi } func NewTables(loader JsonLoader) (*Tables, error) { @@ -1803,5 +1811,53 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GameFast, err = NewGameGameFast(buf) ; err != nil { return nil, err } + if buf, err = loader("game_playingmethod") ; err != nil { + return nil, err + } + if tables.PlayingMethod, err = NewGamePlayingMethod(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_block") ; err != nil { + return nil, err + } + if tables.Block, err = NewGameBlock(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_lattice") ; err != nil { + return nil, err + } + if tables.Lattice, err = NewGameLattice(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_integral") ; err != nil { + return nil, err + } + if tables.Integral, err = NewGameIntegral(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_consumehero") ; err != nil { + return nil, err + } + if tables.ConsumeHero, err = NewGameConsumeHero(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_playerskill") ; err != nil { + return nil, err + } + if tables.PlayerSkill, err = NewGamePlayerSkill(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_consumebox") ; err != nil { + return nil, err + } + if tables.ConsumeBox, err = NewGameConsumeBox(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_bukashiai") ; err != nil { + return nil, err + } + if tables.BukashiAi, err = NewGameBukashiAi(buf) ; err != nil { + return nil, err + } return tables, nil } diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go index e99a1b286..8458324ae 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -294,6 +294,8 @@ type GameGlobalData struct { DragonFuntime int32 ChallengeNpcStory []int32 QuickcardAispeed float32 + FastplayInteraction int32 + FastplayItem string } const TypeId_GameGlobalData = 477542761 @@ -1158,6 +1160,8 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["quickcard_aispeed"].(float64); !_ok_ { err = errors.New("quickcard_aispeed error"); return }; _v.QuickcardAispeed = float32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fastplay_interaction"].(float64); !_ok_ { err = errors.New("fastplay_interaction error"); return }; _v.FastplayInteraction = int32(_tempNum_) } + { var _ok_ bool; if _v.FastplayItem, _ok_ = _buf["fastplay_item"].(string); !_ok_ { err = errors.New("fastplay_item error"); return } } return }