diff --git a/.golangci.yml b/.golangci.yml new file mode 100644 index 000000000..174df0657 --- /dev/null +++ b/.golangci.yml @@ -0,0 +1,25 @@ +run: + skip-dirs: + - pb + - sys/configure/ + tests: false + go: '1.18' +output: +# format: json + sort-results: true +linters: + disable-all: true + enable: + - nilerr + - errcheck + - gosimple + - govet + - ineffassign + - staticcheck + - typecheck + - unused + # more linters https://golangci-lint.run/usage/linters/ + +linters-settings: + funlen: + statements: 60 \ No newline at end of file diff --git a/bin/json/game_global.json b/bin/json/game_global.json index 672ed5282..e27f902e0 100644 --- a/bin/json/game_global.json +++ b/bin/json/game_global.json @@ -144,6 +144,12 @@ "dreamland_pro": 100, "dreamland_triggernum": 20, "hunting_num": 10, - "hunting_reset": 1 + "hunting_reset": 1, + "hunting_cap": [ + 25001, + 25004, + 34006, + 11017 + ] } ] \ No newline at end of file diff --git a/bin/json/game_heroresonance.json b/bin/json/game_heroresonance.json index fee08d559..089c049bc 100644 --- a/bin/json/game_heroresonance.json +++ b/bin/json/game_heroresonance.json @@ -30,7 +30,12 @@ "hpscale": 736, "atkscale": 90, "defscale": 174, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "13002", @@ -63,7 +68,12 @@ "hpscale": 106, "atkscale": 50, "defscale": 844, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "13003", @@ -96,7 +106,12 @@ "hpscale": 255, "atkscale": 140, "defscale": 605, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "13004", @@ -129,7 +144,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "13005", @@ -162,7 +182,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14001", @@ -195,7 +220,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14002", @@ -228,7 +258,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14003", @@ -261,7 +296,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14004", @@ -294,7 +334,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14005", @@ -327,7 +372,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14006", @@ -360,7 +410,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "14007", @@ -393,7 +448,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "15001", @@ -426,7 +486,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "15002", @@ -459,7 +524,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "15003", @@ -492,7 +562,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "15004", @@ -525,7 +600,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "23001", @@ -558,7 +638,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "23002", @@ -591,7 +676,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "23003", @@ -624,7 +714,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "23004", @@ -657,7 +752,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24001", @@ -690,7 +790,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24002", @@ -723,7 +828,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24003", @@ -756,7 +866,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24004", @@ -789,7 +904,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24005", @@ -822,7 +942,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24006", @@ -855,7 +980,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24007", @@ -888,7 +1018,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24008", @@ -921,7 +1056,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "24009", @@ -954,7 +1094,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "25001", @@ -987,7 +1132,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "25002", @@ -1020,7 +1170,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "25003", @@ -1053,7 +1208,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "25004", @@ -1086,7 +1246,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33001", @@ -1119,7 +1284,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33002", @@ -1152,7 +1322,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33003", @@ -1185,7 +1360,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33004", @@ -1218,7 +1398,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33005", @@ -1251,7 +1436,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "33006", @@ -1284,7 +1474,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34001", @@ -1317,7 +1512,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34002", @@ -1350,7 +1550,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34003", @@ -1383,7 +1588,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34004", @@ -1416,7 +1626,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34005", @@ -1449,7 +1664,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34006", @@ -1482,7 +1702,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34007", @@ -1515,7 +1740,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "34008", @@ -1548,7 +1778,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35001", @@ -1581,7 +1816,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35002", @@ -1614,7 +1854,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35003", @@ -1647,7 +1892,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35004", @@ -1680,7 +1930,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35005", @@ -1713,7 +1968,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "35006", @@ -1746,7 +2006,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43001", @@ -1779,7 +2044,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43002", @@ -1812,7 +2082,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43003", @@ -1845,7 +2120,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43004", @@ -1878,7 +2158,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43005", @@ -1911,7 +2196,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43006", @@ -1944,7 +2234,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "43007", @@ -1977,7 +2272,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44001", @@ -2010,7 +2310,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44002", @@ -2043,7 +2348,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44003", @@ -2076,7 +2386,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44004", @@ -2109,7 +2424,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44006", @@ -2142,7 +2462,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "45001", @@ -2175,7 +2500,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "45002", @@ -2208,7 +2538,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "45003", @@ -2241,7 +2576,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "45004", @@ -2274,7 +2614,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "44005", @@ -2307,7 +2652,12 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] }, { "hid": "15005", @@ -2340,6 +2690,11 @@ "hpscale": 105, "atkscale": 750, "defscale": 145, - "maxnum": 6 + "maxnum": 6, + "recommend_percentage": [ + 750, + 175, + 75 + ] } ] \ No newline at end of file diff --git a/bin/json/game_huntingboss.json b/bin/json/game_huntingboss.json index da77c8eb7..5db35e1a4 100644 --- a/bin/json/game_huntingboss.json +++ b/bin/json/game_huntingboss.json @@ -4,7 +4,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 1, "captionrecommend": [ @@ -71,7 +71,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 2, "captionrecommend": [ @@ -143,7 +143,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 3, "captionrecommend": [ @@ -220,7 +220,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 4, "captionrecommend": [ @@ -297,7 +297,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 5, "captionrecommend": [ @@ -374,7 +374,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 6, "captionrecommend": [ @@ -451,7 +451,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 7, "captionrecommend": [ @@ -528,7 +528,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 8, "captionrecommend": [ @@ -605,7 +605,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 9, "captionrecommend": [ @@ -682,7 +682,7 @@ "type": 1, "name": { "key": "hunting_boss_1001", - "text": "功夫狩猎" + "text": "巨型猩猩" }, "difficulty": 10, "captionrecommend": [ @@ -759,7 +759,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 1, "captionrecommend": [ @@ -826,7 +826,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 2, "captionrecommend": [ @@ -898,7 +898,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 3, "captionrecommend": [ @@ -975,7 +975,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 4, "captionrecommend": [ @@ -1052,7 +1052,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 5, "captionrecommend": [ @@ -1129,7 +1129,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 6, "captionrecommend": [ @@ -1206,7 +1206,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 7, "captionrecommend": [ @@ -1283,7 +1283,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 8, "captionrecommend": [ @@ -1360,7 +1360,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 9, "captionrecommend": [ @@ -1437,7 +1437,7 @@ "type": 2, "name": { "key": "hunting_boss_1002", - "text": "魔法狩猎" + "text": "火龙" }, "difficulty": 10, "captionrecommend": [ @@ -1514,7 +1514,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 1, "captionrecommend": [ @@ -1581,7 +1581,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 2, "captionrecommend": [ @@ -1653,7 +1653,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 3, "captionrecommend": [ @@ -1730,7 +1730,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 4, "captionrecommend": [ @@ -1807,7 +1807,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 5, "captionrecommend": [ @@ -1884,7 +1884,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 6, "captionrecommend": [ @@ -1961,7 +1961,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 7, "captionrecommend": [ @@ -2038,7 +2038,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 8, "captionrecommend": [ @@ -2115,7 +2115,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 9, "captionrecommend": [ @@ -2192,7 +2192,7 @@ "type": 3, "name": { "key": "hunting_boss_1003", - "text": "科技狩猎" + "text": "鹦鹉虎" }, "difficulty": 10, "captionrecommend": [ @@ -2269,7 +2269,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 1, "captionrecommend": [ @@ -2336,7 +2336,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 2, "captionrecommend": [ @@ -2408,7 +2408,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 3, "captionrecommend": [ @@ -2485,7 +2485,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 4, "captionrecommend": [ @@ -2562,7 +2562,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 5, "captionrecommend": [ @@ -2639,7 +2639,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 6, "captionrecommend": [ @@ -2716,7 +2716,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 7, "captionrecommend": [ @@ -2793,7 +2793,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 8, "captionrecommend": [ @@ -2870,7 +2870,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 9, "captionrecommend": [ @@ -2947,7 +2947,7 @@ "type": 4, "name": { "key": "hunting_boss_1004", - "text": "月能狩猎" + "text": "梦魇" }, "difficulty": 10, "captionrecommend": [ diff --git a/bin/json/game_huntingopentime.json b/bin/json/game_huntingopentime.json index 214398210..44172eed4 100644 --- a/bin/json/game_huntingopentime.json +++ b/bin/json/game_huntingopentime.json @@ -4,27 +4,59 @@ "opentime": [ 1, 2 - ] + ], + "name": { + "key": "hunting_boss_1001", + "text": "巨型猩猩" + }, + "introduce": { + "key": "hunting_boss_1005", + "text": "传说中的巨型猩猩是一个非常恐怖的角色，它暴戾且狡猾，与它为敌一定要非常小心" + } }, { "type": 2, "opentime": [ 3, 4 - ] + ], + "name": { + "key": "hunting_boss_1002", + "text": "火龙" + }, + "introduce": { + "key": "hunting_boss_1006", + "text": "火龙可以从嘴里喷出猛烈的火焰，对地面造成毁灭性打击" + } }, { "type": 3, "opentime": [ 5, 6 - ] + ], + "name": { + "key": "hunting_boss_1003", + "text": "鹦鹉虎" + }, + "introduce": { + "key": "hunting_boss_1007", + "text": "一种变异的老虎，它有着锋利的爪子和牙齿" + } }, { "type": 4, "opentime": [ 1, 7 - ] + ], + "name": { + "key": "hunting_boss_1004", + "text": "梦魇" + }, + "introduce": { + "key": "hunting_boss_1008", + "text": "当黑夜来临时，梦魇露出了它的爪牙，会让无辜的人们陷入噩梦中无法自拔" + } } ] \ No newline at end of file diff --git a/bin/json/game_libraryfavor.json b/bin/json/game_libraryfavor.json new file mode 100644 index 000000000..07d0599da --- /dev/null +++ b/bin/json/game_libraryfavor.json @@ -0,0 +1,56 @@ +[ + { + "id": 1, + "star": 3, + "favorlv": 1, + "expneed": 0 + }, + { + "id": 2, + "star": 3, + "favorlv": 2, + "expneed": 100 + }, + { + "id": 3, + "star": 3, + "favorlv": 3, + "expneed": 200 + }, + { + "id": 4, + "star": 4, + "favorlv": 1, + "expneed": 0 + }, + { + "id": 5, + "star": 4, + "favorlv": 2, + "expneed": 200 + }, + { + "id": 6, + "star": 4, + "favorlv": 3, + "expneed": 400 + }, + { + "id": 7, + "star": 5, + "favorlv": 1, + "expneed": 0 + }, + { + "id": 8, + "star": 5, + "favorlv": 2, + "expneed": 250 + }, + { + "id": 9, + "star": 5, + "favorlv": 3, + "expneed": 400 + } +] \ No newline at end of file diff --git a/bin/json/game_libraryfetter.json b/bin/json/game_libraryfetter.json new file mode 100644 index 000000000..02e162492 --- /dev/null +++ b/bin/json/game_libraryfetter.json @@ -0,0 +1,127 @@ +[ + { + "id": 1, + "fid": 101, + "ftype": 1, + "name": "师徒二人", + "lv": 1, + "hid": [ + 25001, + 35001 + ], + "favorlv": 1, + "prize": [] + }, + { + "id": 2, + "fid": 101, + "ftype": 1, + "name": "师徒二人", + "lv": 2, + "hid": [ + 25001, + 35001 + ], + "favorlv": 2, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + }, + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ] + }, + { + "id": 3, + "fid": 101, + "ftype": 1, + "name": "师徒二人", + "lv": 3, + "hid": [ + 25001, + 35001 + ], + "favorlv": 3, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 + } + ] + }, + { + "id": 4, + "fid": 102, + "ftype": 2, + "name": "毫不相干", + "lv": 1, + "hid": [ + 11003, + 11009, + 15004 + ], + "favorlv": 1, + "prize": [] + }, + { + "id": 5, + "fid": 102, + "ftype": 2, + "name": "毫不相干", + "lv": 2, + "hid": [ + 11003, + 11009, + 15004 + ], + "favorlv": 2, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + }, + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ] + }, + { + "id": 6, + "fid": 102, + "ftype": 2, + "name": "毫不相干", + "lv": 3, + "hid": [ + 11003, + 11009, + 15004 + ], + "favorlv": 3, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 2000 + }, + { + "a": "attr", + "t": "diamond", + "n": 200 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_libraryhero.json b/bin/json/game_libraryhero.json new file mode 100644 index 000000000..c60b16ea0 --- /dev/null +++ b/bin/json/game_libraryhero.json @@ -0,0 +1,118 @@ +[ + { + "hid": 15004, + "name": { + "key": "hero_15004", + "text": "小欧" + }, + "star": 5, + "history": [ + 150041, + 150042, + 150043 + ], + "favorlv": [ + 1, + 2, + 3 + ], + "startid": 10001, + "rightend": 10008, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "endid1": 10009, + "endid2": 10010 + }, + { + "hid": 25001, + "name": { + "key": "hero_25001", + "text": "阿宝" + }, + "star": 5, + "history": [ + 250011, + 250012, + 250013 + ], + "favorlv": [ + 1, + 2, + 3 + ], + "startid": 10001, + "rightend": 10008, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "endid1": 10009, + "endid2": 10010 + }, + { + "hid": 35001, + "name": { + "key": "hero_35001", + "text": "师父" + }, + "star": 4, + "history": [ + 350011, + 350012, + 350013 + ], + "favorlv": [ + 1, + 2, + 3 + ], + "startid": 10001, + "rightend": 10008, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "endid1": 10009, + "endid2": 10010 + }, + { + "hid": 11009, + "name": { + "key": "hero_35002", + "text": "希卡普" + }, + "star": 4, + "history": [ + 110091, + 110092, + 110093 + ], + "favorlv": [ + 1, + 2, + 3 + ], + "startid": 10001, + "rightend": 10008, + "stroyprize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ], + "endid1": 10009, + "endid2": 10010 + } +] \ No newline at end of file diff --git a/bin/json/game_libraryhistory.json b/bin/json/game_libraryhistory.json new file mode 100644 index 000000000..260032c4a --- /dev/null +++ b/bin/json/game_libraryhistory.json @@ -0,0 +1,134 @@ +[ + { + "histroy": 150041, + "txt": "小欧是个很乖巧的姑娘", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 150042, + "txt": "小欧是个很潇洒的姑娘", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 150043, + "txt": "小欧是个深情的姑娘", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 250011, + "txt": "阿宝长得贼胖", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 250012, + "txt": "阿宝长得贼圆", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 250013, + "txt": "阿宝长得贼可爱", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 350011, + "txt": "师父武功高强", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 350012, + "txt": "师父很傲娇", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 350013, + "txt": "师父的武功来自于乌龟大师", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 110091, + "txt": "希卡普很勇敢", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 110092, + "txt": "希卡普很善良", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + }, + { + "histroy": 110093, + "txt": "希卡普很帅气", + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_librarystory.json b/bin/json/game_librarystory.json new file mode 100644 index 000000000..ac4315162 --- /dev/null +++ b/bin/json/game_librarystory.json @@ -0,0 +1,34 @@ +[ + { + "fid": 101, + "stroy": 101, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + }, + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ] + }, + { + "fid": 102, + "stroy": 101, + "prize": [ + { + "a": "attr", + "t": "gold", + "n": 1000 + }, + { + "a": "attr", + "t": "diamond", + "n": 100 + } + ] + } +] \ No newline at end of file diff --git a/bin/json/game_mainline.json b/bin/json/game_mainline.json index 1e5be415f..717016fbe 100644 --- a/bin/json/game_mainline.json +++ b/bin/json/game_mainline.json @@ -1,4 +1,36 @@ [ + { + "id": 100, + "intensity": 1, + "endFlag": 0, + "previoustage": 0, + "order": 0, + "linearnum": 0, + "chapter": 1, + "route": 1, + "Episodetype": 0, + "Episodelocation": { + "x": 200, + "y": 601 + }, + "model": "", + "effect": "", + "FormatList": [], + "captainId": "", + "battlescene": "", + "sceneeffect": "", + "award": [], + "title": { + "key": "", + "text": "" + }, + "desc": { + "key": "", + "text": "" + }, + "stroyid": [], + "condition": [] + }, { "id": 101, "intensity": 1, @@ -9,10 +41,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -65,10 +97,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -114,10 +146,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -164,10 +196,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -214,10 +246,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -264,10 +296,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -314,10 +346,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -364,10 +396,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -414,10 +446,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -464,10 +496,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -515,15 +547,13 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", - "FormatList": [ - 102011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "", @@ -564,10 +594,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -613,10 +643,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -663,10 +693,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -713,10 +743,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -763,10 +793,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -813,10 +843,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -863,10 +893,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -913,10 +943,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -963,10 +993,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -1014,15 +1044,13 @@ "chapter": 3, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", - "FormatList": [ - 103011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -1063,10 +1091,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -1112,10 +1140,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -1162,10 +1190,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -1212,10 +1240,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -1262,10 +1290,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -1312,10 +1340,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -1362,10 +1390,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -1412,10 +1440,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -1462,10 +1490,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -1513,15 +1541,13 @@ "chapter": 4, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", - "FormatList": [ - 104011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -1562,10 +1588,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -1611,10 +1637,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -1661,10 +1687,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -1711,10 +1737,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -1761,10 +1787,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -1811,10 +1837,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -1861,10 +1887,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -1911,10 +1937,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -1961,10 +1987,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -2012,15 +2038,13 @@ "chapter": 5, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", - "FormatList": [ - 105011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -2061,10 +2085,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -2110,10 +2134,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -2160,10 +2184,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -2210,10 +2234,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -2260,10 +2284,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "img_100lc", "FormatList": [ @@ -2310,10 +2334,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -2360,10 +2384,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -2410,10 +2434,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -2460,10 +2484,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -2511,15 +2535,13 @@ "chapter": 6, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "0", - "FormatList": [ - 106011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -2560,10 +2582,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -2609,10 +2631,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -2659,10 +2681,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -2709,10 +2731,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -2759,10 +2781,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -2809,10 +2831,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -2859,10 +2881,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -2909,10 +2931,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -2959,10 +2981,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -3010,15 +3032,13 @@ "chapter": 7, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", - "FormatList": [ - 107011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -3059,10 +3079,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -3108,10 +3128,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -3158,10 +3178,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -3208,10 +3228,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -3258,10 +3278,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -3308,10 +3328,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -3358,10 +3378,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -3408,10 +3428,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -3458,10 +3478,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -3509,15 +3529,13 @@ "chapter": 8, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "btn_txjs_xczsl", - "FormatList": [ - 108011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -3558,10 +3576,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -3607,10 +3625,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -3657,10 +3675,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -3707,10 +3725,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -3757,10 +3775,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -3807,10 +3825,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -3857,10 +3875,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -3907,10 +3925,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -3957,10 +3975,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -4008,15 +4026,13 @@ "chapter": 9, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", - "FormatList": [ - 109011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -4057,10 +4073,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -4106,10 +4122,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -4156,10 +4172,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -4206,10 +4222,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -4256,10 +4272,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -4306,10 +4322,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -4356,10 +4372,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -4406,10 +4422,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -4456,10 +4472,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -4507,15 +4523,13 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", - "FormatList": [ - 110011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -4556,10 +4570,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -4605,10 +4619,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -4655,10 +4669,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -4705,10 +4719,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -4755,10 +4769,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -4805,10 +4819,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -4855,10 +4869,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -4905,10 +4919,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -4955,10 +4969,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -5006,15 +5020,13 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", - "FormatList": [ - 111011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -5055,10 +5067,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -5104,10 +5116,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -5154,10 +5166,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -5204,10 +5216,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -5254,10 +5266,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -5304,10 +5316,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -5354,10 +5366,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -5404,10 +5416,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -5454,10 +5466,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -5505,15 +5517,13 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", - "FormatList": [ - 112011 - ], + "FormatList": [], "captainId": "250011", "battlescene": "bg_zhandoulmboss", "sceneeffect": "zhandoulizi", @@ -5554,10 +5564,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -5603,10 +5613,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -5653,10 +5663,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -5703,10 +5713,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -5753,10 +5763,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "0", "FormatList": [ @@ -5803,10 +5813,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -5853,10 +5863,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -5903,10 +5913,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -5953,10 +5963,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -6004,10 +6014,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -6060,10 +6070,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -6109,10 +6119,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -6159,10 +6169,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -6209,10 +6219,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -6259,10 +6269,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -6309,10 +6319,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -6359,10 +6369,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -6409,10 +6419,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -6459,10 +6469,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -6510,10 +6520,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -6559,10 +6569,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -6608,10 +6618,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -6658,10 +6668,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -6708,10 +6718,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -6758,10 +6768,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -6808,10 +6818,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -6858,10 +6868,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -6908,10 +6918,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -6958,10 +6968,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -7009,10 +7019,10 @@ "chapter": 3, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -7058,10 +7068,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -7107,10 +7117,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -7157,10 +7167,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -7207,10 +7217,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -7257,10 +7267,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -7307,10 +7317,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -7357,10 +7367,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -7407,10 +7417,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -7457,10 +7467,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -7508,10 +7518,10 @@ "chapter": 4, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -7557,10 +7567,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -7606,10 +7616,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -7656,10 +7666,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -7706,10 +7716,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -7756,10 +7766,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -7806,10 +7816,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -7856,10 +7866,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -7906,10 +7916,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -7956,10 +7966,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -8007,10 +8017,10 @@ "chapter": 5, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -8056,10 +8066,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -8105,10 +8115,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -8155,10 +8165,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -8205,10 +8215,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -8255,10 +8265,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "img_100lc", "FormatList": [ @@ -8305,10 +8315,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -8355,10 +8365,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -8405,10 +8415,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -8455,10 +8465,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -8506,10 +8516,10 @@ "chapter": 6, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "0", "FormatList": [ @@ -8555,10 +8565,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -8604,10 +8614,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -8654,10 +8664,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -8704,10 +8714,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -8754,10 +8764,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -8804,10 +8814,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -8854,10 +8864,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -8904,10 +8914,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -8954,10 +8964,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -9005,10 +9015,10 @@ "chapter": 7, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -9054,10 +9064,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -9103,10 +9113,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -9153,10 +9163,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -9203,10 +9213,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -9253,10 +9263,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -9303,10 +9313,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -9353,10 +9363,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -9403,10 +9413,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -9453,10 +9463,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -9504,10 +9514,10 @@ "chapter": 8, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "btn_txjs_xczsl", "FormatList": [ @@ -9553,10 +9563,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -9602,10 +9612,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -9652,10 +9662,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -9702,10 +9712,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -9752,10 +9762,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -9802,10 +9812,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -9852,10 +9862,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -9902,10 +9912,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -9952,10 +9962,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -10003,10 +10013,10 @@ "chapter": 9, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -10052,10 +10062,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -10101,10 +10111,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -10151,10 +10161,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -10201,10 +10211,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -10251,10 +10261,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -10301,10 +10311,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -10351,10 +10361,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -10401,10 +10411,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -10451,10 +10461,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -10502,10 +10512,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -10551,10 +10561,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -10600,10 +10610,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -10650,10 +10660,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -10700,10 +10710,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -10750,10 +10760,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -10800,10 +10810,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -10850,10 +10860,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -10900,10 +10910,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -10950,10 +10960,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -11001,10 +11011,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -11050,10 +11060,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -11099,10 +11109,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -11149,10 +11159,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -11199,10 +11209,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -11249,10 +11259,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -11299,10 +11309,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -11349,10 +11359,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -11399,10 +11409,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -11449,10 +11459,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -11500,10 +11510,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -11549,10 +11559,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -11598,10 +11608,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -11648,10 +11658,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -11698,10 +11708,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -11748,10 +11758,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "0", "FormatList": [ @@ -11798,10 +11808,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -11848,10 +11858,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -11898,10 +11908,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -11948,10 +11958,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -11999,10 +12009,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -12055,10 +12065,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -12104,10 +12114,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -12154,10 +12164,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -12204,10 +12214,10 @@ "chapter": 1, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -12254,10 +12264,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -12304,10 +12314,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -12354,10 +12364,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -12404,10 +12414,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -12454,10 +12464,10 @@ "chapter": 1, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -12505,10 +12515,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -12554,10 +12564,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -12603,10 +12613,10 @@ "chapter": 2, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -12653,10 +12663,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -12703,10 +12713,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -12753,10 +12763,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -12803,10 +12813,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -12853,10 +12863,10 @@ "chapter": 2, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -12903,10 +12913,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -12953,10 +12963,10 @@ "chapter": 2, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -13004,10 +13014,10 @@ "chapter": 3, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 474, - 601 - ], + "Episodelocation": { + "x": 474, + "y": 601 + }, "model": "", "effect": "", "FormatList": [ @@ -13053,10 +13063,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 815, - 387 - ], + "Episodelocation": { + "x": 815, + "y": 387 + }, "model": "", "effect": "", "FormatList": [ @@ -13102,10 +13112,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -13152,10 +13162,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -13202,10 +13212,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -13252,10 +13262,10 @@ "chapter": 3, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -13302,10 +13312,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -13352,10 +13362,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -13402,10 +13412,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -13452,10 +13462,10 @@ "chapter": 3, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -13503,10 +13513,10 @@ "chapter": 4, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -13552,10 +13562,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -13601,10 +13611,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -13651,10 +13661,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -13701,10 +13711,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -13751,10 +13761,10 @@ "chapter": 4, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -13801,10 +13811,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -13851,10 +13861,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -13901,10 +13911,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -13951,10 +13961,10 @@ "chapter": 4, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -14002,10 +14012,10 @@ "chapter": 5, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -14051,10 +14061,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -14100,10 +14110,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -14150,10 +14160,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -14200,10 +14210,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -14250,10 +14260,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "img_100lc", "FormatList": [ @@ -14300,10 +14310,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -14350,10 +14360,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -14400,10 +14410,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -14450,10 +14460,10 @@ "chapter": 5, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -14501,10 +14511,10 @@ "chapter": 6, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "0", "FormatList": [ @@ -14550,10 +14560,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -14599,10 +14609,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -14649,10 +14659,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -14699,10 +14709,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -14749,10 +14759,10 @@ "chapter": 6, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -14799,10 +14809,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -14849,10 +14859,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -14899,10 +14909,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -14949,10 +14959,10 @@ "chapter": 6, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -15000,10 +15010,10 @@ "chapter": 7, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -15049,10 +15059,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -15098,10 +15108,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -15148,10 +15158,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -15198,10 +15208,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -15248,10 +15258,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -15298,10 +15308,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -15348,10 +15358,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -15398,10 +15408,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -15448,10 +15458,10 @@ "chapter": 7, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -15499,10 +15509,10 @@ "chapter": 8, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "btn_txjs_xczsl", "FormatList": [ @@ -15548,10 +15558,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -15597,10 +15607,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -15647,10 +15657,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -15697,10 +15707,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -15747,10 +15757,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -15797,10 +15807,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -15847,10 +15857,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -15897,10 +15907,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -15947,10 +15957,10 @@ "chapter": 8, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -15998,10 +16008,10 @@ "chapter": 9, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -16047,10 +16057,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -16096,10 +16106,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -16146,10 +16156,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -16196,10 +16206,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -16246,10 +16256,10 @@ "chapter": 9, "route": 1, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -16296,10 +16306,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -16346,10 +16356,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -16396,10 +16406,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -16446,10 +16456,10 @@ "chapter": 9, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -16497,10 +16507,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -16546,10 +16556,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -16595,10 +16605,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -16645,10 +16655,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -16695,10 +16705,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -16745,10 +16755,10 @@ "chapter": 10, "route": 2, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -16795,10 +16805,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -16845,10 +16855,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -16895,10 +16905,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -16945,10 +16955,10 @@ "chapter": 10, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -16996,10 +17006,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "1", "FormatList": [ @@ -17045,10 +17055,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -17094,10 +17104,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -17144,10 +17154,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -17194,10 +17204,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -17244,10 +17254,10 @@ "chapter": 11, "route": 3, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "", "FormatList": [ @@ -17294,10 +17304,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -17344,10 +17354,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -17394,10 +17404,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -17444,10 +17454,10 @@ "chapter": 11, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ @@ -17495,10 +17505,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -17544,10 +17554,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 838, - 836 - ], + "Episodelocation": { + "x": 838, + "y": 836 + }, "model": "", "effect": "", "FormatList": [ @@ -17593,10 +17603,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1570, - 895 - ], + "Episodelocation": { + "x": 1570, + "y": 895 + }, "model": "", "effect": "", "FormatList": [ @@ -17643,10 +17653,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2164, - 1329 - ], + "Episodelocation": { + "x": 2164, + "y": 1329 + }, "model": "", "effect": "", "FormatList": [ @@ -17693,10 +17703,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2687, - 759 - ], + "Episodelocation": { + "x": 2687, + "y": 759 + }, "model": "", "effect": "", "FormatList": [ @@ -17743,10 +17753,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2064, - 346 - ], + "Episodelocation": { + "x": 2064, + "y": 346 + }, "model": "", "effect": "0", "FormatList": [ @@ -17793,10 +17803,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1369, - 380 - ], + "Episodelocation": { + "x": 1369, + "y": 380 + }, "model": "", "effect": "", "FormatList": [ @@ -17843,10 +17853,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 1424, - 651 - ], + "Episodelocation": { + "x": 1424, + "y": 651 + }, "model": "", "effect": "", "FormatList": [ @@ -17893,10 +17903,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 2000, - 752 - ], + "Episodelocation": { + "x": 2000, + "y": 752 + }, "model": "", "effect": "", "FormatList": [ @@ -17943,10 +17953,10 @@ "chapter": 12, "route": 4, "Episodetype": 1, - "Episodelocation": [ - 200, - 53 - ], + "Episodelocation": { + "x": 200, + "y": 53 + }, "model": "", "effect": "", "FormatList": [ diff --git a/bin/json/game_model.json b/bin/json/game_model.json index 0c69e156c..a86c1d17e 100644 --- a/bin/json/game_model.json +++ b/bin/json/game_model.json @@ -1,8 +1,32 @@ [ + { + "id": "12003", + "preson": "12003", + "presonshow": "12003", + "presonstory": "12003", + "height": 1, + "ico": "tx_js_25004", + "fight": "ytx_js_25004", + "img": "sbkp_js_12003", + "heroimg": "hbkp_js_25004", + "portrait": "portrait_12003", + "bust": "bust_25004", + "postxyz": [ + 0.08, + 0, + 0.41 + ], + "rotation": { + "x": 0, + "y": 180, + "z": 0 + } + }, { "id": "13001", "preson": "13001", "presonshow": "13001", + "presonstory": "13001", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13001", @@ -25,6 +49,7 @@ "id": "13002", "preson": "13002", "presonshow": "13002", + "presonstory": "13002", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13002", @@ -47,6 +72,7 @@ "id": "13003", "preson": "13003", "presonshow": "13003", + "presonstory": "13003", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13003", @@ -69,6 +95,7 @@ "id": "13004", "preson": "13004", "presonshow": "13004", + "presonstory": "13004", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13004", @@ -91,6 +118,7 @@ "id": "13005", "preson": "13005", "presonshow": "13005", + "presonstory": "13005", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_13005", @@ -113,6 +141,7 @@ "id": "14001", "preson": "14001", "presonshow": "14001", + "presonstory": "14001", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14001", @@ -135,6 +164,7 @@ "id": "14002", "preson": "14002", "presonshow": "14002", + "presonstory": "14002", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14002", @@ -157,6 +187,7 @@ "id": "14003", "preson": "14003", "presonshow": "14003", + "presonstory": "14003", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14003", @@ -179,6 +210,7 @@ "id": "14004", "preson": "14004", "presonshow": "14004", + "presonstory": "14004", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14004", @@ -201,6 +233,7 @@ "id": "14005", "preson": "14005", "presonshow": "14005", + "presonstory": "14005", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14005", @@ -223,6 +256,7 @@ "id": "14006", "preson": "14006", "presonshow": "14006", + "presonstory": "14006", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14006", @@ -245,6 +279,7 @@ "id": "14007", "preson": "14007", "presonshow": "14007", + "presonstory": "14007", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_14007", @@ -267,6 +302,7 @@ "id": "15001", "preson": "15001", "presonshow": "15001", + "presonstory": "15001", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15001", @@ -289,6 +325,7 @@ "id": "15002", "preson": "15002", "presonshow": "15002", + "presonstory": "15002", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15002", @@ -311,6 +348,7 @@ "id": "15003", "preson": "15003", "presonshow": "15003", + "presonstory": "15003", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15003", @@ -333,6 +371,7 @@ "id": "15004", "preson": "15004", "presonshow": "15004", + "presonstory": "15004", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15004", @@ -355,6 +394,7 @@ "id": "15005", "preson": "15005", "presonshow": "15005", + "presonstory": "15005", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_15005", @@ -377,6 +417,7 @@ "id": "23001", "preson": "23001", "presonshow": "23001", + "presonstory": "23001", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23001", @@ -399,6 +440,7 @@ "id": "23002", "preson": "23002", "presonshow": "23002", + "presonstory": "23002", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23002", @@ -421,6 +463,7 @@ "id": "23003", "preson": "23003", "presonshow": "23003", + "presonstory": "23003", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23003", @@ -443,6 +486,7 @@ "id": "23004", "preson": "23004", "presonshow": "23004", + "presonstory": "23004", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_23004", @@ -465,6 +509,7 @@ "id": "24001", "preson": "24001", "presonshow": "24001", + "presonstory": "24001", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_24001", @@ -487,6 +532,7 @@ "id": "24002", "preson": "24002", "presonshow": "24002", + "presonstory": "24002", "height": 1, "ico": "tx_hhjs_24003", "fight": "ytx_js_24002", @@ -509,6 +555,7 @@ "id": "24003", "preson": "24003", "presonshow": "24003", + "presonstory": "24003", "height": 1, "ico": "tx_js_24003", "fight": "ytx_js_24003", @@ -531,6 +578,7 @@ "id": "24004", "preson": "24004", "presonshow": "24004", + "presonstory": "24004", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24004", @@ -553,6 +601,7 @@ "id": "24005", "preson": "24005", "presonshow": "24005", + "presonstory": "24005", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24005", @@ -575,6 +624,7 @@ "id": "24006", "preson": "24006", "presonshow": "24006", + "presonstory": "24006", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24006", @@ -597,6 +647,7 @@ "id": "24007", "preson": "24007", "presonshow": "24007", + "presonstory": "24007", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24007", @@ -619,6 +670,7 @@ "id": "24008", "preson": "24008", "presonshow": "24008", + "presonstory": "24008", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24008", @@ -641,6 +693,7 @@ "id": "24009", "preson": "24009", "presonshow": "24009", + "presonstory": "24009", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_24009", @@ -663,6 +716,7 @@ "id": "25001", "preson": "25001", "presonshow": "25001_exhibition", + "presonstory": "25001_storyatk", "height": 1, "ico": "tx_js_25001", "fight": "ytx_js_25001", @@ -685,6 +739,7 @@ "id": "25002", "preson": "25002", "presonshow": "25002", + "presonstory": "25002", "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25002", @@ -707,6 +762,7 @@ "id": "25003", "preson": "25003", "presonshow": "25003", + "presonstory": "25003", "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25003", @@ -729,6 +785,7 @@ "id": "25004", "preson": "25004", "presonshow": "25004_exhibition", + "presonstory": "25004", "height": 1, "ico": "tx_js_25004", "fight": "ytx_js_25004", @@ -751,6 +808,7 @@ "id": "33001", "preson": "33001", "presonshow": "33001", + "presonstory": "33001", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33001", @@ -773,6 +831,7 @@ "id": "33002", "preson": "33002", "presonshow": "33002", + "presonstory": "33002", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33002", @@ -795,6 +854,7 @@ "id": "33003", "preson": "33003", "presonshow": "33003", + "presonstory": "33003", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33003", @@ -817,6 +877,7 @@ "id": "33004", "preson": "33004", "presonshow": "33004", + "presonstory": "33004", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33004", @@ -839,6 +900,7 @@ "id": "33005", "preson": "33005", "presonshow": "33005", + "presonstory": "33005", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33005", @@ -861,6 +923,7 @@ "id": "33006", "preson": "33006", "presonshow": "33006", + "presonstory": "33006", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_33006", @@ -883,6 +946,7 @@ "id": "34001", "preson": "34001", "presonshow": "34001", + "presonstory": "34001", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34001", @@ -905,6 +969,7 @@ "id": "34002", "preson": "34002", "presonshow": "34002", + "presonstory": "34002", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34002", @@ -927,6 +992,7 @@ "id": "34003", "preson": "34003", "presonshow": "34003", + "presonstory": "34003", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34003", @@ -949,6 +1015,7 @@ "id": "34004", "preson": "34004", "presonshow": "34004", + "presonstory": "34004", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34004", @@ -971,6 +1038,7 @@ "id": "34005", "preson": "34005", "presonshow": "34005", + "presonstory": "34005", "height": 1, "ico": "tx_hhjs_34006", "fight": "ytx_js_34005", @@ -993,6 +1061,7 @@ "id": "34006", "preson": "34006", "presonshow": "34006", + "presonstory": "34006", "height": 1, "ico": "tx_js_34006", "fight": "ytx_js_34006", @@ -1015,6 +1084,7 @@ "id": "34007", "preson": "34007", "presonshow": "34007", + "presonstory": "34007", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_34007", @@ -1037,6 +1107,7 @@ "id": "34008", "preson": "34008", "presonshow": "34008", + "presonstory": "34008", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_34008", @@ -1059,6 +1130,7 @@ "id": "35001", "preson": "35001", "presonshow": "35001", + "presonstory": "35001", "height": 1, "ico": "tx_js_35001", "fight": "ytx_js_35001", @@ -1081,6 +1153,7 @@ "id": "35002", "preson": "35002", "presonshow": "35002", + "presonstory": "35002", "height": 1, "ico": "tx_js_35002", "fight": "ytx_js_35002", @@ -1103,6 +1176,7 @@ "id": "35003", "preson": "35003", "presonshow": "35003", + "presonstory": "35003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35003", @@ -1125,6 +1199,7 @@ "id": "35004", "preson": "35004", "presonshow": "35004", + "presonstory": "35004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35004", @@ -1147,6 +1222,7 @@ "id": "35005", "preson": "35005", "presonshow": "35005", + "presonstory": "35005", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35005", @@ -1169,6 +1245,7 @@ "id": "35006", "preson": "35006", "presonshow": "35006", + "presonstory": "35006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35006", @@ -1191,6 +1268,7 @@ "id": "43001", "preson": "43001", "presonshow": "43001", + "presonstory": "43001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43001", @@ -1213,6 +1291,7 @@ "id": "43002", "preson": "43002", "presonshow": "43002", + "presonstory": "43002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43002", @@ -1235,6 +1314,7 @@ "id": "43003", "preson": "43003", "presonshow": "43003", + "presonstory": "43003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43003", @@ -1257,6 +1337,7 @@ "id": "43004", "preson": "43004", "presonshow": "43004", + "presonstory": "43004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43004", @@ -1279,6 +1360,7 @@ "id": "43005", "preson": "43005", "presonshow": "43005", + "presonstory": "43005", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43005", @@ -1301,6 +1383,7 @@ "id": "43006", "preson": "43006", "presonshow": "43006", + "presonstory": "43006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43006", @@ -1323,6 +1406,7 @@ "id": "43007", "preson": "43007", "presonshow": "43007", + "presonstory": "43007", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43007", @@ -1345,6 +1429,7 @@ "id": "44001", "preson": "44001", "presonshow": "44001", + "presonstory": "44001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44001", @@ -1367,6 +1452,7 @@ "id": "44002", "preson": "44002", "presonshow": "44002", + "presonstory": "44002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44002", @@ -1389,6 +1475,7 @@ "id": "44003", "preson": "44003", "presonshow": "44003", + "presonstory": "44003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44003", @@ -1411,6 +1498,7 @@ "id": "44004", "preson": "44004", "presonshow": "44004", + "presonstory": "44004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44004", @@ -1433,6 +1521,7 @@ "id": "44005", "preson": "44005", "presonshow": "44005", + "presonstory": "44005", "height": 1, "ico": "tx_js_44005", "fight": "ytx_js_44005", @@ -1455,6 +1544,7 @@ "id": "44006", "preson": "44006", "presonshow": "44006", + "presonstory": "44006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44006", @@ -1477,6 +1567,7 @@ "id": "45001", "preson": "45001", "presonshow": "45001", + "presonstory": "45001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45001", @@ -1499,6 +1590,7 @@ "id": "45002", "preson": "45002", "presonshow": "45002", + "presonstory": "45002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45002", @@ -1521,6 +1613,7 @@ "id": "45003", "preson": "45003", "presonshow": "45003", + "presonstory": "45003", "height": 1, "ico": "tx_hhjs_45003", "fight": "ytx_js_45003", @@ -1543,6 +1636,7 @@ "id": "45004", "preson": "45004", "presonshow": "45004", + "presonstory": "45004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_45004", @@ -1565,6 +1659,7 @@ "id": "43901", "preson": "43901", "presonshow": "43901", + "presonstory": "43901", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43901", @@ -1587,6 +1682,7 @@ "id": "42911", "preson": "42911", "presonshow": "42911", + "presonstory": "42911", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_42911", @@ -1609,6 +1705,7 @@ "id": "43911", "preson": "43911", "presonshow": "43911", + "presonstory": "43911", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_43911", @@ -1631,6 +1728,7 @@ "id": "44911", "preson": "44911", "presonshow": "44911", + "presonstory": "44911", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_44911", @@ -1653,6 +1751,7 @@ "id": "43921", "preson": "43921", "presonshow": "43921", + "presonstory": "43921", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", @@ -1675,6 +1774,7 @@ "id": "44921", "preson": "44921", "presonshow": "44921", + "presonstory": "44921", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", @@ -1697,6 +1797,7 @@ "id": "45921", "preson": "45921", "presonshow": "45921", + "presonstory": "45921", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_35002", @@ -1719,6 +1820,7 @@ "id": "51001", "preson": "51001", "presonshow": "51001", + "presonstory": "51001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51001", @@ -1741,6 +1843,7 @@ "id": "51002", "preson": "51002", "presonshow": "51002", + "presonstory": "51002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51002", @@ -1763,6 +1866,7 @@ "id": "51003", "preson": "51003", "presonshow": "51003", + "presonstory": "51003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51003", @@ -1785,6 +1889,7 @@ "id": "51004", "preson": "51004", "presonshow": "51004", + "presonstory": "51004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51004", @@ -1807,6 +1912,7 @@ "id": "51005", "preson": "51005", "presonshow": "51005", + "presonstory": "51005", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51005", @@ -1829,6 +1935,7 @@ "id": "51006", "preson": "51006", "presonshow": "51006", + "presonstory": "51006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51006", @@ -1851,6 +1958,7 @@ "id": "51007", "preson": "51007", "presonshow": "51007", + "presonstory": "51007", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51007", @@ -1873,6 +1981,7 @@ "id": "51008", "preson": "51008", "presonshow": "51008", + "presonstory": "51008", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51008", @@ -1895,6 +2004,7 @@ "id": "51009", "preson": "51009", "presonshow": "51009", + "presonstory": "51009", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51009", @@ -1917,6 +2027,7 @@ "id": "51010", "preson": "51010", "presonshow": "51010", + "presonstory": "51010", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51010", @@ -1939,6 +2050,7 @@ "id": "51011", "preson": "51011", "presonshow": "51011", + "presonstory": "51011", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51011", @@ -1961,6 +2073,7 @@ "id": "51012", "preson": "51012", "presonshow": "51012", + "presonstory": "51012", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51012", @@ -1983,6 +2096,7 @@ "id": "51013", "preson": "51013", "presonshow": "51013", + "presonstory": "51013", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51013", @@ -2005,6 +2119,7 @@ "id": "51014", "preson": "51014", "presonshow": "51014", + "presonstory": "51014", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_51014", @@ -2027,6 +2142,7 @@ "id": "53001", "preson": "53001", "presonshow": "53001", + "presonstory": "53001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53001", @@ -2049,6 +2165,7 @@ "id": "53002", "preson": "53002", "presonshow": "53002", + "presonstory": "53002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53002", @@ -2071,6 +2188,7 @@ "id": "53003", "preson": "53003", "presonshow": "53003", + "presonstory": "53003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53003", @@ -2093,6 +2211,7 @@ "id": "53004", "preson": "53004", "presonshow": "53004", + "presonstory": "53004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53004", @@ -2115,6 +2234,7 @@ "id": "53005", "preson": "53005", "presonshow": "53005", + "presonstory": "53005", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53005", @@ -2137,6 +2257,7 @@ "id": "53006", "preson": "53006", "presonshow": "53006", + "presonstory": "53006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_53006", @@ -2159,6 +2280,7 @@ "id": "55001", "preson": "55001", "presonshow": "55001", + "presonstory": "55001", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55001", @@ -2181,6 +2303,7 @@ "id": "55002", "preson": "55002", "presonshow": "55002", + "presonstory": "55002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55002", @@ -2203,6 +2326,7 @@ "id": "55003", "preson": "55002", "presonshow": "55002", + "presonstory": "55002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55003", @@ -2225,6 +2349,7 @@ "id": "55004", "preson": "55004", "presonshow": "55004", + "presonstory": "55004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55004", @@ -2247,6 +2372,7 @@ "id": "55005", "preson": "55004", "presonshow": "55004", + "presonstory": "55004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55005", @@ -2269,6 +2395,7 @@ "id": "55006", "preson": "55006", "presonshow": "55006", + "presonstory": "55006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55006", @@ -2291,6 +2418,7 @@ "id": "55007", "preson": "55007", "presonshow": "55007", + "presonstory": "55007", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_55007", @@ -2313,6 +2441,7 @@ "id": "63002", "preson": "63002", "presonshow": "63002", + "presonstory": "63002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63002", @@ -2335,6 +2464,7 @@ "id": "63003", "preson": "63003", "presonshow": "63003", + "presonstory": "63003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63003", @@ -2357,6 +2487,7 @@ "id": "63004", "preson": "63004", "presonshow": "63004", + "presonstory": "63004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_63004", @@ -2379,6 +2510,7 @@ "id": "64003", "preson": "64003", "presonshow": "64003", + "presonstory": "64003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_64003", @@ -2401,6 +2533,7 @@ "id": "74002", "preson": "74002", "presonshow": "74002", + "presonstory": "74002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74002", @@ -2423,6 +2556,7 @@ "id": "74003", "preson": "74003", "presonshow": "74003", + "presonstory": "74003", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74003", @@ -2445,6 +2579,7 @@ "id": "74004", "preson": "74004", "presonshow": "74004", + "presonstory": "74004", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_74004", @@ -2467,6 +2602,7 @@ "id": "83002", "preson": "83002", "presonshow": "83002", + "presonstory": "83002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_83002", @@ -2489,6 +2625,7 @@ "id": "83006", "preson": "83006", "presonshow": "83006", + "presonstory": "83006", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_83006", @@ -2511,6 +2648,7 @@ "id": "84002", "preson": "84002", "presonshow": "84002", + "presonstory": "84002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_84002", @@ -2533,6 +2671,7 @@ "id": "94002", "preson": "94002", "presonshow": "94002", + "presonstory": "94002", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_94002", @@ -2555,6 +2694,7 @@ "id": "94005", "preson": "94005", "presonshow": "94005", + "presonstory": "94005", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_94005", @@ -2577,6 +2717,7 @@ "id": "64007", "preson": "64007", "presonshow": "64007", + "presonstory": "64007", "height": 1, "ico": "tx_hhjs_35002", "fight": "ytx_js_64007", diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json index a7079b718..da554f417 100644 --- a/bin/json/game_opencond.json +++ b/bin/json/game_opencond.json @@ -209,7 +209,7 @@ "key": "num_1007", "text": "维京远征" }, - "main": 9, + "main": 0, "optional": "", "wkqbx": 0, "kqbx": 0, @@ -226,7 +226,7 @@ "key": "num_1007", "text": "维京远征" }, - "main": 10, + "main": 0, "optional": "", "wkqbx": 0, "kqbx": 0, @@ -243,7 +243,7 @@ "key": "num_1007", "text": "维京远征" }, - "main": 11, + "main": 0, "optional": "", "wkqbx": 0, "kqbx": 0, @@ -442,9 +442,26 @@ "uiid": 0 }, { - "id": "channel_lock_icon", + "id": "hunting", "name": { "key": "num_1019", + "text": "狩猎" + }, + "main": 0, + "optional": "", + "wkqbx": 0, + "kqbx": 0, + "img": "", + "prompt": { + "key": "opencond_prompt_10002", + "text": "暂不开启，敬请期待" + }, + "uiid": 0 + }, + { + "id": "channel_lock_icon", + "name": { + "key": "num_2020", "text": "聊天" }, "main": 10, @@ -461,7 +478,7 @@ { "id": "channel_lock_world", "name": { - "key": "num_1020", + "key": "num_2021", "text": "世界" }, "main": 10, @@ -478,7 +495,7 @@ { "id": "channel_lock_guild", "name": { - "key": "num_1021", + "key": "num_2022", "text": "公会" }, "main": 20, @@ -495,7 +512,7 @@ { "id": "channel_lock_private", "name": { - "key": "num_1022", + "key": "num_2023", "text": "私聊" }, "main": 15, @@ -512,7 +529,7 @@ { "id": "channel_lock_public", "name": { - "key": "num_1023", + "key": "num_2024", "text": "跨服" }, "main": 40, @@ -529,7 +546,7 @@ { "id": "channel_lock_system", "name": { - "key": "num_1024", + "key": "num_2025", "text": "系统" }, "main": 10, diff --git a/bin/json/game_rdtaskside.json b/bin/json/game_rdtaskside.json index 9cd06fafb..d0f7a47e8 100644 --- a/bin/json/game_rdtaskside.json +++ b/bin/json/game_rdtaskside.json @@ -21,7 +21,7 @@ "id": 1002, "objType": 1, "location": "middle", - "modelaction": "", + "modelaction": "enter", "modelstate": 1, "point": "model_02", "storyBegin": 4, diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json index eef8c728a..ae0687610 100644 --- a/bin/json/game_skillafteratk.json +++ b/bin/json/game_skillafteratk.json @@ -6852,5 +6852,696 @@ "SucFollowSK": [], "FailFollowSK": [], "MustHit": false + }, + { + "Id": 215004011, + "EmitPR": 1000, + "From": 1, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001326, + 1000, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004111, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 2, + "Type": 1, + "Argu": [ + 1, + 4, + 300 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004112, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004113, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 12, + "Argu": [ + 100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004122, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004132, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004142, + "EmitPR": 1000, + "From": 4, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004113 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 700 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 750, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004221, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004222, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 750, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004231, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004232, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 850, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004241, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 800 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004242, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 850, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004311, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300 + ], + "FollowSK": [ + 215004313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004312, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 300 + ], + "FollowSK": [ + 215004313 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004313, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 2, + 1, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004314 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004314, + "EmitPR": 1000, + "From": 9, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + -100 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004322, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 350 + ], + "FollowSK": [ + 215004323 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004323, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 2, + 1, + 400 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004314 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004332, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 350 + ], + "FollowSK": [ + 215004333 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004333, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 2, + 1, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004314 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004342, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 400 + ], + "FollowSK": [ + 215004343 + ], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 215004343, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 7, + "Argu": [ + 0, + 2, + 1, + 500 + ], + "FollowSK": [], + "SucFollowSK": [ + 215004314 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004211, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 700 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004212, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 750, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [ + 915004213 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004213, + "EmitPR": 1000, + "From": 3, + "Where": [], + "Order": [], + "Limit": 1, + "ExecuteCnt": 1, + "Type": 11, + "Argu": [ + 150, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004221, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004222, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 750, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [ + 915004213 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004231, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 750 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004232, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 850, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [ + 915004213 + ], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004241, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 1, + "Argu": [ + 1, + 4, + 800 + ], + "FollowSK": [], + "SucFollowSK": [], + "FailFollowSK": [], + "MustHit": false + }, + { + "Id": 915004242, + "EmitPR": 1000, + "From": 2, + "Where": [], + "Order": [], + "Limit": 10, + "ExecuteCnt": 1, + "Type": 3, + "Argu": [ + 390001105, + 850, + 1, + 1 + ], + "FollowSK": [], + "SucFollowSK": [ + 915004213 + ], + "FailFollowSK": [], + "MustHit": false } ] \ No newline at end of file diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json index d67767ac0..314b9dfc0 100644 --- a/bin/json/game_skillatk.json +++ b/bin/json/game_skillatk.json @@ -930,7 +930,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 0, + "CD": 4, "Target": 1, "ChildSkill": { "Id": [ @@ -953,7 +953,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 4, + "CD": 3, "Target": 1, "ChildSkill": { "Id": [ @@ -976,7 +976,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 3, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -1096,7 +1096,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -1120,7 +1120,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 4, - "CD": 3, + "CD": 4, "Target": 1, "ChildSkill": { "Id": [ @@ -1144,7 +1144,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 4, - "CD": 4, + "CD": 3, "Target": 1, "ChildSkill": { "Id": [ @@ -1166,9 +1166,9 @@ "text": "杰克队长技" }, "ico": "jn_dzj_01", - "act": "Skill_1", + "act": "", "Type": 3, - "CD": 3, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -1188,9 +1188,9 @@ "text": "杰克1技能" }, "ico": "jn_icon_001", - "act": "Skill_2", + "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -1210,7 +1210,7 @@ "text": "杰克1技能" }, "ico": "jn_icon_001", - "act": "Skill_2", + "act": "Skill_1", "Type": 1, "CD": 0, "Target": 2, @@ -1232,7 +1232,7 @@ "text": "杰克1技能" }, "ico": "jn_icon_001", - "act": "Skill_2", + "act": "Skill_1", "Type": 1, "CD": 0, "Target": 2, @@ -1254,7 +1254,7 @@ "text": "杰克1技能" }, "ico": "jn_icon_001", - "act": "Skill_2", + "act": "Skill_1", "Type": 1, "CD": 0, "Target": 2, @@ -1276,7 +1276,7 @@ "text": "杰克1技能" }, "ico": "jn_icon_001", - "act": "Skill_2", + "act": "Skill_1", "Type": 1, "CD": 0, "Target": 2, @@ -1298,9 +1298,9 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 1, - "CD": 0, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -1320,7 +1320,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 1, "CD": 5, "Target": 2, @@ -1342,7 +1342,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 1, "CD": 5, "Target": 2, @@ -1364,7 +1364,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 1, "CD": 5, "Target": 2, @@ -1386,9 +1386,9 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 1, - "CD": 5, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -1408,7 +1408,7 @@ "text": "杰克3技能" }, "ico": "jn_icon_003", - "act": "Skill_2", + "act": "Skill_3", "Type": 1, "CD": 4, "Target": 2, @@ -1430,7 +1430,7 @@ "text": "杰克3技能" }, "ico": "jn_icon_003", - "act": "Skill_2", + "act": "Skill_3", "Type": 1, "CD": 4, "Target": 2, @@ -1452,7 +1452,7 @@ "text": "杰克3技能" }, "ico": "jn_icon_003", - "act": "Skill_2", + "act": "Skill_3", "Type": 1, "CD": 4, "Target": 2, @@ -1474,7 +1474,7 @@ "text": "杰克3技能" }, "ico": "jn_icon_003", - "act": "Skill_2", + "act": "Skill_3", "Type": 1, "CD": 4, "Target": 2, @@ -1496,9 +1496,9 @@ "text": "杰克3技能" }, "ico": "jn_icon_003", - "act": "Skill_2", + "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -1518,9 +1518,9 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 4, - "CD": 3, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -1540,7 +1540,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 4, "CD": 5, "Target": 2, @@ -1562,7 +1562,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 4, "CD": 5, "Target": 2, @@ -1584,7 +1584,7 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 4, "CD": 5, "Target": 2, @@ -1606,9 +1606,9 @@ "text": "杰克2技能" }, "ico": "jn_icon_002", - "act": "Skill_3", + "act": "Skill_2", "Type": 4, - "CD": 5, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -1630,7 +1630,7 @@ "ico": "jn_dzj_01", "act": "", "Type": 3, - "CD": 4, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -1652,7 +1652,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -1762,7 +1762,7 @@ "ico": "jn_icon_002", "act": "", "Type": 2, - "CD": 0, + "CD": 4, "Target": 1, "ChildSkill": { "Id": [ @@ -1850,7 +1850,7 @@ "ico": "jn_icon_002", "act": "", "Type": 2, - "CD": 4, + "CD": 3, "Target": 1, "ChildSkill": { "Id": [ @@ -1872,7 +1872,7 @@ "ico": "", "act": "Skill_2", "Type": 0, - "CD": 3, + "CD": 0, "Target": 1, "ChildSkill": { "Id": [ @@ -1982,7 +1982,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 0, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -2078,7 +2078,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 5, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -2194,7 +2194,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 4, + "CD": 3, "Target": 1, "ChildSkill": { "Id": [ @@ -2217,7 +2217,7 @@ "ico": "jn_dzj_01", "act": "", "Type": 3, - "CD": 3, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -2239,7 +2239,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -2349,7 +2349,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, - "CD": 0, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -2437,7 +2437,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -2459,7 +2459,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 3, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -2555,7 +2555,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 5, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -2579,7 +2579,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -2679,7 +2679,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 5, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -2704,7 +2704,7 @@ "ico": "jn_dzj_01", "act": "", "Type": 3, - "CD": 4, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -2726,7 +2726,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -2888,7 +2888,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, - "CD": 0, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -2980,7 +2980,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Target": 2, "ChildSkill": { "Id": [ @@ -3003,7 +3003,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 2, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -3078,7 +3078,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -3203,7 +3203,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 1, - "CD": 3, + "CD": 2, "Target": 2, "ChildSkill": { "Id": [ @@ -3226,7 +3226,7 @@ "ico": "jn_dzj_01", "act": "", "Type": 3, - "CD": 2, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -3248,7 +3248,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -3358,7 +3358,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 0, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -3380,7 +3380,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": -1, + "CD": 4, "Target": 2, "ChildSkill": { "Id": [ @@ -3524,7 +3524,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 4, + "CD": 3, "Target": 2, "ChildSkill": { "Id": [ @@ -3548,7 +3548,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 3, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -3592,7 +3592,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -3748,7 +3748,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 0, + "CD": -1, "Target": 3, "ChildSkill": { "Id": [ @@ -3770,7 +3770,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": -1, + "CD": 6, "Target": 2, "ChildSkill": { "Id": [ @@ -3905,7 +3905,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 6, + "CD": 5, "Target": 2, "ChildSkill": { "Id": [ @@ -3932,7 +3932,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 5, + "CD": 6, "Target": 1, "ChildSkill": { "Id": [ @@ -4082,7 +4082,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 6, + "CD": 5, "Target": 1, "ChildSkill": { "Id": [ @@ -4112,7 +4112,7 @@ "ico": "jn_dzj_01", "act": "", "Type": 3, - "CD": 5, + "CD": -1, "Target": 1, "ChildSkill": { "Id": [ @@ -4134,7 +4134,7 @@ "ico": "jn_icon_001", "act": "Skill_1", "Type": 1, - "CD": -1, + "CD": 0, "Target": 2, "ChildSkill": { "Id": [ @@ -4249,7 +4249,7 @@ "ico": "jn_icon_002", "act": "Skill_2", "Type": 2, - "CD": 0, + "CD": -1, "Target": 3, "ChildSkill": { "Id": [ @@ -4271,7 +4271,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": -1, + "CD": 5, "Target": 1, "ChildSkill": { "Id": [ @@ -4371,7 +4371,7 @@ "ico": "jn_icon_003", "act": "Skill_3", "Type": 1, - "CD": 5, + "CD": 4, "Target": 1, "ChildSkill": { "Id": [ @@ -4396,7 +4396,7 @@ "ico": "jn_icon_003", "act": "Skill_2", "Type": 1, - "CD": 4, + "CD": 5, "Target": 3, "ChildSkill": { "Id": [ @@ -4408,5 +4408,487 @@ "Desc": "", "buffid": [], "map": "" + }, + { + "id": 115004011, + "level": 1, + "MaxLV": 1, + "Name": { + "key": "skillname_115004011", + "text": "小欧队长技" + }, + "ico": "jn_dzj_01", + "act": "", + "Type": 3, + "CD": -1, + "Target": 1, + "ChildSkill": { + "Id": [ + 215005011 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004111, + "level": 1, + "MaxLV": 4, + "Name": { + "key": "skillname_115004111", + "text": "小欧1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 215005111, + 215005112 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004111, + "level": 2, + "MaxLV": 4, + "Name": { + "key": "skillname_115004111", + "text": "小欧1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 215005111, + 215005122 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004111, + "level": 3, + "MaxLV": 4, + "Name": { + "key": "skillname_115004111", + "text": "小欧1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 215005111, + 215005132 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004111, + "level": 4, + "MaxLV": 4, + "Name": { + "key": "skillname_115004111", + "text": "小欧1技能" + }, + "ico": "jn_icon_001", + "act": "Skill_1", + "Type": 1, + "CD": 0, + "Target": 2, + "ChildSkill": { + "Id": [ + 215005111, + 215005142 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004211, + "level": 1, + "MaxLV": 5, + "Name": { + "key": "skillname_115004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004211, + 215004212 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004211, + "level": 2, + "MaxLV": 5, + "Name": { + "key": "skillname_115004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004221, + 215004222 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004211, + "level": 3, + "MaxLV": 5, + "Name": { + "key": "skillname_115004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004231, + 215004232 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004211, + "level": 4, + "MaxLV": 5, + "Name": { + "key": "skillname_115004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004241, + 215004242 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004211, + "level": 5, + "MaxLV": 5, + "Name": { + "key": "skillname_115004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004241, + 215004242 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 1, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 6, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004311, + 215004312 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 2, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 6, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004321, + 215004322 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 3, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 6, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004331, + 215004332 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 4, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004331, + 215004332 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 5, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 5, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004341, + 215004342 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 115004311, + "level": 6, + "MaxLV": 6, + "Name": { + "key": "skillname_115004311", + "text": "小欧3技能" + }, + "ico": "jn_icon_003", + "act": "Skill_3", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 215004341, + 215004342 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 915004211, + "level": 1, + "MaxLV": 5, + "Name": { + "key": "skillname_915004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 915004211, + 915004212 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 915004211, + "level": 2, + "MaxLV": 5, + "Name": { + "key": "skillname_915004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 915004221, + 915004222 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 915004211, + "level": 3, + "MaxLV": 5, + "Name": { + "key": "skillname_915004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 915004231, + 915004232 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 915004211, + "level": 4, + "MaxLV": 5, + "Name": { + "key": "skillname_915004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 4, + "Target": 2, + "ChildSkill": { + "Id": [ + 915004241, + 915004242 + ] + }, + "Desc": "", + "buffid": [], + "map": "" + }, + { + "id": 915004211, + "level": 5, + "MaxLV": 5, + "Name": { + "key": "skillname_915004211", + "text": "小欧2技能" + }, + "ico": "jn_icon_002", + "act": "Skill_2", + "Type": 1, + "CD": 3, + "Target": 2, + "ChildSkill": { + "Id": [ + 915004241, + 915004242 + ] + }, + "Desc": "", + "buffid": [], + "map": "" } ] \ No newline at end of file diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json index 9a6b115a9..c94c1e636 100644 --- a/bin/json/game_stroy.json +++ b/bin/json/game_stroy.json @@ -9,12 +9,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "这是什么...一朵花？", "modelstatetarget": "", "modelstate": 0, - "modelaction": "", - "state": "", + "modelaction": "enter", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -50,12 +50,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "你干什么？住手！", "modelstatetarget": "25001", "modelstate": 1, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -91,12 +91,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "谁？我？！", "modelstatetarget": "25001", "modelstate": 2, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -132,12 +132,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "蹲了这么久算是知道是谁偷了我的花了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -173,12 +173,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "不不不，你误会了，我是看到这盆花放在这里，所以才来看看。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -214,12 +214,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "少废话，老老实实(拿起骨棍).......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -255,12 +255,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "等....等等，你看看你身后！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -296,12 +296,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "想糊弄我？你还差远了!(丢出骨棍！快闪！)", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -337,12 +337,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "不是，你身后真有东西!", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -378,12 +378,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "啧啧啧（下意识回头）......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -419,12 +419,12 @@ "place": 0, "speak": "44005", "listen": "12003", - "emoji": "", "des": "波.....波比？你这是怎么了？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -460,12 +460,12 @@ "place": 0, "speak": "25001", "listen": "12003", - "emoji": "", "des": "你，你是波比？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -501,12 +501,12 @@ "place": 1, "speak": "12003", "listen": "25001", - "emoji": "", "des": ".......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -542,12 +542,12 @@ "place": 0, "speak": "25001", "listen": "12003", - "emoji": "", "des": "怎么了，波比？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -583,12 +583,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "我感觉有些不对劲......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -624,12 +624,12 @@ "place": 1, "speak": "12003", "listen": "25001", - "emoji": "", "des": "啊啊啊啊啊啊啊啊！！！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -665,12 +665,12 @@ "place": 0, "speak": "44005", "listen": "12003", - "emoji": "", "des": "快！快闪开！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -706,12 +706,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "谁能告诉我到底发生了什么？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -747,12 +747,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "管他的，先打了再说", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -788,12 +788,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "该死！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -829,12 +829,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "那真的是波比吗.....", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -870,12 +870,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "我不清楚，或许我们应该去找波比。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -911,12 +911,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "她现在在哪儿", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -952,12 +952,12 @@ "place": 1, "speak": "44005", "listen": "44005", - "emoji": "", "des": "我看她好像往维京塔方向去了。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -993,12 +993,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "我后面有时间去找她看看吧。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1034,12 +1034,12 @@ "place": 0, "speak": "25001", "listen": "25004", - "emoji": "", "des": "波比！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1075,12 +1075,12 @@ "place": 1, "speak": "25004", "listen": "25001", - "emoji": "", "des": "没时间了，我知道你要说什么，快跟我来！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1116,12 +1116,12 @@ "place": 0, "speak": "25001", "listen": "25004", - "emoji": "", "des": "等....等等！我靠，她到底要做什么？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1157,12 +1157,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "波比？你在房屋顶上做什么？！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1198,12 +1198,12 @@ "place": 0, "speak": "25001", "listen": "25004", - "emoji": "", "des": "你到这里来做什么？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1239,12 +1239,12 @@ "place": 1, "speak": "25004", "listen": "25001", - "emoji": "", "des": "安静，看！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1280,12 +1280,12 @@ "place": 0, "speak": "25001", "listen": "25004", - "emoji": "", "des": "什么鬼......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1321,12 +1321,12 @@ "place": 1, "speak": "12001", "listen": "25001", - "emoji": "", "des": "......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1362,12 +1362,12 @@ "place": 1, "speak": "12003", "listen": "25001", - "emoji": "", "des": ".......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1403,12 +1403,12 @@ "place": 1, "speak": "12018", "listen": "25001", - "emoji": "", "des": "........", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1444,12 +1444,12 @@ "place": 0, "speak": "25001", "listen": "12018", - "emoji": "", "des": "我的....老天爷，这都是什么？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1485,12 +1485,12 @@ "place": 1, "speak": "12018", "listen": "25001", - "emoji": "", "des": "啊啊啊啊啊 ！！！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1526,12 +1526,12 @@ "place": 1, "speak": "25004", "listen": "25001", - "emoji": "", "des": "不好！他们发现我们了，快跑！！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1567,12 +1567,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "天哪，已经来了这么多人了吗？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1608,12 +1608,12 @@ "place": 1, "speak": "25004", "listen": "25001", - "emoji": "", "des": "他们和我一样，早就在昨晚就知道了这些事情，今天就需要商量出对策", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1649,12 +1649,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "知道？知道什么？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1690,12 +1690,12 @@ "place": 0, "speak": "25004", "listen": "25001", - "emoji": "", "des": "不知道是因为什么原因，最近基地内出现了很多这种复制体，你准备好了就来找我，我们一起解决这件事情", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1731,12 +1731,12 @@ "place": 0, "speak": "25001", "listen": "", - "emoji": "", "des": "我应该尽快去和波比谈话，这件事让我有不好的预感，或许我也可以去和其他人先交谈一番。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1772,12 +1772,12 @@ "place": 1, "speak": "44005", "listen": "25001", - "emoji": "", "des": "我怎么感觉就我被蒙在鼓里，到底发生了啥事啊？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1813,12 +1813,12 @@ "place": 0, "speak": "25001", "listen": "44005", - "emoji": "", "des": "没，你就现在这样，挺好.....", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1854,12 +1854,12 @@ "place": 1, "speak": "44006", "listen": "25001", - "emoji": "", "des": "阿宝，最近很不太平，你切记小心", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1895,12 +1895,12 @@ "place": 0, "speak": "25001", "listen": "44006", - "emoji": "", "des": "其他师兄弟们还好吗。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1936,12 +1936,12 @@ "place": 1, "speak": "44006", "listen": "25001", - "emoji": "", "des": "你忘了吗，你还没抽到他们。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -1977,12 +1977,12 @@ "place": 0, "speak": "25001", "listen": "44006", - "emoji": "", "des": ".......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2018,12 +2018,12 @@ "place": 1, "speak": "44006", "listen": "25001", - "emoji": "", "des": "(耸耸肩)", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2059,12 +2059,12 @@ "place": 0, "speak": "25001", "listen": "44006", - "emoji": "", "des": "神龙五侠终会团聚，这段时间你自己也要小心。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2100,12 +2100,12 @@ "place": 1, "speak": "35001", "listen": "25001", - "emoji": "", "des": "快去和波比商量一下，这件事非常严重，乌龟大师也有十分不好的预感。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2141,12 +2141,12 @@ "place": 0, "speak": "25001", "listen": "35001", - "emoji": "", "des": "是的，师傅。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2182,12 +2182,12 @@ "place": 0, "speak": "25001", "listen": "25004", - "emoji": "", "des": "波比，你知道什么吗？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2223,12 +2223,12 @@ "place": 0, "speak": "44005", "listen": "25004", - "emoji": "", "des": "是要去揍什么吗？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2264,12 +2264,12 @@ "place": 0, "speak": "44006", "listen": "25004", - "emoji": "", "des": "昨晚我碰见了另一个我，虽然对方武艺尚且不精，但她的模仿能力很强。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2305,12 +2305,12 @@ "place": 0, "speak": "35001", "listen": "25004", - "emoji": "", "des": "这让我想起了大龙......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2346,12 +2346,12 @@ "place": 1, "speak": "25004", "listen": "35001", - "emoji": "", "des": "今天我们就是为了这件事而来，那个黑影，和我产生了一丝联系，他就在图书馆的附近，我们应该主动去寻找他们。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2387,12 +2387,12 @@ "place": 0, "speak": "44006", "listen": "25004", - "emoji": "", "des": "言之有理。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2428,12 +2428,12 @@ "place": 0, "speak": "35001", "listen": "25004", - "emoji": "", "des": "理应如此，封印无异于纵容，我们应该主动一些。", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2469,12 +2469,12 @@ "place": 0, "speak": "35001", "listen": "25001", - "emoji": "", "des": "阿宝，你怎么看？", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2510,12 +2510,12 @@ "place": 0, "speak": "25001", "listen": "35001", - "emoji": "", "des": "我......我觉得......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2551,12 +2551,12 @@ "place": 0, "speak": "12003", "listen": "", - "emoji": "", "des": ".......", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2592,12 +2592,12 @@ "place": 0, "speak": "25001", "listen": "12003", - "emoji": "", "des": "等等，这个是......另一个波比！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2633,12 +2633,12 @@ "place": 1, "speak": "12003", "listen": "25001", - "emoji": "", "des": "啊啊啊啊啊啊啊啊！！！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, @@ -2674,12 +2674,12 @@ "place": 0, "speak": "44005", "listen": "25001", - "emoji": "", "des": "快躲开！", "modelstatetarget": "", "modelstate": 0, "modelaction": "", - "state": "", + "speakstate": "", + "listenstate": "", "chose": [], "turn": 0, "show": 0, diff --git a/cmd/upgrade/tools/gz.go b/cmd/upgrade/tools/gz.go index 85ab1fcbc..0e6124fe0 100644 --- a/cmd/upgrade/tools/gz.go +++ b/cmd/upgrade/tools/gz.go @@ -36,7 +36,7 @@ func UnGz(tarFile, dest string) error { if err != nil { return err } - io.Copy(file, tr) + _, _ = io.Copy(file, tr) } return nil } @@ -58,7 +58,9 @@ func UnGzip(tarName, xpath string) (err error) { err = tarFile.Close() }() - os.Mkdir(xpath, 0755) + if err := os.Mkdir(xpath, 0755); err != nil { + return err + } absPath, err := filepath.Abs(xpath) if err != nil { diff --git a/cmd/upgrade/tools/zip.go b/cmd/upgrade/tools/zip.go index d75a518ae..af18dba9b 100644 --- a/cmd/upgrade/tools/zip.go +++ b/cmd/upgrade/tools/zip.go @@ -27,7 +27,9 @@ func Unzip(src string, dest string) ([]string, error) { filenames = append(filenames, fpath) if f.FileInfo().IsDir() { // Make Folder - os.MkdirAll(fpath, os.ModePerm) + if err := os.MkdirAll(fpath, os.ModePerm); err != nil { + return nil, err + } continue } // Make File diff --git a/cmd/v2/service/dbServer.go b/cmd/v2/service/dbServer.go index 28681af9d..5c1c2c311 100644 --- a/cmd/v2/service/dbServer.go +++ b/cmd/v2/service/dbServer.go @@ -81,7 +81,7 @@ func (this *DbServiceImpl) GetLubanConf(key string) *model.GenTool { val := b.Get([]byte(key)) if err = json.Unmarshal(val, model); err != nil { logrus.Errorf("get gen conf err:%v", err) - return nil + return err } return nil }); err != nil { @@ -108,7 +108,7 @@ func (this *DbServiceImpl) GetSSHConf(key string) *model.SSHModel { val := b.Get([]byte(key)) if err = json.Unmarshal(val, model); err != nil { logrus.Errorf("get gen conf err:%v", err) - return nil + return err } return nil }); err != nil { @@ -131,7 +131,7 @@ func (this *DbServiceImpl) GetPbConf() *model.PbConfModel { val := b.Get([]byte(common.BUCKET_PBCONF)) if err = json.Unmarshal(val, model); err != nil { logrus.Errorf("get gen conf err:%v", err) - return nil + return err } return nil }); err != nil { diff --git a/comm/const.go b/comm/const.go index a7b507791..b8d9a4989 100644 --- a/comm/const.go +++ b/comm/const.go @@ -60,6 +60,7 @@ const ( ModuleHunting core.M_Modules = "hunting" //狩猎 ModuleLinestory core.M_Modules = "linestory" //支线剧情 ModuleBattle core.M_Modules = "battle" //战斗 + ModuleLibrary core.M_Modules = "library" // ) //数据表名定义处 @@ -133,6 +134,8 @@ const ( // 支线剧情任务 TableLinestory = "linestory" + + TableLibrary = "library" ) //RPC服务接口定义处 diff --git a/go.mod b/go.mod index b4f5a0c85..5d5ee5424 100644 --- a/go.mod +++ b/go.mod @@ -42,137 +42,12 @@ require ( ) require ( - 4d63.com/gochecknoglobals v0.1.0 // indirect - github.com/Antonboom/errname v0.1.7 // indirect - github.com/Antonboom/nilnil v0.1.1 // indirect github.com/BurntSushi/toml v1.2.0 // indirect - github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 // indirect - github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 // indirect - github.com/Masterminds/semver v1.5.0 // indirect - github.com/OpenPeeDeeP/depguard v1.1.0 // indirect - github.com/alexkohler/prealloc v1.0.0 // indirect - github.com/alingse/asasalint v0.0.11 // indirect - github.com/ashanbrown/forbidigo v1.3.0 // indirect - github.com/ashanbrown/makezero v1.1.1 // indirect - github.com/beorn7/perks v1.0.1 // indirect - github.com/bkielbasa/cyclop v1.2.0 // indirect - github.com/blizzy78/varnamelen v0.8.0 // indirect - github.com/bombsimon/wsl/v3 v3.3.0 // indirect - github.com/breml/bidichk v0.2.3 // indirect - github.com/breml/errchkjson v0.3.0 // indirect - github.com/butuzov/ireturn v0.1.1 // indirect - github.com/charithe/durationcheck v0.0.9 // indirect - github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 // indirect - github.com/curioswitch/go-reassign v0.1.2 // indirect - github.com/daixiang0/gci v0.6.3 // indirect - github.com/denis-tingaikin/go-header v0.4.3 // indirect - github.com/esimonov/ifshort v1.0.4 // indirect - github.com/ettle/strcase v0.1.1 // indirect - github.com/fatih/structtag v1.2.0 // indirect - github.com/firefart/nonamedreturns v1.0.4 // indirect - github.com/fzipp/gocyclo v0.6.0 // indirect - github.com/go-critic/go-critic v0.6.4 // indirect - github.com/go-toolsmith/astcast v1.0.0 // indirect - github.com/go-toolsmith/astcopy v1.0.1 // indirect - github.com/go-toolsmith/astequal v1.0.2 // indirect - github.com/go-toolsmith/astfmt v1.0.0 // indirect - github.com/go-toolsmith/astp v1.0.0 // indirect - github.com/go-toolsmith/strparse v1.0.0 // indirect - github.com/go-toolsmith/typep v1.0.2 // indirect - github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b // indirect - github.com/gobwas/glob v0.2.3 // indirect - github.com/gofrs/flock v0.8.1 // indirect - github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 // indirect - github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a // indirect - github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe // indirect - github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a // indirect - github.com/golangci/golangci-lint v1.49.0 // indirect - github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 // indirect - github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca // indirect - github.com/golangci/misspell v0.3.5 // indirect - github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 // indirect - github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 // indirect - github.com/google/go-cmp v0.5.8 // indirect - github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 // indirect - github.com/gostaticanalysis/analysisutil v0.7.1 // indirect - github.com/gostaticanalysis/comment v1.4.2 // indirect - github.com/gostaticanalysis/forcetypeassert v0.1.0 // indirect - github.com/gostaticanalysis/nilerr v0.1.1 // indirect - github.com/hashicorp/go-version v1.6.0 // indirect - github.com/hexops/gotextdiff v1.0.3 // indirect - github.com/jgautheron/goconst v1.5.1 // indirect - github.com/jingyugao/rowserrcheck v1.1.1 // indirect - github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af // indirect github.com/jtolds/gls v4.20.0+incompatible // indirect - github.com/julz/importas v0.1.0 // indirect - github.com/kisielk/errcheck v1.6.2 // indirect - github.com/kisielk/gotool v1.0.0 // indirect github.com/kr/fs v0.1.0 // indirect - github.com/kulti/thelper v0.6.3 // indirect - github.com/kunwardeep/paralleltest v1.0.6 // indirect - github.com/kyoh86/exportloopref v0.1.8 // indirect - github.com/ldez/gomoddirectives v0.2.3 // indirect - github.com/ldez/tagliatelle v0.3.1 // indirect - github.com/leonklingele/grouper v1.1.0 // indirect - github.com/lufeee/execinquery v1.2.1 // indirect - github.com/maratori/testpackage v1.1.0 // indirect - github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 // indirect - github.com/mattn/go-runewidth v0.0.9 // indirect - github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect - github.com/mbilski/exhaustivestruct v1.2.0 // indirect - github.com/mgechev/revive v1.2.3 // indirect - github.com/moricho/tparallel v0.2.1 // indirect - github.com/nakabonne/nestif v0.3.1 // indirect - github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 // indirect - github.com/nishanths/exhaustive v0.8.1 // indirect - github.com/nishanths/predeclared v0.2.2 // indirect - github.com/olekukonko/tablewriter v0.0.5 // indirect - github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d // indirect - github.com/polyfloyd/go-errorlint v1.0.2 // indirect - github.com/prometheus/client_golang v1.12.1 // indirect - github.com/prometheus/client_model v0.2.0 // indirect - github.com/prometheus/common v0.32.1 // indirect - github.com/prometheus/procfs v0.7.3 // indirect - github.com/quasilyte/go-ruleguard v0.3.17 // indirect - github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 // indirect - github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 // indirect - github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 // indirect - github.com/ryancurrah/gomodguard v1.2.4 // indirect - github.com/ryanrolds/sqlclosecheck v0.3.0 // indirect - github.com/sanposhiho/wastedassign/v2 v2.0.6 // indirect - github.com/sashamelentyev/interfacebloat v1.1.0 // indirect - github.com/sashamelentyev/usestdlibvars v1.13.0 // indirect - github.com/securego/gosec/v2 v2.13.1 // indirect - github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c // indirect - github.com/sivchari/containedctx v1.0.2 // indirect - github.com/sivchari/nosnakecase v1.7.0 // indirect - github.com/sivchari/tenv v1.7.0 // indirect + github.com/onsi/gomega v1.20.0 // indirect + github.com/rogpeppe/go-internal v1.8.1 // indirect github.com/smartystreets/assertions v1.2.0 // indirect - github.com/sonatard/noctx v0.0.1 // indirect - github.com/sourcegraph/go-diff v0.6.1 // indirect - github.com/ssgreg/nlreturn/v2 v2.2.1 // indirect - github.com/stbenjam/no-sprintf-host-port v0.1.1 // indirect - github.com/stretchr/objx v0.4.0 // indirect - github.com/sylvia7788/contextcheck v1.0.6 // indirect - github.com/tdakkota/asciicheck v0.1.1 // indirect - github.com/tetafro/godot v1.4.11 // indirect - github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 // indirect - github.com/timonwong/logrlint v0.1.0 // indirect - github.com/tomarrell/wrapcheck/v2 v2.6.2 // indirect - github.com/tommy-muehle/go-mnd/v2 v2.5.0 // indirect - github.com/ultraware/funlen v0.0.3 // indirect - github.com/ultraware/whitespace v0.0.5 // indirect - github.com/uudashr/gocognit v1.0.6 // indirect - github.com/yagipy/maintidx v1.0.0 // indirect - github.com/yeya24/promlinter v0.2.0 // indirect - gitlab.com/bosi/decorder v0.2.3 // indirect - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect - golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d // indirect - honnef.co/go/tools v0.3.3 // indirect - mvdan.cc/gofumpt v0.3.1 // indirect - mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed // indirect - mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b // indirect - mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 // indirect ) require ( diff --git a/go.sum b/go.sum index a4186d352..e78f4fd52 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,3 @@ -4d63.com/gochecknoglobals v0.1.0 h1:zeZSRqj5yCg28tCkIV/z/lWbwvNm5qnKVS15PI8nhD0= -4d63.com/gochecknoglobals v0.1.0/go.mod h1:wfdC5ZjKSPr7CybKEcgJhUOgeAQW1+7WcyK8OvUilfo= cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.31.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= @@ -53,28 +51,15 @@ fyne.io/fyne/v2 v2.2.3/go.mod h1:MBoGuHzLLSXdQOWFAwWhIhYTEMp33zqtGCReSWhaQTA= fyne.io/systray v1.10.1-0.20220621085403-9a2652634e93 h1:V2IC9t0Zj9Ur6qDbfhUuzVmIvXKFyxZXRJyigUvovs4= fyne.io/systray v1.10.1-0.20220621085403-9a2652634e93/go.mod h1:oM2AQqGJ1AMo4nNqZFYU8xYygSBZkW2hmdJ7n4yjedE= git.apache.org/thrift.git v0.0.0-20180902110319-2566ecd5d999/go.mod h1:fPE2ZNJGynbRyZ4dJvy6G277gSllfV2HJqblrnkyeyg= -github.com/Antonboom/errname v0.1.7 h1:mBBDKvEYwPl4WFFNwec1CZO096G6vzK9vvDQzAwkako= -github.com/Antonboom/errname v0.1.7/go.mod h1:g0ONh16msHIPgJSGsecu1G/dcF2hlYR/0SddnIAGavU= -github.com/Antonboom/nilnil v0.1.1 h1:PHhrh5ANKFWRBh7TdYmyyq2gyT2lotnvFvvFbylF81Q= -github.com/Antonboom/nilnil v0.1.1/go.mod h1:L1jBqoWM7AOeTD+tSquifKSesRHs4ZdaxvZR+xdJEaI= github.com/BabySid/gobase v0.0.0-20220614103908-39ac0a583c02 h1:4VkwDX+9araWz3MeAx/3EAWuQTu+dYnJqBlYrk86i4k= github.com/BabySid/gobase v0.0.0-20220614103908-39ac0a583c02/go.mod h1:psRlcjEywZdxNf9jp6IdYY7VcAsYPtcnLHYQ+dWG5uw= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= -github.com/BurntSushi/toml v1.1.0 h1:ksErzDEI1khOiGPgpwuI7x2ebx/uXQNw7xJpn9Eq1+I= github.com/BurntSushi/toml v1.1.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo= github.com/ChimeraCoder/gojson v1.1.0/go.mod h1:nYbTQlu6hv8PETM15J927yM0zGj3njIldp72UT1MqSw= github.com/DataDog/datadog-go v3.2.0+incompatible/go.mod h1:LButxg5PwREeZtORoXG3tL4fMGNddJ+vMq1mwgfaqoQ= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24 h1:sHglBQTwgx+rWPdisA5ynNEsoARbiCBOyGcJM4/OzsM= -github.com/Djarvur/go-err113 v0.0.0-20210108212216-aea10b59be24/go.mod h1:4UJr5HIiMZrwgkSPdsjy2uOQExX/WEILpIrO9UPGuXs= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0 h1:+r1rSv4gvYn0wmRjC8X7IAzX8QezqtFV9m0MUHFJgts= -github.com/GaijinEntertainment/go-exhaustruct/v2 v2.3.0/go.mod h1:b3g59n2Y+T5xmcxJL+UEG2f8cQploZm1mR/v6BW0mU0= -github.com/Masterminds/semver v1.5.0 h1:H65muMkzWKEuNDnfl9d70GUjFniHKHRbFPGBuZ3QEww= -github.com/Masterminds/semver v1.5.0/go.mod h1:MB6lktGJrhw8PrUyiEoblNEGEQ+RzHPF078ddwwvV3Y= -github.com/OpenPeeDeeP/depguard v1.1.0 h1:pjK9nLPS1FwQYGGpPxoMYpe7qACHOhAWQMQzV71i49o= -github.com/OpenPeeDeeP/depguard v1.1.0/go.mod h1:JtAMzWkmFEzDPyAd+W0NHl1lvpQKTvT9jnRVsohBKpc= github.com/Pallinder/go-randomdata v1.2.0 h1:DZ41wBchNRb/0GfsePLiSwb0PHZmT67XY00lCDlaYPg= github.com/Pallinder/go-randomdata v1.2.0/go.mod h1:yHmJgulpD2Nfrm0cR9tI/+oAgRqCQQixsA8HyRZfV9Y= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= @@ -88,11 +73,6 @@ github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuy github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= github.com/alecthomas/units v0.0.0-20190717042225-c3de453c63f4/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0= -github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod h1:rBZYJk541a8SKzHPHnH3zbiI+7dagKZ0cgpgrD7Fyho= -github.com/alexkohler/prealloc v1.0.0 h1:Hbq0/3fJPQhNkN0dR95AVrr6R7tou91y0uHG5pOcUuw= -github.com/alexkohler/prealloc v1.0.0/go.mod h1:VetnK3dIgFBBKmg0YnD9F9x6Icjd+9cvfHR56wJVlKE= -github.com/alingse/asasalint v0.0.11 h1:SFwnQXJ49Kx/1GghOFz1XGqHYKp21Kq1nHad/0WQRnw= -github.com/alingse/asasalint v0.0.11/go.mod h1:nCaoMhw7a9kSJObvQyVzNTPBDbNpdocqrSP7t/cW5+I= github.com/aliyun/alibaba-cloud-sdk-go v1.61.18/go.mod h1:v8ESoHo4SyHmuB4b1tJqDHxfTGEciD+yhvOU/5s1Rfk= github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= @@ -107,10 +87,6 @@ github.com/armon/go-metrics v0.3.10 h1:FR+drcQStOe+32sYyJYyZ7FIdgoGGBnwLl+flodp8 github.com/armon/go-metrics v0.3.10/go.mod h1:4O98XIr/9W0sxpJ8UaYkvjk10Iff7SnFrb4QAOwNTFc= github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8= -github.com/ashanbrown/forbidigo v1.3.0 h1:VkYIwb/xxdireGAdJNZoo24O4lmnEWkactplBlWTShc= -github.com/ashanbrown/forbidigo v1.3.0/go.mod h1:vVW7PEdqEFqapJe95xHkTfB1+XvZXBFg8t0sG2FIxmI= -github.com/ashanbrown/makezero v1.1.1 h1:iCQ87C0V0vSyO+M9E/FZYbu65auqH0lnsOkf5FcB28s= -github.com/ashanbrown/makezero v1.1.1/go.mod h1:i1bJLCRSCHOcOa9Y6MyF2FTfMZMFdHvxKHxgO5Z1axI= github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4= github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI= github.com/aws/aws-sdk-go v1.34.28 h1:sscPpn/Ns3i0F4HPEWAVcwdIRaZZCuL7llJ2/60yPIk= @@ -119,27 +95,14 @@ github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 h1:OYA+5W64v3OgClL+I github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394/go.mod h1:Q8n74mJTIgjX4RBBcHnJ05h//6/k6foqmgE45jTQtxg= github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q= github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8= -github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM= github.com/beorn7/perks v1.0.1/go.mod h1:G2ZrVWU2WbWT9wwq4/hrbKbnv/1ERSJQ0ibhJ6rlkpw= github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs= github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM= -github.com/bkielbasa/cyclop v1.2.0 h1:7Jmnh0yL2DjKfw28p86YTd/B4lRGcNuu12sKE35sM7A= -github.com/bkielbasa/cyclop v1.2.0/go.mod h1:qOI0yy6A7dYC4Zgsa72Ppm9kONl0RoIlPbzot9mhmeI= -github.com/blizzy78/varnamelen v0.8.0 h1:oqSblyuQvFsW1hbBHh1zfwrKe3kcSj0rnXkKzsQ089M= -github.com/blizzy78/varnamelen v0.8.0/go.mod h1:V9TzQZ4fLJ1DSrjVDfl89H7aMnTvKkApdHeyESmyR7k= github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= -github.com/bombsimon/wsl/v3 v3.3.0 h1:Mka/+kRLoQJq7g2rggtgQsjuI/K5Efd87WX96EWFxjM= -github.com/bombsimon/wsl/v3 v3.3.0/go.mod h1:st10JtZYLE4D5sC7b8xV4zTKZwAQjCH/Hy2Pm1FNZIc= github.com/bradfitz/go-smtpd v0.0.0-20170404230938-deb6d6237625/go.mod h1:HYsPBTaaSFSlLx/70C2HPIMNZpVV8+vt/A+FMnYP11g= -github.com/breml/bidichk v0.2.3 h1:qe6ggxpTfA8E75hdjWPZ581sY3a2lnl0IRxLQFelECI= -github.com/breml/bidichk v0.2.3/go.mod h1:8u2C6DnAy0g2cEq+k/A2+tr9O1s+vHGxWn0LTc70T2A= -github.com/breml/errchkjson v0.3.0 h1:YdDqhfqMT+I1vIxPSas44P+9Z9HzJwCeAzjB8PxP1xw= -github.com/breml/errchkjson v0.3.0/go.mod h1:9Cogkyv9gcT8HREpzi3TiqBxCqDzo8awa92zSDFcofU= github.com/buger/jsonparser v0.0.0-20181115193947-bf1c66bbce23/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s= github.com/buger/jsonparser v1.1.1/go.mod h1:6RYKKt7H4d4+iWqouImQ9R2FZql3VbhNgx27UK13J/0= -github.com/butuzov/ireturn v0.1.1 h1:QvrO2QF2+/Cx1WA/vETCIYBKtRjc30vesdoPUNo1EbY= -github.com/butuzov/ireturn v0.1.1/go.mod h1:Wh6Zl3IMtTpaIKbmwzqi6olnM9ptYQxxVacMsOEFPoc= github.com/cenk/backoff v2.2.1+incompatible h1:djdFT7f4gF2ttuzRKPbMOWgZajgesItGLwG5FTQKmmE= github.com/cenk/backoff v2.2.1+incompatible/go.mod h1:7FtoeaSnHoZnmZzz47cM35Y9nSW7tNyaidugnHTaFDE= github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4= @@ -148,10 +111,6 @@ github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.1.2 h1:YRXhKfTDauu4ajMg1TPgFO5jnlC2HCbmLXMcTG5cbYE= github.com/cespare/xxhash/v2 v2.1.2/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/charithe/durationcheck v0.0.9 h1:mPP4ucLrf/rKZiIG/a9IPXHGlh8p4CzgpyTy6EEutYk= -github.com/charithe/durationcheck v0.0.9/go.mod h1:SSbRIBVfMjCi/kEB6K65XEA83D6prSM8ap1UCpNKtgg= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375 h1:E7LT642ysztPWE0dfz43cWOvMiF42DyTRC+eZIaO4yI= -github.com/chavacava/garif v0.0.0-20220630083739-93517212f375/go.mod h1:4m1Rv7xfuwWPNKXlThldNuJvutYM6J95wNuuVmn55To= github.com/cheekybits/genny v1.0.0 h1:uGGa4nei+j20rOSeDeP5Of12XVm7TGUd4dJA9RDitfE= github.com/cheekybits/genny v1.0.0/go.mod h1:+tQajlRqAUrPI7DOSpB0XAqZYtQakVtB7wXkRAgjxjQ= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -170,18 +129,11 @@ github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsr github.com/cpuguy83/go-md2man/v2 v2.0.1/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= -github.com/cristalhq/acmd v0.7.0/go.mod h1:LG5oa43pE/BbxtfMoImHCQN++0Su7dzipdgBjMCBVDQ= -github.com/curioswitch/go-reassign v0.1.2 h1:ekM07+z+VFT560Exz4mTv0/s1yU9gem6CJc/tlYpkmI= -github.com/curioswitch/go-reassign v0.1.2/go.mod h1:bFJIHgtTM3hRm2sKXSPkbwNjSFyGURQXyn4IXD2qwfQ= -github.com/daixiang0/gci v0.6.3 h1:wUAqXChk8HbwXn8AfxD9DYSCp9Bpz1L3e6Q4Roe+q9E= -github.com/daixiang0/gci v0.6.3/go.mod h1:EpVfrztufwVgQRXjnX4zuNinEpLj5OmMjtu/+MB0V0c= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/dengsgo/math-engine v0.0.0-20220213125415-0351c3c75eca h1:5R7Xum+9XDxbGDYpBfeedfzbb11wG++geFn7EvMbhuA= github.com/dengsgo/math-engine v0.0.0-20220213125415-0351c3c75eca/go.mod h1:zkR27k4K0I8FS6rkEd8qBhPeS8i3X2FKfvSPdF64OpQ= -github.com/denis-tingaikin/go-header v0.4.3 h1:tEaZKAlqql6SKCY++utLmkPLd6K8IBM20Ha7UVm+mtU= -github.com/denis-tingaikin/go-header v0.4.3/go.mod h1:0wOCWuN71D5qIgE2nz9KrKmuYBAC2Mra5RassOIQ2/c= github.com/dgryski/go-jump v0.0.0-20170409065014-e1f439676b57/go.mod h1:4hKCXuwrJoYvHZxJ86+bRVTOMyJ0Ej+RqfSm8mHi6KA= github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0 h1:0wH6nO9QEa02Qx8sIQGw6ieKdz+BXjpccSOo9vXNl4U= github.com/dgryski/go-jump v0.0.0-20211018200510-ba001c3ffce0/go.mod h1:4hKCXuwrJoYvHZxJ86+bRVTOMyJ0Ej+RqfSm8mHi6KA= @@ -197,10 +149,6 @@ github.com/envoyproxy/go-control-plane v0.9.7/go.mod h1:cwu0lG7PUMfa9snN8LXBig5y github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/go-control-plane v0.9.9-0.20210217033140-668b12f5399d/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= -github.com/esimonov/ifshort v1.0.4 h1:6SID4yGWfRae/M7hkVDVVyppy8q/v9OuxNdmjLQStBA= -github.com/esimonov/ifshort v1.0.4/go.mod h1:Pe8zjlRrJ80+q2CxHLfEOfTwxCZ4O+MuhcHcfgNWTk0= -github.com/ettle/strcase v0.1.1 h1:htFueZyVeE1XNnMEfbqp5r67qAN/4r6ya1ysq8Q+Zcw= -github.com/ettle/strcase v0.1.1/go.mod h1:hzDLsPC7/lwKyBOywSHEP89nt2pDgdy+No1NBA9o9VY= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a h1:yDWHCSQ40h88yih2JAcL6Ls/kVkSE8GFACTGVnMPruw= github.com/facebookgo/clock v0.0.0-20150410010913-600d898af40a/go.mod h1:7Ga40egUymuWXxAe151lTNnCv97MddSOVsjpPPkityA= github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4= @@ -208,12 +156,9 @@ github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL github.com/fatih/color v1.10.0/go.mod h1:ELkj/draVOlAH/xkhN6mQ50Qd0MPOk5AAr3maGEBuJM= github.com/fatih/color v1.13.0 h1:8LOYc1KYPPmyKMuN8QV2DNRWNbLo6LZ0iLs8+mlH53w= github.com/fatih/color v1.13.0/go.mod h1:kLAiJbzzSOZDVNGyDpeOxJ47H46qBXwg5ILebYFFOfk= -github.com/fatih/structtag v1.2.0 h1:/OdNE99OxoI/PqaW/SuSK9uxxT3f/tcSZgon/ssNSx4= -github.com/fatih/structtag v1.2.0/go.mod h1:mBJUNpUnHmRKrKlQQlmCrh5PuhftFbNv8Ys4/aAZl94= -github.com/firefart/nonamedreturns v1.0.4 h1:abzI1p7mAEPYuR4A+VLKn4eNDOycjYo2phmY9sfv40Y= -github.com/firefart/nonamedreturns v1.0.4/go.mod h1:TDhe/tjI1BXo48CmYbUduTV7BdIga8MAO/xbKdcVsGI= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/francoispqt/gojay v1.2.13/go.mod h1:ehT5mTG4ua4581f1++1WLG0vPdaA9HaiDsoyrBGkyDY= +github.com/frankban/quicktest v1.14.3 h1:FJKSZTDHjyhriyC81FLQ0LY93eSai0ZyR/ZIkd3ZUKE= github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3 h1:FDqhDm7pcsLhhWl1QtD8vlzI4mm59llRvNzrFg6/LAA= github.com/fredbi/uri v0.0.0-20181227131451-3dcfdacbaaf3/go.mod h1:CzM2G82Q9BDUvMTGHnXf/6OExw/Dz2ivDj48nVg7Lg8= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -227,8 +172,6 @@ github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504 h1:+31CdF/okdokeFN github.com/fyne-io/glfw-js v0.0.0-20220120001248-ee7290d23504/go.mod h1:gLRWYfYnMA9TONeppRSikMdXlHQ97xVsPojddUv3b/E= github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2 h1:hnLq+55b7Zh7/2IRzWCpiTcAvjv/P8ERF+N7+xXbZhk= github.com/fyne-io/image v0.0.0-20220602074514-4956b0afb3d2/go.mod h1:eO7W361vmlPOrykIg+Rsh1SZ3tQBaOsfzZhsIOb/Lm0= -github.com/fzipp/gocyclo v0.6.0 h1:lsblElZG7d3ALtGMx9fmxeTKZaLLpU8mET09yN4BBLo= -github.com/fzipp/gocyclo v0.6.0/go.mod h1:rXPyn8fnlpa0R2csP/31uerbiVBugk5whMdlyaLkLoA= github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04= github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE= github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI= @@ -237,8 +180,6 @@ github.com/gin-gonic/gin v1.8.1/go.mod h1:ji8BvRH1azfM+SYow9zQ6SZMvR8qOMZHmsCuWR github.com/gliderlabs/ssh v0.1.1/go.mod h1:U7qILu1NlMHj9FlMhZLlkCdDnU1DBEAqr0aevW3Awn0= github.com/go-cmd/cmd v1.4.0 h1:dF+1JtZMlgCKAcsvstp2VNmVA/jXRjlRYFOF4/w7Bbo= github.com/go-cmd/cmd v1.4.0/go.mod h1:tbBenttXtZU4c5djS1o7PWL5pd2xAr5sIqH1kGdNiRc= -github.com/go-critic/go-critic v0.6.4 h1:tucuG1pvOyYgpBIrVxw0R6gwO42lNa92Aq3VaDoIs+E= -github.com/go-critic/go-critic v0.6.4/go.mod h1:qL5SOlk7NtY6sJPoVCTKDIgzNOxHkkkOCVDyi9wJe1U= github.com/go-errors/errors v1.0.1/go.mod h1:f4zRHt4oKfwPJE5k8C9vpYG+aDHdBFUsgrm6/TyX73Q= github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6 h1:zDw5v7qm4yH7N8C8uWd+8Ii9rROdgWxQuGoJ9WDXxfk= github.com/go-gl/gl v0.0.0-20211210172815-726fda9656d6/go.mod h1:9YTyiznxEY1fVinfM7RvRcjRHbw2xLBJ3AAGIT0I4Nw= @@ -249,10 +190,8 @@ github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec h1:3FLiRYO6Pl github.com/go-gl/glfw/v3.3/glfw v0.0.0-20211213063430-748e38ca8aec/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8= github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= github.com/go-kit/kit v0.9.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as= -github.com/go-kit/log v0.1.0/go.mod h1:zbhenjAZHb184qTLMA9ZjW7ThYL0H2mk7Q6pNt4vbaY= github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE= github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk= -github.com/go-logfmt/logfmt v0.5.0/go.mod h1:wCYkCAKZfumFQihp8CzCvQ3paCTfi41vtzG1KdI/P7A= github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= github.com/go-logr/logr v1.2.3 h1:2DntVwHkVopvECVRSlL5PSo9eG+cAkDCuckLubN+rq0= github.com/go-logr/logr v1.2.3/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A= @@ -276,33 +215,12 @@ github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= github.com/go-redis/redis_rate/v9 v9.1.2 h1:H0l5VzoAtOE6ydd38j8MCq3ABlGLnvvbA1xDSVVCHgQ= github.com/go-redis/redis_rate/v9 v9.1.2/go.mod h1:oam2de2apSgRG8aJzwJddXbNu91Iyz1m8IKJE2vpvlQ= -github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w= github.com/go-sql-driver/mysql v1.5.0/go.mod h1:DCzpHaOWr8IXmIStZouvnhqoel9Qv2LBy8hT2VhHyBg= github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I= github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE= github.com/go-test/deep v1.0.7 h1:/VSMRlnY/JSyqxQUzQLKVMAskpY/NZKFA5j2P+0pP2M= -github.com/go-toolsmith/astcast v1.0.0 h1:JojxlmI6STnFVG9yOImLeGREv8W2ocNUM+iOhR6jE7g= -github.com/go-toolsmith/astcast v1.0.0/go.mod h1:mt2OdQTeAQcY4DQgPSArJjHCcOwlX+Wl/kwN+LbLGQ4= -github.com/go-toolsmith/astcopy v1.0.0/go.mod h1:vrgyG+5Bxrnz4MZWPF+pI4R8h3qKRjjyvV/DSez4WVQ= -github.com/go-toolsmith/astcopy v1.0.1 h1:l09oBhAPyV74kLJ3ZO31iBU8htZGTwr9LTjuMCyL8go= -github.com/go-toolsmith/astcopy v1.0.1/go.mod h1:4TcEdbElGc9twQEYpVo/aieIXfHhiuLh4aLAck6dO7Y= -github.com/go-toolsmith/astequal v1.0.0/go.mod h1:H+xSiq0+LtiDC11+h1G32h7Of5O3CYFJ99GVbS5lDKY= -github.com/go-toolsmith/astequal v1.0.1/go.mod h1:4oGA3EZXTVItV/ipGiOx7NWkY5veFfcsOJVS2YxltLw= -github.com/go-toolsmith/astequal v1.0.2 h1:+XvaV8zNxua+9+Oa4AHmgmpo4RYAbwr/qjNppLfX2yM= -github.com/go-toolsmith/astequal v1.0.2/go.mod h1:9Ai4UglvtR+4up+bAD4+hCj7iTo4m/OXVTSLnCyTAx4= -github.com/go-toolsmith/astfmt v1.0.0 h1:A0vDDXt+vsvLEdbMFJAUBI/uTbRw1ffOPnxsILnFL6k= -github.com/go-toolsmith/astfmt v1.0.0/go.mod h1:cnWmsOAuq4jJY6Ct5YWlVLmcmLMn1JUPuQIHCY7CJDw= -github.com/go-toolsmith/astp v1.0.0 h1:alXE75TXgcmupDsMK1fRAy0YUzLzqPVvBKoyWV+KPXg= -github.com/go-toolsmith/astp v1.0.0/go.mod h1:RSyrtpVlfTFGDYRbrjyWP1pYu//tSFcvdYrA8meBmLI= -github.com/go-toolsmith/pkgload v1.0.2-0.20220101231613-e814995d17c5/go.mod h1:3NAwwmD4uY/yggRxoEjk/S00MIV3A+H7rrE3i87eYxM= -github.com/go-toolsmith/strparse v1.0.0 h1:Vcw78DnpCAKlM20kSbAyO4mPfJn/lyYA4BJUDxe2Jb4= -github.com/go-toolsmith/strparse v1.0.0/go.mod h1:YI2nUKP9YGZnL/L1/DLFBfixrcjslWct4wyljWhSRy8= -github.com/go-toolsmith/typep v1.0.2 h1:8xdsa1+FSIH/RhEkgnD1j2CJOy5mNllW1Q9tRiYwvlk= -github.com/go-toolsmith/typep v1.0.2/go.mod h1:JSQCQMUPdRlMZFswiq3TGpNp1GMktqkR2Ns5AIQkATU= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b h1:khEcpUM4yFcxg4/FHQWkvVRmgijNXRfzkIDHh23ggEo= -github.com/go-xmlfmt/xmlfmt v0.0.0-20191208150333-d5b6f63a941b/go.mod h1:aUCEOzzezBEjDBbFBoSiya/gduyIiWYRP6CnSFIV8AM= github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0= github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY= github.com/gobuffalo/depgen v0.1.0/go.mod h1:+ifsuy7fhi15RWncXQQKjWS9JPkdah5sZvtHc2RXGlg= @@ -327,15 +245,11 @@ github.com/gobuffalo/packd v0.1.0/go.mod h1:M2Juc+hhDXf/PnmBANFCqx4DM3wRbgDvnVWe github.com/gobuffalo/packr/v2 v2.0.9/go.mod h1:emmyGweYTm6Kdper+iywB6YK5YzuKchGtJQZ0Odn4pQ= github.com/gobuffalo/packr/v2 v2.2.0/go.mod h1:CaAwI0GPIAv+5wKLtv8Afwl+Cm78K/I/VCm/3ptBN+0= github.com/gobuffalo/syncx v0.0.0-20190224160051-33c29581e754/go.mod h1:HhnNqWY95UYwwW3uSASeV7vtgYkT2t16hJgV3AEPUpw= -github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= -github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= github.com/goccy/go-json v0.9.7 h1:IcB+Aqpx/iMHu5Yooh7jEzJk1JZ7Pjtmys2ukPr7EeM= github.com/goccy/go-json v0.9.7/go.mod h1:6MelG93GURQebXPDq3khkgXZkazVtN9CRI+MGFi0w8I= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.1.0 h1:4KLkAxT3aOY8Li4FRJe/KvhoNFFxo0m6fNuFUO8QJUk= github.com/godbus/dbus/v5 v5.1.0/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.1 h1:+gYjHKf32LDeiEEFhQaotPbLuUXjY5ZqxKgXy7n59aw= -github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q= github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q= @@ -380,26 +294,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2 h1:23T5iq8rbUYlhpt5DB4XJkc6BU31uODLD1o1gKvZmD0= -github.com/golangci/check v0.0.0-20180506172741-cfe4005ccda2/go.mod h1:k9Qvh+8juN+UKMCS/3jFtGICgW8O96FVaZsaxdzDkR4= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a h1:w8hkcTqaFpzKqonE9uMCefW1WDie15eSP/4MssdenaM= -github.com/golangci/dupl v0.0.0-20180902072040-3e9179ac440a/go.mod h1:ryS0uhF+x9jgbj/N71xsEqODy9BN81/GonCZiOzirOk= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe h1:6RGUuS7EGotKx6J5HIP8ZtyMdiDscjMLfRBSPuzVVeo= -github.com/golangci/go-misc v0.0.0-20220329215616-d24fe342adfe/go.mod h1:gjqyPShc/m8pEMpk0a3SeagVb0kaqvhscv+i9jI5ZhQ= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a h1:iR3fYXUjHCR97qWS8ch1y9zPNsgXThGwjKPrYfqMPks= -github.com/golangci/gofmt v0.0.0-20190930125516-244bba706f1a/go.mod h1:9qCChq59u/eW8im404Q2WWTrnBUQKjpNYKMbU4M7EFU= -github.com/golangci/golangci-lint v1.49.0 h1:I8WHOavragDttlLHtSraHn/h39C+R60bEQ5NoGcHQr8= -github.com/golangci/golangci-lint v1.49.0/go.mod h1:+V/7lLv449R6w9mQ3WdV0EKh7Je/jTylMeSwBZcLeWE= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0 h1:MfyDlzVjl1hoaPzPD4Gpb/QgoRfSBR0jdhwGyAWwMSA= -github.com/golangci/lint-1 v0.0.0-20191013205115-297bf364a8e0/go.mod h1:66R6K6P6VWk9I95jvqGxkqJxVWGFy9XlDwLwVz1RCFg= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca h1:kNY3/svz5T29MYHubXix4aDDuE3RWHkPvopM/EDv/MA= -github.com/golangci/maligned v0.0.0-20180506175553-b1d89398deca/go.mod h1:tvlJhZqDe4LMs4ZHD0oMUlt9G2LWuDGoisJTBzLMV9o= -github.com/golangci/misspell v0.3.5 h1:pLzmVdl3VxTOncgzHcvLOKirdvcx/TydsClUQXTehjo= -github.com/golangci/misspell v0.3.5/go.mod h1:dEbvlSfYbMQDtrpRMQU675gSDLDNa8sCPPChZ7PhiVA= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6 h1:DIPQnGy2Gv2FSA4B/hh8Q7xx3B7AIDk3DAMeHclH1vQ= -github.com/golangci/revgrep v0.0.0-20220804021717-745bb2f7c2e6/go.mod h1:0AKcRCkMoKvUvlf89F6O7H2LYdhr1zBh736mBItOdRs= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4 h1:zwtduBRr5SSWhqsYNgcuWO2kFlpdOZbP0+yRjmvPGys= -github.com/golangci/unconvert v0.0.0-20180507085042-28b1c447d1f4/go.mod h1:Izgrg8RkN3rCIMLGE9CyYmU9pY2Jer6DgANEnZ/L/cQ= github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= @@ -415,7 +309,6 @@ github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/ github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= -github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o= github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE= github.com/google/go-cmp v0.5.8 h1:e6P7q2lk1O+qJJb4BtCQXlK8vWEO8V1ZeuEdJNOqZyg= github.com/google/go-cmp v0.5.8/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY= @@ -452,24 +345,8 @@ github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORR github.com/gopherjs/gopherjs v0.0.0-20211219123610-ec9572f70e60/go.mod h1:cz9oNYuRUWGdHmLF2IodMLkAhcPtXeULvcBNagUrxTI= github.com/gopherjs/gopherjs v1.17.2 h1:fQnZVsXk8uxXIStYb0N4bGk7jeyTalG/wsZjQ25dO0g= github.com/gopherjs/gopherjs v1.17.2/go.mod h1:pRRIvn/QzFLrKfvEz3qUuEhtE/zLCWfreZ6J5gM2i+k= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8 h1:PVRE9d4AQKmbelZ7emNig1+NT27DUmKZn5qXxfio54U= -github.com/gordonklaus/ineffassign v0.0.0-20210914165742-4cc7213b9bc8/go.mod h1:Qcp2HIAYhR7mNUVSIxZww3Guk4it82ghYcEXIAk+QT0= github.com/gorilla/websocket v1.4.2 h1:+/TMaTYc4QFitKJxsQ7Yye35DkWvkdLcvGKqM+x0Ufc= github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/gostaticanalysis/analysisutil v0.0.0-20190318220348-4088753ea4d3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.0.3/go.mod h1:eEOZF4jCKGi+aprrirO9e7WKB3beBRtWgqGunKl6pKE= -github.com/gostaticanalysis/analysisutil v0.1.0/go.mod h1:dMhHRU9KTiDcuLGdy87/2gTR8WruwYZrKdRq9m1O6uw= -github.com/gostaticanalysis/analysisutil v0.7.1 h1:ZMCjoue3DtDWQ5WyU16YbjbQEQ3VuzwxALrpYd+HeKk= -github.com/gostaticanalysis/analysisutil v0.7.1/go.mod h1:v21E3hY37WKMGSnbsw2S/ojApNWb6C1//mXO48CXbVc= -github.com/gostaticanalysis/comment v1.3.0/go.mod h1:xMicKDx7XRXYdVwY9f9wQpDJVnqWxw9wCauCMKp+IBI= -github.com/gostaticanalysis/comment v1.4.1/go.mod h1:ih6ZxzTHLdadaiSnF5WY3dxUoXfXAlTaRzuaNDlSado= -github.com/gostaticanalysis/comment v1.4.2 h1:hlnx5+S2fY9Zo9ePo4AhgYsYHbM2+eAv8m/s1JiCd6Q= -github.com/gostaticanalysis/comment v1.4.2/go.mod h1:KLUTGDv6HOCotCH8h2erHKmpci2ZoR8VPu34YA2uzdM= -github.com/gostaticanalysis/forcetypeassert v0.1.0 h1:6eUflI3DiGusXGK6X7cCcIgVCpZ2CiZ1Q7jl6ZxNV70= -github.com/gostaticanalysis/forcetypeassert v0.1.0/go.mod h1:qZEedyP/sY1lTGV1uJ3VhWZ2mqag3IkWsDHVbplHXak= -github.com/gostaticanalysis/nilerr v0.1.1 h1:ThE+hJP0fEp4zWLkWHWcRyI2Od0p7DlgYG3Uqrmrcpk= -github.com/gostaticanalysis/nilerr v0.1.1/go.mod h1:wZYb6YI5YAxxq0i1+VJbY0s2YONW0HU0GPE3+5PWN4A= -github.com/gostaticanalysis/testutil v0.3.1-0.20210208050101-bfb5c8eec0e4/go.mod h1:D+FIZ+7OahH3ePw/izIEeH5I06eKs1IKI4Xr64/Am3M= github.com/goxjs/gl v0.0.0-20210104184919-e3fafc6f8f2a/go.mod h1:dy/f2gjY09hwVfIyATps4G2ai7/hLwLkc5TrPqONuXY= github.com/goxjs/glfw v0.0.0-20191126052801-d2efb5f20838/go.mod h1:oS8P8gVOT4ywTcjV6wZlOU4GuVFQ8F5328KY3MJ79CY= github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6kE= @@ -516,9 +393,6 @@ github.com/hashicorp/go-syslog v1.0.0/go.mod h1:qPfqrKkXGihmCqbJM2mZgkZGvKG1dFdv github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= github.com/hashicorp/go-uuid v1.0.1 h1:fv1ep09latC32wFoVwnqcnKJGnMSdBanPczbHAYm1BE= github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro= -github.com/hashicorp/go-version v1.2.1/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= -github.com/hashicorp/go-version v1.6.0 h1:feTTfFNnjP967rlCxM/I9g701jU+RN74YKx2mOkIeek= -github.com/hashicorp/go-version v1.6.0/go.mod h1:fltr4n8CU8Ke44wwGCBoEymUuxUHl09ZGVZPK5anwXA= github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90= github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8= @@ -539,8 +413,6 @@ github.com/hashicorp/serf v0.9.5/go.mod h1:UWDWwZeL5cuWDJdl0C6wrvrUwEqtQ4ZKBKKEN github.com/hashicorp/serf v0.9.6/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= github.com/hashicorp/serf v0.9.7 h1:hkdgbqizGQHuU5IPqYM1JdSMV8nKfpuOnZYXssk9muY= github.com/hashicorp/serf v0.9.7/go.mod h1:TXZNMjZQijwlDvp+r0b63xZ45H7JmCmgg4gpTwn9UV4= -github.com/hexops/gotextdiff v1.0.3 h1:gitA9+qJrrTCsiCl7+kh75nPqQt1cx4ZkudSTLoUqJM= -github.com/hexops/gotextdiff v1.0.3/go.mod h1:pSWU5MAI3yDq+fZBTazCSJysOMbxWL1BSow5/V2vxeg= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= @@ -550,25 +422,16 @@ github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c h1:qSH github.com/influxdata/influxdb1-client v0.0.0-20220302092344-a9ab5670611c/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo= github.com/jackmordaunt/icns/v2 v2.2.1/go.mod h1:6aYIB9eSzyfHHMKqDf17Xrs1zetQPReAkiUSHzdw4cI= github.com/jellevandenhooff/dkim v0.0.0-20150330215556-f50fe3d243e1/go.mod h1:E0B/fFc00Y+Rasa88328GlI/XbtyysCtTHZS8h7IrBU= -github.com/jgautheron/goconst v1.5.1 h1:HxVbL1MhydKs8R8n/HE5NPvzfaYmQJA3o879lE4+WcM= -github.com/jgautheron/goconst v1.5.1/go.mod h1:aAosetZ5zaeC/2EfMeRswtxUFBpe2Hr7HzkgX4fanO4= -github.com/jingyugao/rowserrcheck v1.1.1 h1:zibz55j/MJtLsjP1OF4bSdgXxwL1b+Vn7Tjzq7gFzUs= -github.com/jingyugao/rowserrcheck v1.1.1/go.mod h1:4yvlZSDb3IyDTUZJUmpZfm2Hwok+Dtp+nu2qOq+er9c= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af h1:KA9BjwUk7KlCh6S9EAGWBt1oExIUv9WyNCiRz5amv48= -github.com/jirfag/go-printf-func-name v0.0.0-20200119135958-7558a9eaa5af/go.mod h1:HEWGJkRDzjJY2sqdDwxccsGicWEf9BQOZsq2tV+xzM0= github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.4.0 h1:BEgLn5cpjn8UN1mAw4NjwDrS35OdebyEtFe+9YPoQUg= github.com/jmespath/go-jmespath v0.4.0/go.mod h1:T8mJZnbsbmF+m6zOOFylbeCJqk5+pHWvzYPziyZiYoo= github.com/jmespath/go-jmespath/internal/testify v1.5.1 h1:shLQSRRSCCPj3f2gpwzGwWFoC7ycTf1rcQZHOlsJ6N8= github.com/jmespath/go-jmespath/internal/testify v1.5.1/go.mod h1:L3OGu8Wl2/fWfCI6z80xFu9LTZmf1ZRjMHUOPmWr69U= -github.com/jmoiron/sqlx v1.2.0/go.mod h1:1FEQNm3xlJgrMD+FBdI9+xvCksHtbpVBBw5dYhBSsks= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= github.com/josephspurrier/goversioninfo v1.4.0/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY= -github.com/jpillora/backoff v1.0.0/go.mod h1:J/6gKK9jxlEcS3zixgDgUAsiuZ7yrSoa/FX5e0EB2j4= github.com/json-iterator/go v1.1.5/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU= github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= -github.com/json-iterator/go v1.1.10/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4= github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= @@ -583,16 +446,11 @@ github.com/juju/ratelimit v1.0.1/go.mod h1:qapgC/Gy+xNh9UxzV13HGGl/6UXNN+ct+vwSg github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w= github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U= github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM= -github.com/julz/importas v0.1.0 h1:F78HnrsjY3cR7j0etXy5+TU1Zuy7Xt08X/1aJnH5xXY= -github.com/julz/importas v0.1.0/go.mod h1:oSFU2R4XK/P7kNBrnL/FEQlDGN1/6WoxXEjSSXO0DV0= github.com/karrick/godirwalk v1.8.0/go.mod h1:H5KPZjojv4lE+QYImBI8xVtrBRgYrIVsaRPx4tDPEn4= github.com/karrick/godirwalk v1.10.3/go.mod h1:RoGL9dQei4vP9ilrpETWE8CLOZ1kiN0LhBygSwrAsHA= github.com/kavu/go_reuseport v1.5.0 h1:UNuiY2OblcqAtVDE8Gsg1kZz8zbBWg907sP1ceBV+bk= github.com/kavu/go_reuseport v1.5.0/go.mod h1:CG8Ee7ceMFSMnx/xr25Vm0qXaj2Z4i5PWoUx+JZ5/CU= github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8= -github.com/kisielk/errcheck v1.6.2 h1:uGQ9xI8/pgc9iOoCe7kWQgRE6SBTrCGmTSf0LrEtY7c= -github.com/kisielk/errcheck v1.6.2/go.mod h1:nXw/i/MfnvRHqXa7XXmQMUB0oNFGuBrNI8d8NLy0LPw= -github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg= github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck= github.com/klauspost/compress v1.9.5/go.mod h1:RyIbtBH6LamlWaDj8nUwkbUhJ87Yi3uG0guNDohfE1A= github.com/klauspost/compress v1.13.6 h1:P76CopJELS0TiO2mebmnzgWaajssP/EszplttgQxcgc= @@ -604,7 +462,6 @@ github.com/klauspost/reedsolomon v1.9.16 h1:mR0AwphBwqFv/I3B9AHtNKvzuowI1vrj8/3U github.com/klauspost/reedsolomon v1.9.16/go.mod h1:eqPAcE7xar5CIzcdfwydOEdcmchAKAP/qs14y4GCBOk= github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/konsorten/go-windows-terminal-sequences v1.0.2/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= -github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ= github.com/kr/fs v0.1.0 h1:Jskdu9ieNAYnjxsi0LbQp1ulIKZV1LAFgK1tWhpZgl8= github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg= github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc= @@ -618,37 +475,19 @@ github.com/kr/pty v1.1.3/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= -github.com/kulti/thelper v0.6.3 h1:ElhKf+AlItIu+xGnI990no4cE2+XaSu1ULymV2Yulxs= -github.com/kulti/thelper v0.6.3/go.mod h1:DsqKShOvP40epevkFrvIwkCMNYxMeTNjdWL4dqWHZ6I= -github.com/kunwardeep/paralleltest v1.0.6 h1:FCKYMF1OF2+RveWlABsdnmsvJrei5aoyZoaGS+Ugg8g= -github.com/kunwardeep/paralleltest v1.0.6/go.mod h1:Y0Y0XISdZM5IKm3TREQMZ6iteqn1YuwCsJO/0kL9Zes= -github.com/kyoh86/exportloopref v0.1.8 h1:5Ry/at+eFdkX9Vsdw3qU4YkvGtzuVfzT4X7S77LoN/M= -github.com/kyoh86/exportloopref v0.1.8/go.mod h1:1tUcJeiioIs7VWe5gcOObrux3lb66+sBqGZrRkMwPgg= -github.com/ldez/gomoddirectives v0.2.3 h1:y7MBaisZVDYmKvt9/l1mjNCiSA1BVn34U0ObUcJwlhA= -github.com/ldez/gomoddirectives v0.2.3/go.mod h1:cpgBogWITnCfRq2qGoDkKMEVSaarhdBr6g8G04uz6d0= -github.com/ldez/tagliatelle v0.3.1 h1:3BqVVlReVUZwafJUwQ+oxbx2BEX2vUG4Yu/NOfMiKiM= -github.com/ldez/tagliatelle v0.3.1/go.mod h1:8s6WJQwEYHbKZDsp/LjArytKOG8qaMrKQQ3mFukHs88= github.com/leodido/go-urn v1.2.1 h1:BqpAaACuzVSgi/VLzGZIobT2z4v53pjosyNd9Yv6n/w= github.com/leodido/go-urn v1.2.1/go.mod h1:zt4jvISO2HfUBqxjfIshjdMTYS56ZS/qv49ictyFfxY= -github.com/leonklingele/grouper v1.1.0 h1:tC2y/ygPbMFSBOs3DcyaEMKnnwH7eYKzohOtRrf0SAg= -github.com/leonklingele/grouper v1.1.0/go.mod h1:uk3I3uDfi9B6PeUjsCKi6ndcf63Uy7snXgR4yDYQVDY= -github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo= github.com/lucas-clemente/quic-go v0.24.0/go.mod h1:paZuzjXCE5mj6sikVLMvqXk8lJV2AsqtJ6bDhjEfxx0= github.com/lucas-clemente/quic-go v0.27.0 h1:v6WY87q9zD4dKASbG8hy/LpzAVNzEQzw8sEIeloJsc4= github.com/lucas-clemente/quic-go v0.27.0/go.mod h1:AzgQoPda7N+3IqMMMkywBKggIFo2KT6pfnlrQ2QieeI= github.com/lucor/goinfo v0.0.0-20210802170112-c078a2b0f08b/go.mod h1:PRq09yoB+Q2OJReAmwzKivcYyremnibWGbK7WfftHzc= -github.com/lufeee/execinquery v1.2.1 h1:hf0Ems4SHcUGBxpGN7Jz78z1ppVkP/837ZlETPCEtOM= -github.com/lufeee/execinquery v1.2.1/go.mod h1:EC7DrEKView09ocscGHC+apXMIaorh4xqSxS/dy8SbM= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 h1:6E+4a0GO5zZEnZ81pIr0yLvtUWk2if982qA3F3QD6H4= github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod h1:zJYVVT2jmtg6P3p1VtQj7WsuWi/y4VnjVBn7F8KPB3I= github.com/lunixbochs/vtclean v1.0.0/go.mod h1:pHhQNgMf3btfWnGBVipUOjRYhoOsdGqdm/+2c2E2WMI= -github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls= github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/magiconair/properties v1.8.6 h1:5ibWZ6iY0NctNGWo87LalDlEZ6R41TqbbDamhfG/Qzo= github.com/magiconair/properties v1.8.6/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60= github.com/mailru/easyjson v0.0.0-20190312143242-1de009706dbe/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc= -github.com/maratori/testpackage v1.1.0 h1:GJY4wlzQhuBusMF1oahQCBtUV/AQ/k69IZ68vxaac2Q= -github.com/maratori/testpackage v1.1.0/go.mod h1:PeAhzU8qkCwdGEMTEupsHJNlQu2gZopMC6RjbhmHeDc= github.com/markbates/oncer v0.0.0-20181203154359-bf2de49a0be2/go.mod h1:Ld9puTsIW75CHf65OeIOkyKbteujpZVXDpWK6YGZbxE= github.com/markbates/safe v1.0.1/go.mod h1:nAqgmRi7cY2nqMc92/bSEeQA+R4OheNU2T1kNSCBdG0= github.com/marten-seemann/qpack v0.2.1/go.mod h1:F7Gl5L1jIgN1D11ucXefiuJS9UMVP2opoCp2jDKb7wc= @@ -661,15 +500,11 @@ github.com/marten-seemann/qtls-go1-17 v0.1.1 h1:DQjHPq+aOzUeh9/lixAGunn6rIOQyWCh github.com/marten-seemann/qtls-go1-17 v0.1.1/go.mod h1:C2ekUKcDdz9SDWxec1N/MvcXBpaX9l3Nx67XaR84L5s= github.com/marten-seemann/qtls-go1-18 v0.1.1 h1:qp7p7XXUFL7fpBvSS1sWD+uSqPvzNQK43DH+/qEkj0Y= github.com/marten-seemann/qtls-go1-18 v0.1.1/go.mod h1:mJttiymBAByA49mhlNZZGrH5u1uXYZJ+RW28Py7f4m4= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951 h1:pWxk9e//NbPwfxat7RXkts09K+dEBJWakUWwICVqYbA= -github.com/matoous/godox v0.0.0-20210227103229-6504466cf951/go.mod h1:1BELzlh859Sh1c6+90blK8lbYy0kwQf1bYlBhBysy1s= -github.com/matryer/is v1.4.0/go.mod h1:8I/i5uYgLzgsgEloJE1U6xx5HkBQpAZvepWuujKwMRU= github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU= github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVcfRqFIhoBtE= github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= github.com/mattn/go-colorable v0.1.9/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc= -github.com/mattn/go-colorable v0.1.12 h1:jF+Du6AlPIjs2BiUiQlKOX0rt3SujHxPnksPKZbaA40= github.com/mattn/go-colorable v0.1.12/go.mod h1:u5H1YNBxpqRaxsYJYSkiCWKzEfiAb1Gb520KVy5xxl4= github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= @@ -678,22 +513,13 @@ github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hd github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84= github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE= github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU= -github.com/mattn/go-isatty v0.0.14 h1:yVuAays6BHfxijgZPzw+3Zlu5yQgKGP2/hcQbHb7S9Y= github.com/mattn/go-isatty v0.0.14/go.mod h1:7GGIvUiUoEMVVmxf/4nioHXj79iQHKdU27kJ6hsGG94= github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-runewidth v0.0.9 h1:Lm995f3rfxdpd6TSmuVCHVb/QhupuXlYr8sCI/QdE+0= -github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI= -github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mattn/go-sqlite3 v1.14.12 h1:TJ1bhYJPV44phC+IMu1u2K/i5RriLTPe+yc68XDJ1Z0= github.com/mattn/go-sqlite3 v1.14.12/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU= -github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU= github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0= -github.com/mbilski/exhaustivestruct v1.2.0 h1:wCBmUnSYufAHO6J4AVWY6ff+oxWxsVFrwgOdMUQePUo= -github.com/mbilski/exhaustivestruct v1.2.0/go.mod h1:OeTBVxQWoEmB2J2JCHmXWPJ0aksxSUOUy+nvtVEfzXc= github.com/mcuadros/go-version v0.0.0-20190830083331-035f6764e8d2/go.mod h1:76rfSfYPWj01Z85hUf/ituArm797mNKcvINh1OlsZKo= -github.com/mgechev/revive v1.2.3 h1:NzIEEa9+WimQ6q2Ov7OcNeySS/IOcwtkQ8RAh0R5UJ4= -github.com/mgechev/revive v1.2.3/go.mod h1:iAWlQishqCuj4yhV24FTnKSXGpbAA+0SckXB8GQMX/Q= github.com/microcosm-cc/bluemonday v1.0.1/go.mod h1:hsXNsILzKxV+sX77C5b8FSuKF00vh2OMYv+xgHpAMF4= github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg= github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso= @@ -713,7 +539,6 @@ github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0Qu github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y= github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= -github.com/mitchellh/mapstructure v1.4.3 h1:OVowDSCllw/YjdLkam3/sm7wEtOy59d8ndGgCcyj8cs= github.com/mitchellh/mapstructure v1.4.3/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyuac5Z2hdY= github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo= @@ -725,30 +550,17 @@ github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3Rllmb github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= -github.com/moricho/tparallel v0.2.1 h1:95FytivzT6rYzdJLdtfn6m1bfFJylOJK41+lgv/EHf4= -github.com/moricho/tparallel v0.2.1/go.mod h1:fXEIZxG2vdfl0ZF8b42f5a78EhjjD5mX8qUplsoSU4k= github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= -github.com/mwitkow/go-conntrack v0.0.0-20190716064945-2f068394615f/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U= github.com/nacos-group/nacos-sdk-go v1.1.2 h1:lWTpf5SXLetQetS7p31eGic/ncqsnn0Zbau1i3eC25Y= github.com/nacos-group/nacos-sdk-go v1.1.2/go.mod h1:I8Vj4M8ZLpBk7EY2A8RXQE1SbfCA7b56TJBPIFTrUYE= -github.com/nakabonne/nestif v0.3.1 h1:wm28nZjhQY5HyYPx+weN3Q65k6ilSBxDb8v5S81B81U= -github.com/nakabonne/nestif v0.3.1/go.mod h1:9EtoZochLn5iUprVDmDjqGKPofoUEBL8U4Ngq6aY7OE= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354 h1:4kuARK6Y6FxaNu/BnU2OAaLF86eTVhP2hjTB6iMvItA= -github.com/nbutton23/zxcvbn-go v0.0.0-20210217022336-fa2cb2858354/go.mod h1:KSVJerMDfblTH7p5MZaTt+8zaT2iEk3AkVb9PQdZuE8= github.com/neelance/astrewrite v0.0.0-20160511093645-99348263ae86/go.mod h1:kHJEU3ofeGjhHklVoIGuVj85JJwZ6kWPaJwCIxgnFmo= github.com/neelance/sourcemap v0.0.0-20151028013722-8c68805598ab/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/neelance/sourcemap v0.0.0-20200213170602-2833bce08e4c/go.mod h1:Qr6/a/Q4r9LP1IltGz7tA7iOK1WonHEYhu1HRBA7ZiM= github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8= github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno= -github.com/nishanths/exhaustive v0.8.1 h1:0QKNascWv9qIHY7zRoZSxeRr6kuk5aAT3YXLTiDmjTo= -github.com/nishanths/exhaustive v0.8.1/go.mod h1:qj+zJJUgJ76tR92+25+03oYUhzF4R7/2Wk7fGTfCHmg= -github.com/nishanths/predeclared v0.2.2 h1:V2EPdZPliZymNAn79T8RkNApBjMmVKh5XRpLm/w98Vk= -github.com/nishanths/predeclared v0.2.2/go.mod h1:RROzoN6TnGQupbC+lqggsOlcgysk3LMK/HI84Mp280c= github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= github.com/nxadm/tail v1.4.8/go.mod h1:+ncqLTQzXmGhMZNUePPaPqPvBxHAIsmXswZKocGu+AU= -github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec= -github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY= github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= github.com/onsi/ginkgo v1.14.0/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= @@ -764,30 +576,21 @@ github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7 github.com/onsi/gomega v1.13.0/go.mod h1:lRk9szgn8TxENtWd0Tp4c3wjlRfMTMH27I+3Je41yGY= github.com/onsi/gomega v1.16.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= github.com/onsi/gomega v1.17.0/go.mod h1:HnhC7FXeEQY45zxNK3PPoIUhzk/80Xly9PcubAlGdZY= -github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs= +github.com/onsi/gomega v1.20.0 h1:8W0cWlwFkflGPLltQvLRB7ZVD5HuP6ng320w2IS245Q= +github.com/onsi/gomega v1.20.0/go.mod h1:DtrZpjmvpn2mPm4YWQa0/ALMDj9v4YxLgojwPeREyVo= github.com/openzipkin/zipkin-go v0.1.1/go.mod h1:NtoC/o8u3JlF1lSlyPNswIbeQH9bJTmOf0Erfk+hxe8= -github.com/otiai10/copy v1.2.0/go.mod h1:rrF5dJ5F0t/EWSYODDu4j9/vEeYHMkc8jt0zJChqQWw= -github.com/otiai10/curr v0.0.0-20150429015615-9b4961190c95/go.mod h1:9qAhocn7zKJG+0mI8eUu6xqkFDYS2kb2saOteoSB3cE= -github.com/otiai10/curr v1.0.0/go.mod h1:LskTG5wDwr8Rs+nNQ+1LlxRjAtTZZjtJW4rMXl6j4vs= -github.com/otiai10/mint v1.3.0/go.mod h1:F5AjcsTsWUqX+Na9fpHb52P8pcRX2CI6A3ctIT91xUo= -github.com/otiai10/mint v1.3.1/go.mod h1:/yxELlJQ0ufhjUwhshSj+wFjZ78CnZ48/1wtmBH1OTc= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pascaldekloe/goe v0.1.0 h1:cBOtyMzM9HTpWjXfbbunk26uA6nG3a8n06Wieeh0MwY= github.com/pascaldekloe/goe v0.1.0/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.7.0/go.mod h1:vwGMzjaWMwyfHwgIBhI2YUM4fB6nL6lVAvS1LBMMhTE= -github.com/pelletier/go-toml v1.9.3 h1:zeC5b1GviRUyKYd6OJPvBU/mcVDVoL1OhT17FCt5dSQ= github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8= github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c= -github.com/pelletier/go-toml/v2 v2.0.1 h1:8e3L2cCQzLFi2CR4g7vGFuFxX7Jl1kKX8gW+iV0GUKU= -github.com/pelletier/go-toml/v2 v2.0.1/go.mod h1:r9LEWfGN8R5k0VXJ+0BkIe7MYkRdwZOjgMj2KwnJFUo= github.com/pelletier/go-toml/v2 v2.0.2 h1:+jQXlF3scKIcSEKkdHzXhCTDLPFi5r1wnK6yPS+49Gw= github.com/pelletier/go-toml/v2 v2.0.2/go.mod h1:MovirKjgVRESsAvNZlAjtFwV867yGuwRkXbG66OzopI= github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1 h1:5Dl+ADmsGerAqHwWzyLqkNaUBQ+48DQwfDCaW1gHAQM= github.com/peterbourgon/g2s v0.0.0-20140925154142-ec76db4c1ac1/go.mod h1:1VcHEd3ro4QMoHfiNl/j7Jkln9+KQuorp0PItHMJYNg= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d h1:CdDQnGF8Nq9ocOS/xlSptM1N3BbrA6/kmaep5ggwaIA= -github.com/phayes/checkstyle v0.0.0-20170904204023-bfd46e6a821d/go.mod h1:3OzsM7FXDQlpCiw2j81fOmAwQLnZnLGXVKUzeKQXIAw= github.com/philhofer/fwd v1.1.1 h1:GdGcTjf5RNAxwS4QLsiMzJYj5KEvPJD3Abr261yRQXQ= github.com/philhofer/fwd v1.1.1/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA= @@ -801,8 +604,6 @@ github.com/pkg/sftp v1.13.5 h1:a3RLUqkyjYRtBTZJZ1VRrKbN3zhuPLlUc3sphVz81go= github.com/pkg/sftp v1.13.5/go.mod h1:wHDZ0IZX6JcBYRK1TH9bcVq8G7TLpVHYIGJRFnmPfxg= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/polyfloyd/go-errorlint v1.0.2 h1:kp1yvHflYhTmw5m3MmBy8SCyQkKPjwDthVuMH0ug6Yk= -github.com/polyfloyd/go-errorlint v1.0.2/go.mod h1:APVvOesVSAnne5SClsPxPdfvZTVDojXh1/G3qb5wjGI= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s= github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c h1:ncq/mPwQF4JjgDlrVEn3C11VoGHZN7m8qihwgMEtzYw= @@ -811,43 +612,17 @@ github.com/prometheus/client_golang v0.8.0/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXP github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.4.0/go.mod h1:e9GMxYsXl05ICDXkRhurwBS4Q3OK1iX/F2sw+iXX5zU= -github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= -github.com/prometheus/client_golang v1.11.0/go.mod h1:Z6t4BnS23TR94PD6BsDNk8yVqroYurpAkEiz0P2BEV0= -github.com/prometheus/client_golang v1.12.1 h1:ZiaPsmm9uiBeaSMRznKsCDNtPCS0T3JVDGF+06gjBzk= -github.com/prometheus/client_golang v1.12.1/go.mod h1:3Z9XVyYiZYEO+YQWt3RD2R3jrbd179Rt297l4aS6nDY= github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo= github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= -github.com/prometheus/client_model v0.2.0 h1:uq5h0d+GuxiXLJLNABMgp2qUWDPiLvgCzz2dUR+/W/M= github.com/prometheus/client_model v0.2.0/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA= github.com/prometheus/common v0.0.0-20180801064454-c7de2306084e/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro= github.com/prometheus/common v0.4.1/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4= github.com/prometheus/common v0.9.1/go.mod h1:yhUN8i9wzaXS3w1O07YhxHEBxD+W35wd8bs7vj7HSQ4= -github.com/prometheus/common v0.10.0/go.mod h1:Tlit/dnDKsSWFlCLTWaA1cyBgKHSMdTB80sz/V91rCo= -github.com/prometheus/common v0.26.0/go.mod h1:M7rCNAaPfAosfx8veZJCuw84e35h3Cfd9VFqTh1DIvc= -github.com/prometheus/common v0.32.1 h1:hWIdL3N2HoUx3B8j3YN9mWor0qhY/NlEKZEaXxuIRh4= -github.com/prometheus/common v0.32.1/go.mod h1:vu+V0TpY+O6vW9J44gczi3Ap/oXXR10b+M/gUGO4Hls= github.com/prometheus/procfs v0.0.0-20180725123919-05ee40e3a273/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk= github.com/prometheus/procfs v0.0.2/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA= github.com/prometheus/procfs v0.0.8/go.mod h1:7Qr8sr6344vo1JqZ6HhLceV9o3AJ1Ff+GxbHq6oeK9A= -github.com/prometheus/procfs v0.1.3/go.mod h1:lV6e/gmhEcM9IjHGsFOCxxuZ+z1YqCvr4OA4YeYWdaU= -github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/prometheus/procfs v0.7.3 h1:4jVXhlkAyzOScmCkXBTOLRLTz8EeU+eyjrwB/EPq0VU= -github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= -github.com/quasilyte/go-ruleguard v0.3.1-0.20210203134552-1b5a410e1cc8/go.mod h1:KsAh3x0e7Fkpgs+Q9pNLS5XpFSvYCEVl5gP9Pp1xp30= -github.com/quasilyte/go-ruleguard v0.3.17 h1:cDdoaSbQg11LXPDQqiCK54QmQXsEQQCTIgdcpeULGSI= -github.com/quasilyte/go-ruleguard v0.3.17/go.mod h1:sST5PvaR7yb/Az5ksX8oc88usJ4EGjmJv7cK7y3jyig= -github.com/quasilyte/go-ruleguard/dsl v0.3.0/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/dsl v0.3.21/go.mod h1:KeCP03KrjuSO0H1kTuZQCWlQPulDV6YMIXmpQss17rU= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20201231183845-9e62ed36efe1/go.mod h1:7JTjp89EGyU1d6XfBiXihJNG37wB2VRkd125Q1u7Plc= -github.com/quasilyte/go-ruleguard/rules v0.0.0-20211022131956-028d6511ab71/go.mod h1:4cgAphtvu7Ftv7vOT2ZOYhC6CvBxZixcasr8qIOTA50= -github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5 h1:PDWGei+Rf2bBiuZIbZmM20J2ftEy9IeUCHA8HbQqed8= -github.com/quasilyte/gogrep v0.0.0-20220120141003-628d8b3623b5/go.mod h1:wSEyW6O61xRV6zb6My3HxrQ5/8ke7NE2OayqCHa3xRM= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95 h1:L8QM9bvf68pVdQ3bCFZMDmnt9yqcMBro1pC7F+IPYMY= -github.com/quasilyte/regex/syntax v0.0.0-20200407221936-30656e2c4a95/go.mod h1:rlzQ04UMyJXu/aOvhd8qT+hvDrFpiwqp8MRXDY9szc0= -github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567 h1:M8mH9eK4OUR4lu7Gd+PU1fV2/qnDNfzT635KRSObncs= -github.com/quasilyte/stdinfo v0.0.0-20220114132959-f7386bf02567/go.mod h1:DWNGW8A4Y+GyBgPuaQJuWiy0XYftx4Xm/y5Jqk9I6VQ= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475 h1:N/ElC8H3+5XpJzTSTfLsJV/mx9Q9g7kxmchpfZyxgzM= github.com/rcrowley/go-metrics v0.0.0-20201227073835-cf1acfcdf475/go.mod h1:bCqnVzQkZxMG4s8nGwiZ5l3QUCyqpo9Y+/ZMZ9VjZe4= github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs= @@ -857,8 +632,9 @@ github.com/rogpeppe/go-internal v1.1.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFR github.com/rogpeppe/go-internal v1.2.2/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc= -github.com/rogpeppe/go-internal v1.8.0 h1:FCbCCtXNOY3UtUuHUYaghJg4y7Fd14rXifAYUAtL9R8= github.com/rogpeppe/go-internal v1.8.0/go.mod h1:WmiCO8CzOY8rg0OYDC4/i/2WRWAB6poM+XZ2dLUbcbE= +github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg= +github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o= github.com/rpcxio/libkv v0.5.1-0.20210420120011-1fceaedca8a5 h1:oGficf/KJp1y22zTpjjCRtjtNM9QRjww3fqyQPLgypg= github.com/rpcxio/libkv v0.5.1-0.20210420120011-1fceaedca8a5/go.mod h1:zHGgtLr3cFhGtbalum0BrMPOjhFZFJXCKiws/25ewls= github.com/rs/cors v1.8.2 h1:KCooALfAYGs415Cwu5ABvv9n9509fSiG5SQJn/AQo4U= @@ -870,33 +646,17 @@ github.com/rubyist/circuitbreaker v2.2.1+incompatible/go.mod h1:Ycs3JgJADPuzJDwf github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= -github.com/ryancurrah/gomodguard v1.2.4 h1:CpMSDKan0LtNGGhPrvupAoLeObRFjND8/tU1rEOtBp4= -github.com/ryancurrah/gomodguard v1.2.4/go.mod h1:+Kem4VjWwvFpUJRJSwa16s1tBJe+vbv02+naTow2f6M= -github.com/ryanrolds/sqlclosecheck v0.3.0 h1:AZx+Bixh8zdUBxUA1NxbxVAS78vTPq4rCb8OUZI9xFw= -github.com/ryanrolds/sqlclosecheck v0.3.0/go.mod h1:1gREqxyTGR3lVtpngyFo3hZAgk0KCtEdgEkHwDbigdA= github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts= github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414 h1:AJNDS0kP60X8wwWFvbLPwDuojxubj9pbfK7pjHw0vKg= github.com/samuel/go-zookeeper v0.0.0-20201211165307-7117e9ea2414/go.mod h1:gi+0XIa01GRL2eRQVjQkKGqKF3SF9vZR/HnPullcV2E= -github.com/sanposhiho/wastedassign/v2 v2.0.6 h1:+6/hQIHKNJAUixEj6EmOngGIisyeI+T3335lYTyxRoA= -github.com/sanposhiho/wastedassign/v2 v2.0.6/go.mod h1:KyZ0MWTwxxBmfwn33zh3k1dmsbF2ud9pAAGfoLfjhtI= -github.com/sashamelentyev/interfacebloat v1.1.0 h1:xdRdJp0irL086OyW1H/RTZTr1h/tMEOsumirXcOJqAw= -github.com/sashamelentyev/interfacebloat v1.1.0/go.mod h1:+Y9yU5YdTkrNvoX0xHc84dxiN1iBi9+G8zZIhPVoNjQ= -github.com/sashamelentyev/usestdlibvars v1.13.0 h1:uObNudVEEHf6JbOJy5bgKJloA1bWjxR9fwgNFpPzKnI= -github.com/sashamelentyev/usestdlibvars v1.13.0/go.mod h1:D2Wb7niIYmTB+gB8z7kh8tyP5ccof1dQ+SFk+WW5NtY= github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww= github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 h1:nn5Wsu0esKSJiIVhscUtVbo7ada43DJhG55ua/hjS5I= github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc= -github.com/securego/gosec/v2 v2.13.1 h1:7mU32qn2dyC81MH9L2kefnQyRMUarfDER3iQyMHcjYM= -github.com/securego/gosec/v2 v2.13.1/go.mod h1:EO1sImBMBWFjOTFzMWfTRrZW6M15gm60ljzrmy/wtHo= github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo= github.com/serialx/hashring v0.0.0-20200727003509-22c0c7ab6b1b/go.mod h1:/yeG0My1xr/u+HZrFQ1tOQQQQrOawfyMUH13ai5brBc= github.com/sethvargo/go-password v0.2.0 h1:BTDl4CC/gjf/axHMaDQtw507ogrXLci6XRiLc7i/UHI= github.com/sethvargo/go-password v0.2.0/go.mod h1:Ym4Mr9JXLBycr02MFuVQ/0JHidNetSgbzutTr3zsYXE= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c h1:W65qqJCIOVP4jpqPQ0YvHYKwcMEMVWIzWC5iNQQfBTU= -github.com/shazow/go-diff v0.0.0-20160112020656-b6b7b6733b8c/go.mod h1:/PevMnwAxekIXwN8qQyfc5gl2NlkB3CQlkizAbOkeBs= -github.com/shirou/gopsutil/v3 v3.22.2 h1:wCrArWFkHYIdDxx/FSfF5RB4dpJYW6t7rcp3+zL8uks= -github.com/shirou/gopsutil/v3 v3.22.2/go.mod h1:WapW1AOOPlHyXr+yOyw3uYx36enocrtSoSBy0L5vUHY= github.com/shirou/gopsutil/v3 v3.22.7 h1:flKnuCMfUUrO+oAvwAd6GKZgnPzr098VA/UJ14nhJd4= github.com/shirou/gopsutil/v3 v3.22.7/go.mod h1:s648gW4IywYzUfE/KjXxUsqrqx/T2xO5VqOXxONeRfI= github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY= @@ -929,17 +689,9 @@ github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPx github.com/sirupsen/logrus v1.4.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= github.com/sirupsen/logrus v1.4.1/go.mod h1:ni0Sbl8bgC9z8RoU9G6nDWqqs/fq4eDPysMBDgk/93Q= github.com/sirupsen/logrus v1.4.2/go.mod h1:tLMulIdttU9McNUspp0xgXVQah82FyeX6MwdIuYE2rE= -github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88= -github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE= github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0= github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0= github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ= -github.com/sivchari/containedctx v1.0.2 h1:0hLQKpgC53OVF1VT7CeoFHk9YKstur1XOgfYIc1yrHI= -github.com/sivchari/containedctx v1.0.2/go.mod h1:PwZOeqm4/DLoJOqMSIJs3aKqXRX4YO+uXww087KZ7Bw= -github.com/sivchari/nosnakecase v1.7.0 h1:7QkpWIRMe8x25gckkFd2A5Pi6Ymo0qgr4JrhGt95do8= -github.com/sivchari/nosnakecase v1.7.0/go.mod h1:CwDzrzPea40/GB6uynrNLiorAlgFRvRbFSgJx2Gs+QY= -github.com/sivchari/tenv v1.7.0 h1:d4laZMBK6jpe5PWepxlV9S+LC0yXqvYHiq8E6ceoVVE= -github.com/sivchari/tenv v1.7.0/go.mod h1:64yStXKSOxDfX47NlhVwND4dHwfZDdbp2Lyl018Icvg= github.com/smallnest/quick v0.0.0-20220103065406-780def6371e6 h1:J8xk0QMMrqfDLqU0m07pYRRiOIlE7I3dNWAp/pAHqfo= github.com/smallnest/quick v0.0.0-20220103065406-780def6371e6/go.mod h1:h+J5yoLzf3XMKtM9l4vOaUtS4e+si6T3sKDtheJ15wc= github.com/smallnest/rpcx v1.7.4 h1:u6ADk/Ep8BqtAoJZO7LbniWsP+nqeAtcbaPm2D4eOXg= @@ -953,22 +705,15 @@ github.com/smartystreets/goconvey v1.7.2 h1:9RBaZCeXEQ3UselpuwUQHltGVXvdwm6cv1hg github.com/smartystreets/goconvey v1.7.2/go.mod h1:Vw0tHAZW6lzCRk3xgdin6fKYcG+G3Pg9vgXWeJpQFMM= github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js= github.com/soheilhy/cmux v0.1.5/go.mod h1:T7TcVDs9LWfQgPlPsdngu6I6QIoyIFZDDC6sNE1GqG0= -github.com/sonatard/noctx v0.0.1 h1:VC1Qhl6Oxx9vvWo3UDgrGXYCeKCe3Wbw7qAWL6FrmTY= -github.com/sonatard/noctx v0.0.1/go.mod h1:9D2D/EoULe8Yy2joDHJj7bv3sZoq9AaSb8B4lqBjiZI= github.com/sourcegraph/annotate v0.0.0-20160123013949-f4cad6c6324d/go.mod h1:UdhH50NIW0fCiwBSr0co2m7BnFLdv4fQTgdqdJTHFeE= -github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= -github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/sourcegraph/syntaxhighlight v0.0.0-20170531221838-bd320f5d308e/go.mod h1:HuIsMU8RRBOtsCgI77wP899iHVBQpCmg4ErYMZB+2IA= -github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY= github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I= github.com/spf13/afero v1.8.2 h1:xehSyVa0YnHWsJ49JFljMpg1HX19V6NDZ1fkm1Xznbo= github.com/spf13/afero v1.8.2/go.mod h1:CtAatgMJh6bJEIs48Ay/FOnkljP3WeGUG0MC1RfAqwo= -github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng= github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cast v1.5.0 h1:rj3WzYc11XZaIZMPKmwP96zkFEnnAmV8s6XbB2aY32w= github.com/spf13/cast v1.5.0/go.mod h1:SpXXQ5YoyJw6s3/6cMTQuxvgRl3PCJiyaX9p6b155UU= github.com/spf13/cobra v0.0.3/go.mod h1:1l0Ry5zgKvJasoi3XT1TypsSe7PqH0Sj9dhYf7v3XqQ= -github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw= github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk= github.com/spf13/cobra v1.5.0 h1:X+jTBEBqF0bHN+9cSMgmfuvv2VHJ9ezmFNf9Y/XstYU= github.com/spf13/cobra v1.5.0/go.mod h1:dWXEIy2H428czQCjInthrTRUg7yKbok+2Qi/yBIJoUM= @@ -977,7 +722,6 @@ github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -github.com/spf13/viper v1.8.1 h1:Kq1fyeebqsBfbjZj4EL7gj2IO0mMaiyjYUWcUsl2O44= github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns= github.com/spf13/viper v1.12.0 h1:CZ7eSOd3kZoaYDLbXnmzgQI5RlciuXBMA+18HwHRfZQ= github.com/spf13/viper v1.12.0/go.mod h1:b6COn30jlNxbm/V2IqWiNWkJ+vZNiMNksliPCiuKtSI= @@ -985,17 +729,11 @@ github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564 h1:HunZiaEKNGVdhTRQO github.com/srwiley/oksvg v0.0.0-20200311192757-870daf9aa564/go.mod h1:afMbS0qvv1m5tfENCwnOdZGOF8RGR/FsZ7bvBxQGZG4= github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9 h1:m59mIOBO4kfcNCEzJNy71UkeF4XIx2EVmL9KLwDQdmM= github.com/srwiley/rasterx v0.0.0-20200120212402-85cb7272f5e9/go.mod h1:mvWM0+15UqyrFKqdRjY6LuAVJR0HOVhJlEgZ5JWtSWU= -github.com/ssgreg/nlreturn/v2 v2.2.1 h1:X4XDI7jstt3ySqGU86YGAURbxw3oTDPK9sPEi6YEwQ0= -github.com/ssgreg/nlreturn/v2 v2.2.1/go.mod h1:E/iiPB78hV7Szg2YfRgyIrk1AD6JVMTRkkxBiELzh2I= -github.com/stbenjam/no-sprintf-host-port v0.1.1 h1:tYugd/yrm1O0dV+ThCbaKZh195Dfm07ysF0U6JQXczc= -github.com/stbenjam/no-sprintf-host-port v0.1.1/go.mod h1:TLhvtIvONRzdmkFiio4O8LHsN9N74I+PhRquPsxpL0I= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/objx v0.3.0 h1:NGXK3lHquSN08v5vWalVI/L8XU9hdzE/G6xsrze47As= github.com/stretchr/objx v0.3.0/go.mod h1:qt09Ya8vawLte6SNmTgCsAVtYtaKzEcn8ATUoHMkEqE= github.com/stretchr/objx v0.4.0 h1:M2gUjqZET1qApGOWNSnZ49BAIMX4F/1plDv3+l31EJ4= github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= -github.com/stretchr/testify v1.1.4/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= @@ -1003,27 +741,17 @@ github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= -github.com/stretchr/testify v1.7.2 h1:4jaiDzPyXQvSd7D0EjG45355tLlV3VOECpq10pLC+8s= github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1FQKckRals= github.com/stretchr/testify v1.8.0 h1:pSgiaMZlXftHpm5L7V1+rVB+AZJydKsMxsQBIJw4PKk= github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= -github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s= github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/subosito/gotenv v1.4.0 h1:yAzM1+SmVcz5R4tXGsNMu1jUl2aOJXoiWUCEwwnGrvs= github.com/subosito/gotenv v1.4.0/go.mod h1:mZd6rFysKEcUhUHXJk0C/08wAgyDBFuwEYL7vWWGaGo= -github.com/sylvia7788/contextcheck v1.0.6 h1:o2EZgVPyMKE/Mtoqym61DInKEjwEbsmyoxg3VrmjNO4= -github.com/sylvia7788/contextcheck v1.0.6/go.mod h1:9XDxwvxyuKD+8N+a7Gs7bfWLityh5t70g/GjdEt2N2M= github.com/tarm/serial v0.0.0-20180830185346-98f6abe2eb07/go.mod h1:kDXzergiv9cbyO7IOYJZWg1U88JhDg3PB6klq9Hg2pA= -github.com/tdakkota/asciicheck v0.1.1 h1:PKzG7JUTUmVspQTDqtkX9eSiLGossXTybutHwTXuO0A= -github.com/tdakkota/asciicheck v0.1.1/go.mod h1:yHp0ai0Z9gUljN3o0xMhYJnH/IcvkdTBOX2fmJ93JEM= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161 h1:89CEmDvlq/F7SJEOqkIdNDGJXrQIhuIx9D2DBXjavSU= github.com/templexxx/cpufeat v0.0.0-20180724012125-cef66df7f161/go.mod h1:wM7WEvslTq+iOEAMDLSzhVuOt5BRZ05WirO+b09GHQU= github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b h1:fj5tQ8acgNUr6O8LEplsxDhUIe2573iLkJc+PqnzZTI= github.com/templexxx/xor v0.0.0-20191217153810-f85b25db303b/go.mod h1:5XA7W9S6mni3h5uvOC75dA3m9CCCaS83lltmc0ukdi4= -github.com/tenntenn/modver v1.0.1/go.mod h1:bePIyQPb7UeioSRkw3Q0XeMhYZSMx9B8ePqg6SAMGH0= -github.com/tenntenn/text/transform v0.0.0-20200319021203-7eef512accb3/go.mod h1:ON8b8w4BN/kE1EOhwT0o+d62W65a6aPw1nouo9LMgyY= -github.com/tetafro/godot v1.4.11 h1:BVoBIqAf/2QdbFmSwAWnaIqDivZdOV0ZRwEm6jivLKw= -github.com/tetafro/godot v1.4.11/go.mod h1:LR3CJpxDVGlYOWn3ZZg1PgNZdTUvzsZWu8xaEohUpn8= github.com/tevino/abool v1.2.0 h1:heAkClL8H6w+mK5md9dzsuohKeXHUpY7Vw0ZCKW+huA= github.com/tevino/abool v1.2.0/go.mod h1:qc66Pna1RiIsPa7O4Egxxs9OqkuxDX55zznh9K07Tzg= github.com/tidwall/gjson v1.14.1 h1:iymTbGkQBhveq21bEvAQ81I0LEBork8BFe1CUZXdyuo= @@ -1033,35 +761,19 @@ github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JT github.com/tidwall/pretty v1.0.0/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk= github.com/tidwall/pretty v1.2.0 h1:RWIZEg2iJ8/g6fDDYzMpobmaoGh5OLl4AXtGUGPcqCs= github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144 h1:kl4KhGNsJIbDHS9/4U9yQo1UcPQM0kOMJHn29EoH/Ro= -github.com/timakin/bodyclose v0.0.0-20210704033933-f49887972144/go.mod h1:Qimiffbc6q9tBWlVV6x0P9sat/ao1xEkREYPPj9hphk= -github.com/timonwong/logrlint v0.1.0 h1:phZCcypL/vtx6cGxObJgWZ5wexZF5SXFPLOM+ru0e/M= -github.com/timonwong/logrlint v0.1.0/go.mod h1:Zleg4Gw+kRxNej+Ra7o+tEaW5k1qthTaYKU7rSD39LU= github.com/tinylib/msgp v1.1.6 h1:i+SbKraHhnrf9M5MYmvQhFnbLhAXSDWF8WWsuyRdocw= github.com/tinylib/msgp v1.1.6/go.mod h1:75BAfg2hauQhs3qedfdDZmWAPcFMAvJE5b9rGOMufyw= github.com/tjfoc/gmsm v1.4.1 h1:aMe1GlZb+0bLjn+cKTPEvvn9oUEBlJitaZiiBwsbgho= github.com/tjfoc/gmsm v1.4.1/go.mod h1:j4INPkHWMrhJb38G+J6W4Tw0AbuN8Thu3PbdVYhVcTE= -github.com/tklauser/go-sysconf v0.3.9 h1:JeUVdAOWhhxVcU6Eqr/ATFHgXk/mmiItdKeJPev3vTo= -github.com/tklauser/go-sysconf v0.3.9/go.mod h1:11DU/5sG7UexIrp/O6g35hrWzu0JxlwQ3LSFUzyeuhs= +github.com/tklauser/go-sysconf v0.3.10 h1:IJ1AZGZRWbY8T5Vfk04D9WOA5WSejdflXxP03OUqALw= github.com/tklauser/go-sysconf v0.3.10/go.mod h1:C8XykCvCb+Gn0oNCWPIlcb0RuglQTYaQ2hGm7jmxEFk= -github.com/tklauser/numcpus v0.3.0 h1:ILuRUQBtssgnxw0XXIjKUC56fgnOrFoQQ/4+DeU2biQ= -github.com/tklauser/numcpus v0.3.0/go.mod h1:yFGUr7TUHQRAhyqBcEg0Ge34zDBAsIvJJcyE6boqnA8= +github.com/tklauser/numcpus v0.4.0 h1:E53Dm1HjH1/R2/aoCtXtPgzmElmn51aOkhCFSuZq//o= github.com/tklauser/numcpus v0.4.0/go.mod h1:1+UI3pD8NW14VMwdgJNJ1ESk2UnwhAnz5hMwiKKqXCQ= -github.com/tomarrell/wrapcheck/v2 v2.6.2 h1:3dI6YNcrJTQ/CJQ6M/DUkc0gnqYSIk6o0rChn9E/D0M= -github.com/tomarrell/wrapcheck/v2 v2.6.2/go.mod h1:ao7l5p0aOlUNJKI0qVwB4Yjlqutd0IvAB9Rdwyilxvg= -github.com/tommy-muehle/go-mnd/v2 v2.5.0 h1:iAj0a8e6+dXSL7Liq0aXPox36FiN1dBbjA6lt9fl65s= -github.com/tommy-muehle/go-mnd/v2 v2.5.0/go.mod h1:WsUAkMJMYww6l/ufffCD3m+P7LEvr8TnZn9lwVDlgzw= github.com/tv42/httpunix v0.0.0-20150427012821-b75d8614f926/go.mod h1:9ESjWnEqriFuLhtthL60Sar/7RFoluCcXsuvEwTV5KM= github.com/ugorji/go v1.2.7/go.mod h1:nF9osbDWLy6bDVv/Rtoh6QgnvNDpmCalQV5urGCCS6M= github.com/ugorji/go/codec v1.2.7 h1:YPXUKf7fYbp/y8xloBqZOw2qaVggbfwMlI8WM3wZUJ0= github.com/ugorji/go/codec v1.2.7/go.mod h1:WGN1fab3R1fzQlVQTkfxVtIBhWDRqOviHU95kRgeqEY= -github.com/ultraware/funlen v0.0.3 h1:5ylVWm8wsNwH5aWo9438pwvsK0QiqVuUrt9bn7S/iLA= -github.com/ultraware/funlen v0.0.3/go.mod h1:Dp4UiAus7Wdb9KUZsYWZEWiRzGuM2kXM1lPbfaF6xhA= -github.com/ultraware/whitespace v0.0.5 h1:hh+/cpIcopyMYbZNVov9iSxvJU3OYQg78Sfaqzi/CzI= -github.com/ultraware/whitespace v0.0.5/go.mod h1:aVMh/gQve5Maj9hQ/hg+F75lr/X5A89uZnzAmWSineA= github.com/urfave/cli/v2 v2.4.0/go.mod h1:NX9W0zmTvedE5oDoOMs2RTC8RvdK98NTYZE5LbaEYPg= -github.com/uudashr/gocognit v1.0.6 h1:2Cgi6MweCsdB6kpcVQp7EW4U23iBFQWfTXiWlyp842Y= -github.com/uudashr/gocognit v1.0.6/go.mod h1:nAIUuVBnYU7pcninia3BHOvQkpQCeO76Uscky5BOwcY= github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6KllzawFIhcdPw= github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/valyala/fastrand v1.1.0 h1:f+5HkLW4rsgzdNoleUOB69hyT9IlD2ZQh9GyDMfb5G8= @@ -1082,10 +794,6 @@ github.com/xtaci/kcp-go v5.4.20+incompatible h1:TN1uey3Raw0sTz0Fg8GkfM0uH3YwzhnZ github.com/xtaci/kcp-go v5.4.20+incompatible/go.mod h1:bN6vIwHQbfHaHtFpEssmWsN45a+AZwO7eyRCmEIbtvE= github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37 h1:EWU6Pktpas0n8lLQwDsRyZfmkPeRbdgPtW609es+/9E= github.com/xtaci/lossyconn v0.0.0-20200209145036-adba10fffc37/go.mod h1:HpMP7DB2CyokmAh4lp0EQnnWhmycP/TvwBGzvuie+H0= -github.com/yagipy/maintidx v1.0.0 h1:h5NvIsCz+nRDapQ0exNv4aJ0yXSI0420omVANTv3GJM= -github.com/yagipy/maintidx v1.0.0/go.mod h1:0qNf/I/CCZXSMhsRsrEPDZ+DkekpKLXAJfsTACwgXLk= -github.com/yeya24/promlinter v0.2.0 h1:xFKDQ82orCU5jQujdaD8stOHiv8UN68BSdn2a8u8Y3o= -github.com/yeya24/promlinter v0.2.0/go.mod h1:u54lkmBOZrpEbQQ6gox2zWKKLKu2SGe+2KOiextY+IA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d h1:splanxYIlg+5LfHAM6xpdFEAYOk8iySO56hMFq6uLyA= github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d/go.mod h1:rHwXgn7JulP+udvsHwJoVG1YGAP6VLg4y9I5dyZdqmA= github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= @@ -1099,8 +807,6 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= github.com/yusufpapurcu/wmi v1.2.2 h1:KBNDSne4vP5mbSWnJbO+51IMOXJB67QiYCSBrubbPRg= github.com/yusufpapurcu/wmi v1.2.2/go.mod h1:SBZ9tNy3G9/m5Oi98Zks0QjeHVDvuK0qfxQmPyzfmi0= -gitlab.com/bosi/decorder v0.2.3 h1:gX4/RgK16ijY8V+BRQHAySfQAb354T7/xQpDB2n10P0= -gitlab.com/bosi/decorder v0.2.3/go.mod h1:9K1RB5+VPNQYtXtTDAzd2OEftsZb1oV0IrJrzChSdGE= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g= go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ= @@ -1168,11 +874,6 @@ golang.org/x/exp v0.0.0-20191227195350-da58074b4299/go.mod h1:2RIsYlXP63K8oxa1u0 golang.org/x/exp v0.0.0-20200119233911-0405dc783f0a/go.mod h1:2RIsYlXP63K8oxa1u096TMicItID8zy7Y6sNkU49FU4= golang.org/x/exp v0.0.0-20200207192155-f17229e696bd/go.mod h1:J/WKrq2StrnmMY6+EHIKF9dgMWnmCNThgcyBT1FY9mM= golang.org/x/exp v0.0.0-20200224162631-6cc2880d07d6/go.mod h1:3jZMyOhIsHpP37uCMkUooju7aAi5cS1Q23tOzKc+0MU= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/exp/typeparams v0.0.0-20220428152302-39d4317da171/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= -golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d h1:+W8Qf4iJtMGKkyAygcKohjxTk4JPsL9DpzApJ22m5Ic= -golang.org/x/exp/typeparams v0.0.0-20220613132600-b0d781184e0d/go.mod h1:AbB0pIl9nAr9wVwH+Z2ZpaocVmF5I4GyWCDIsVjR0bk= golang.org/x/image v0.0.0-20190227222117-0694c2d4d067/go.mod h1:kZ7UVZpmo3dzQBMxlp+ypCbDeSB+sBbTgSJuh5dn5js= golang.org/x/image v0.0.0-20190802002840-cff245a6509b/go.mod h1:FeLwcggjj3mMvU+oOTbSwawSJRM1uh48EjtB4UJZlP0= golang.org/x/image v0.0.0-20220601225756-64ec528b34cd h1:9NbNcTg//wfC5JskFW4Z3sqwVnjmJKHxLAol1bW2qgw= @@ -1256,7 +957,6 @@ golang.org/x/net v0.0.0-20210316092652-d523dce5a7f4/go.mod h1:RBQZq4jEuRlivfhVLd golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM= golang.org/x/net v0.0.0-20210410081132-afb366fc7cd1/go.mod h1:9tjilg8BloeKEkVJvy7fQ90B1CfIiPueXVOjqfkSzI8= golang.org/x/net v0.0.0-20210428140749-89ef3d95e781/go.mod h1:OJAsFXCWl8Ukc7SiCT/9KSuxbyM7479/AVlXFRxuMCk= -golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210805182204-aaa1db679c0d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= @@ -1280,7 +980,6 @@ golang.org/x/oauth2 v0.0.0-20210218202405-ba52d332ba99/go.mod h1:KelEdhl1UZF7XfJ golang.org/x/oauth2 v0.0.0-20210220000619-9bb904979d93/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210313182246-cd4f82c27b84/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= -golang.org/x/oauth2 v0.0.0-20210514164344-f6687ab2804c/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A= golang.org/x/perf v0.0.0-20180704124530-6e6d33e29852/go.mod h1:JLpeXjPJfIyPr5TlbXLkXWLhP8nz10XfvxElABhCtcw= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -1328,7 +1027,6 @@ golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191228213918-04cbcbbfeed8/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200106162015-b016eb3dc98e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200113162924-86b910548bc1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200122134326-e047566fdf82/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1344,8 +1042,6 @@ golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200615200032-f1bc736245b1/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1355,7 +1051,6 @@ golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210104204734-6f8348627aad/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210124154548-22da62e12c0c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210220050731-9a76102bfb43/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210225134936-a50acf3fe073/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210303074136-134d130e1a04/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= @@ -1368,26 +1063,18 @@ golang.org/x/sys v0.0.0-20210420072515-93ed5bcd2bfe/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210603081109-ebe580a85c40/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210806184541-e5e7981a1069/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20210816074244-15123e1e1f71/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20211105183446-c75c47738b0c/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220111092808-5a964db01320/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220412211240-33da011f77ad/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220702020025-31831981b65f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f h1:v4INt8xihDGvnrfjMDVXGxw9wrfxYyCjk0KbXjhR55s= -golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU= golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= @@ -1407,19 +1094,14 @@ golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxb golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/tools v0.0.0-20180525024113-a5b4c53f6e8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180828015842-6cd1fcedba52/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20181030000716-a0a13e073c7b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY= -golang.org/x/tools v0.0.0-20190307163923-6a08e3108db3/go.mod h1:25r3+/G6/xytQM8iWZKq3Hn0kr0rgFKPUNVEL/dr3z4= golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190311215038-5c2858a9cfe5/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312151545-0bb0c0a6e846/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190312170243-e65039ee4138/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190321232350-e250d351ecad/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= -golang.org/x/tools v0.0.0-20190322203728-c1a832b0ad89/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190328211700-ab21143f2384/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190329151228-23e29df326fe/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= golang.org/x/tools v0.0.0-20190416151739-9c9e1878f421/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs= @@ -1433,13 +1115,10 @@ golang.org/x/tools v0.0.0-20190621195816-6e04913cbbac/go.mod h1:/rFqwRUd4F7ZHNgw golang.org/x/tools v0.0.0-20190628153133-6cdbf07be9d0/go.mod h1:/rFqwRUd4F7ZHNgwSSTFct+R/Kf4OFW1sUzUTQQTgfc= golang.org/x/tools v0.0.0-20190816200558-6889da9d5479/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190907020128-2ca718005c18/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190910044552-dd2b5c81c578/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20190911174233-4f2ddba30aff/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20190916130336-e45ffcd953cc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191012152004-8de300cfc20a/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029041327-9cc4af7d6b2c/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191029190741-b9c20aec41a5/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= -golang.org/x/tools v0.0.0-20191108193012-7d206e10da11/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191112195655-aa38f8e97acc/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191113191852-77e3bb0ad9e7/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= golang.org/x/tools v0.0.0-20191115202509-3a792d9c32b2/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo= @@ -1450,7 +1129,6 @@ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20191216173652-a0e659d51361/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20191227053925-7b8e75db28f4/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200117161641-43d50277825c/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= -golang.org/x/tools v0.0.0-20200117220505-0cba7a3a9ee9/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200122220014-bf1340f18c4a/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200204074204-1cc6d1ef6c74/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= @@ -1460,59 +1138,38 @@ golang.org/x/tools v0.0.0-20200224181240-023911ca70b2/go.mod h1:TB2adYChydJhpapK golang.org/x/tools v0.0.0-20200227222343-706bc42d1f0d/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28= golang.org/x/tools v0.0.0-20200304193943-95d2e580d8eb/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= golang.org/x/tools v0.0.0-20200312045724-11d5b4c81c7d/go.mod h1:o4KQGtdN14AW+yjsvvwRTJJuXz8XRtIHtEnmAXLyFUw= -golang.org/x/tools v0.0.0-20200324003944-a576cf524670/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200329025819-fd4102a86c65/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= golang.org/x/tools v0.0.0-20200331025713-a30bf2db82d4/go.mod h1:Sl4aGygMT6LrqrWclx+PTx3U+LnKx/seiNR+3G19Ar8= -golang.org/x/tools v0.0.0-20200414032229-332987a829c3/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200501065659-ab2804fb9c9d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200512131952-2bc93b1c0c88/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200515010526-7d3b6ebf133d/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200618134242-20370b0cb4b2/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= golang.org/x/tools v0.0.0-20200619180055-7c47624df98f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200622203043-20e05c1c8ffa/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200624225443-88f3c62a19ff/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200625211823-6506e20df31f/go.mod h1:EkVYQZoAsY45+roYkvgYkIh4xh/qjgUK9TdY2XT94GE= -golang.org/x/tools v0.0.0-20200724022722-7017fd6b1305/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200729194436-6467de6f59a7/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200804011535-6c149bb5ef0d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200820010801-b793a1359eac/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= golang.org/x/tools v0.0.0-20200825202427-b303f430e36d/go.mod h1:njjCfa9FT2d7l9Bc6FUM5FLjQPp3cFF28FI3qnDFljA= -golang.org/x/tools v0.0.0-20200831203904-5a2aa26beb65/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= golang.org/x/tools v0.0.0-20200904185747-39188db58858/go.mod h1:Cj7w3i3Rnn0Xh82ur9kSqwfTHTeVxaDqrfMjpcNT6bE= -golang.org/x/tools v0.0.0-20201001104356-43ebab892c4c/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= -golang.org/x/tools v0.0.0-20201002184944-ecd9fd270d5d/go.mod h1:z6u4i615ZeAfBE4XtMziQW1fSVJXACjjbWkB/mvPzlU= golang.org/x/tools v0.0.0-20201022035929-9cf592e881e9/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201023174141-c8cfbd0f21e6/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201110124207-079ba7bd75cd/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201201161351-ac6f37ff4c2a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201208233053-a543418bbed2/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= -golang.org/x/tools v0.0.0-20201230224404-63754364767c/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210105154028-b0ab187a4818/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210106214847-113979e3529a/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.0.0-20210108195828-e2f9c7f1fc8e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA= golang.org/x/tools v0.1.0/go.mod h1:xkSsbof2nBLbhDlRMhhhyNLN/zl3eTqcnHD5viDpcZ0= -golang.org/x/tools v0.1.1-0.20210205202024-ef80cdb6ec6d/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= -golang.org/x/tools v0.1.1-0.20210302220138-2ac05c832e1a/go.mod h1:9bzcO0MWcOuT0tm1iBGzDVPshzfwoVvREIui8C+MHqU= golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk= golang.org/x/tools v0.1.8-0.20211022200916-316ba0b74098/go.mod h1:LGqMHiF4EqQNHR1JncWGqT5BVaXmza+X+BDGol+dOxo= golang.org/x/tools v0.1.8/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9-0.20211228192929-ee1ca4ffc4da/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= -golang.org/x/tools v0.1.9/go.mod h1:nABZi5QlRsZVlzPpHl034qft6wpY4eDcsTt5AaioBiU= golang.org/x/tools v0.1.10/go.mod h1:Uh6Zz+xoGYZom868N8YTex3t7RhtHDBrE8Gzo9bV56E= -golang.org/x/tools v0.1.11/go.mod h1:SgwaegtQh8clINPpECJMqnxLv9I09HLqnW3RMqW0CA4= golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU= golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -golang.org/x/xerrors v0.0.0-20220517211312-f3a8303e98df h1:5Pf6pFKu98ODmgnpvkJ3kFUOQGGLIzLIkbzUHp47618= google.golang.org/api v0.0.0-20180910000450-7ca32eb868bf/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.0.0-20181030000543-1d582fd0359e/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.1.0/go.mod h1:UGEZY7KEX120AnNLIHFMKIo4obdJhkp2tPbaPlQx13Y= @@ -1642,7 +1299,6 @@ gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI= gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/inf.v0 v0.9.1/go.mod h1:cWUDdTG/fYaXco+Dcufb5Vnc6Gp2YChqWtbxRZE0mXw= gopkg.in/ini.v1 v1.42.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= -gopkg.in/ini.v1 v1.62.0 h1:duBzk771uxoUuOlyRLkHsygud9+5lrlGjdFBb4mSKDU= gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= gopkg.in/ini.v1 v1.66.6 h1:LATuAqN/shcYAOkv3wl2L4rkaKqkcgTBQjOyYDvcPKI= gopkg.in/ini.v1 v1.66.6/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k= @@ -1674,16 +1330,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -honnef.co/go/tools v0.3.3 h1:oDx7VAwstgpYpb3wv0oxiZlxY+foCpRAwY7Vk6XpAgA= -honnef.co/go/tools v0.3.3/go.mod h1:jzwdWgg7Jdq75wlfblQxO4neNaFFSvgc1tD5Wv8U0Yw= -mvdan.cc/gofumpt v0.3.1 h1:avhhrOmv0IuvQVK7fvwV91oFSGAk5/6Po8GXTzICeu8= -mvdan.cc/gofumpt v0.3.1/go.mod h1:w3ymliuxvzVx8DAutBnVyDqYb1Niy/yCJt/lk821YCE= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed h1:WX1yoOaKQfddO/mLzdV4wptyWgoH/6hwLs7QHTixo0I= -mvdan.cc/interfacer v0.0.0-20180901003855-c20040233aed/go.mod h1:Xkxe497xwlCKkIaQYRfC7CSLworTXY9RMqwhhCm+8Nc= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b h1:DxJ5nJdkhDlLok9K6qO+5290kphDJbHOQO1DFFFTeBo= -mvdan.cc/lint v0.0.0-20170908181259-adc824a0674b/go.mod h1:2odslEg/xrtNQqCYg2/jCoyKnw3vv5biOc3JnIcYfL4= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442 h1:seuXWbRB1qPrS3NQnHmFKLJLtskWyueeIzmLXghMGgk= -mvdan.cc/unparam v0.0.0-20220706161116-678bad134442/go.mod h1:F/Cxw/6mVrNKqrR2YjFf5CaW0Bw4RL8RfbEf4GRggJk= rsc.io/binaryregexp v0.2.0/go.mod h1:qTv7/COck+e2FymRvadv62gMdZztPaShugOCi3I+8D8= rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= diff --git a/lego/sys/log/formatter_console.go b/lego/sys/log/formatter_console.go index 56ff4180d..bdf06cba5 100644 --- a/lego/sys/log/formatter_console.go +++ b/lego/sys/log/formatter_console.go @@ -84,61 +84,42 @@ func writetoline(line *pools.Buffer, v interface{}) { switch v := v.(type) { case nil: line.AppendString("nil") - break case string: line.AppendString(v) - break case []byte: line.AppendBytes(v) - break case int: line.AppendInt(int64(v)) - break case int8: line.AppendInt(int64(v)) - break case int16: line.AppendInt(int64(v)) - break case int32: line.AppendInt(int64(v)) - break case int64: line.AppendInt(int64(v)) - break case uint: line.AppendUint(uint64(v)) - break case uint8: line.AppendUint(uint64(v)) - break case uint16: line.AppendUint(uint64(v)) - break case uint32: line.AppendUint(uint64(v)) - break case uint64: line.AppendUint(uint64(v)) - break case float32: line.AppendFloat(float64(v), 64) - break case float64: line.AppendFloat(v, 64) - break case bool: line.AppendBool(v) - break case time.Time: line.AppendTime(v, time.RFC3339Nano) - break case time.Duration: line.AppendInt(v.Nanoseconds()) - break default: d, _ := json.Marshal(v) line.AppendBytes(d) - break } } diff --git a/lego/sys/redis/cluster/list.go b/lego/sys/redis/cluster/list.go index 508120177..ce1863ee4 100644 --- a/lego/sys/redis/cluster/list.go +++ b/lego/sys/redis/cluster/list.go @@ -137,7 +137,7 @@ Redis Lset 通过索引来设置元素的值。 */ func (this *Redis) LSet(key string, index int, value interface{}) (err error) { var resultvalue []byte - if resultvalue, err = this.codec.Marshal(value); err == nil { + if resultvalue, err = this.codec.Marshal(value); err != nil { return } err = this.client.Do(this.client.Context(), "LSET", key, index, resultvalue).Err() diff --git a/lego/sys/redis/pipe/list.go b/lego/sys/redis/pipe/list.go index fb2069673..f3816295d 100644 --- a/lego/sys/redis/pipe/list.go +++ b/lego/sys/redis/pipe/list.go @@ -136,7 +136,7 @@ Redis Lset 通过索引来设置元素的值。 */ func (this *RedisPipe) LSet(key string, index int, value interface{}) (err error) { var resultvalue []byte - if resultvalue, err = this.codec.Marshal(value); err == nil { + if resultvalue, err = this.codec.Marshal(value); err != nil { return } err = this.client.Do(this.ctx, "LSET", key, index, resultvalue).Err() diff --git a/lego/sys/redis/single/list.go b/lego/sys/redis/single/list.go index ca78f9819..729de07d1 100644 --- a/lego/sys/redis/single/list.go +++ b/lego/sys/redis/single/list.go @@ -137,7 +137,7 @@ Redis Lset 通过索引来设置元素的值。 */ func (this *Redis) LSet(key string, index int, value interface{}) (err error) { var resultvalue []byte - if resultvalue, err = this.codec.Marshal(value); err == nil { + if resultvalue, err = this.codec.Marshal(value); err != nil { return } err = this.client.Do(this.client.Context(), "LSET", key, index, resultvalue).Err() diff --git a/lego/utils/codec/utils/float.go b/lego/utils/codec/utils/float.go index 012184cdd..219ddcd60 100644 --- a/lego/utils/codec/utils/float.go +++ b/lego/utils/codec/utils/float.go @@ -39,7 +39,7 @@ func init() { //从字符串中读取float 对象 func ReadBigFloatForString(buf []byte) (ret *big.Float, n int, err error) { var str string - if str, n, err = readNumberAsString(buf); err == nil { + if str, n, err = readNumberAsString(buf); err != nil { return } prec := 64 diff --git a/modules/hero/hero_test.go b/modules/hero/hero_test.go index 033751cc2..9ebf8b116 100644 --- a/modules/hero/hero_test.go +++ b/modules/hero/hero_test.go @@ -17,7 +17,7 @@ import ( "go_dreamfactory/services" "go_dreamfactory/sys/configure" "go_dreamfactory/sys/db" - "os" + "reflect" "testing" "time" @@ -55,7 +55,13 @@ func (this *TestService) InitSys() { } } -func TestMain(m *testing.M) { +func Test_Main(t *testing.T) { + + oldHero := new(pb.DBHero) + oldHero.Lv = 2 + new := copyPoint(oldHero) + fmt.Printf("%v", new) + oldHero.Lv = 8 currentTime := time.Unix(1637420154, 0) startTime := time.Date(currentTime.Year(), currentTime.Month(), currentTime.Day(), 0, 0, 0, 0, currentTime.Location()) fmt.Print(startTime.Unix()) @@ -76,14 +82,25 @@ func TestMain(m *testing.M) { ) }() time.Sleep(time.Second * 2) - defer os.Exit(m.Run()) + } func GetMap() map[int32]int32 { return nil } + +func copyPoint(m *pb.DBHero) *pb.DBHero { + vt := reflect.TypeOf(m).Elem() + fmt.Println(vt) + newoby := reflect.New(vt) + newoby.Elem().Set(reflect.ValueOf(m).Elem()) + newoby.Interface().(*pb.DBHero).Lv = 1111 + return newoby.Interface().(*pb.DBHero) +} func CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { + newHero = new(pb.DBHero) + *newHero = *hero newHero.Block = true @@ -92,7 +109,9 @@ func CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { return } func Test_Modules(t *testing.T) { - + oldHero := new(pb.DBHero) + new := copyPoint(oldHero) + fmt.Printf("%v", new) data, _ := ptypes.MarshalAny(&pb.HeroListReq{}) reply := &pb.RPCMessageReply{} s_gateComp.ReceiveMsg(context.Background(), &pb.AgentMessage{UserId: "0_62c79d66acc7aa239b07c21e", MainType: "hero", SubType: "list", Message: data}, reply) diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index 9136a635f..b8b3ca457 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -11,6 +11,7 @@ import ( cfg "go_dreamfactory/sys/configure/structs" "math" "math/big" + "reflect" mengine "github.com/dengsgo/math-engine/engine" "go.mongodb.org/mongo-driver/bson/primitive" @@ -103,10 +104,18 @@ func (this *ModelHero) createOneHero(uid string, heroCfgId string) (hero *pb.DBH return } +// 拷贝一个指针对象 +func (this *ModelHero) copyPoint(m *pb.DBHero) *pb.DBHero { + vt := reflect.TypeOf(m).Elem() + newoby := reflect.New(vt) + newoby.Elem().Set(reflect.ValueOf(m).Elem()) + return newoby.Interface().(*pb.DBHero) +} + // 克隆一个英雄 func (this *ModelHero) CloneNewHero(hero *pb.DBHero) (newHero *pb.DBHero) { newHero = new(pb.DBHero) - *newHero = *hero + *newHero = *hero //*this.copyPoint(hero) newHero.Id = primitive.NewObjectID().Hex() this.AddList(newHero.Uid, newHero.Id, newHero) return diff --git a/modules/hunting/api_challenge.go b/modules/hunting/api_challenge.go index c7e64beb5..91134cd86 100644 --- a/modules/hunting/api_challenge.go +++ b/modules/hunting/api_challenge.go @@ -62,7 +62,7 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.HuntingChallen return } hunting.Boss[req.BossType] += 1 - mapData["boos"] = hunting.Boss + mapData["boss"] = hunting.Boss //hunting.BossTime[] = 0 // todo 耗时 mapData["challengeTime"] = hunting.BossTime diff --git a/modules/hunting/api_getlist.go b/modules/hunting/api_getlist.go index 2157c2088..9f077c614 100644 --- a/modules/hunting/api_getlist.go +++ b/modules/hunting/api_getlist.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/utils" - "strconv" "time" "google.golang.org/protobuf/proto" @@ -28,14 +27,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.HuntingGetListRe code = pb.ErrorCode_DBError return } - if len(list.Boss) == 0 { - _cfg := this.module.configure.GetHuntingBossTypeConfigData() - for k := range _cfg { - list.Boss[k] = 0 - str := strconv.Itoa(int(k)) + "_0" - list.BossTime[str] = 0 - } - } + // 校验 是不是当天 if !utils.IsToday(list.CTime) { list.CTime = time.Now().Unix() diff --git a/modules/hunting/model_hunting.go b/modules/hunting/model_hunting.go index ff63b101a..2e833981b 100644 --- a/modules/hunting/model_hunting.go +++ b/modules/hunting/model_hunting.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" + "strconv" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -45,6 +46,14 @@ func (this *modelHunting) getHuntingList(uid string) (result *pb.DBHunting, err return } if mgo.MongodbNil == err { + if len(result.Boss) == 0 { + _cfg := this.module.configure.GetHuntingBossTypeConfigData() + for k := range _cfg { + result.Boss[k] = 0 + str := strconv.Itoa(int(k)) + "_0" + result.BossTime[str] = 0 + } + } this.module.modelHunting.Add(uid, result) } err = nil diff --git a/modules/library/api.go b/modules/library/api.go new file mode 100644 index 000000000..ab2710e6a --- /dev/null +++ b/modules/library/api.go @@ -0,0 +1,37 @@ +package library + +import ( + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" +) + +const ( + LibraryGetListResp = "getlist" + LibraryChallengeResp = "challenge" + LibrarySkillLvResp = "skilllv" + LibraryGetRewardResp = "getreward" + LibraryBuyResp = "buy" + LibraryRankListResp = "ranklist" +) + +type apiComp struct { + modules.MCompGate + service core.IService + configure *configureComp + module *Library +} + +//组件初始化接口 +func (this *apiComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompGate.Init(service, module, comp, options) + this.module = module.(*Library) + + this.service = service + return +} + +func (this *apiComp) Start() (err error) { + err = this.MCompGate.Start() + + return +} diff --git a/modules/library/api_getlist.go b/modules/library/api_getlist.go new file mode 100644 index 000000000..5ec155b04 --- /dev/null +++ b/modules/library/api_getlist.go @@ -0,0 +1,31 @@ +package library + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/pb" + + "google.golang.org/protobuf/proto" +) + +//参数校验 +func (this *apiComp) GetListCheck(session comm.IUserSession, req *pb.DBHero) (code pb.ErrorCode) { + + return +} + +func (this *apiComp) GetList(session comm.IUserSession, req *pb.DBHero) (code pb.ErrorCode, data proto.Message) { + + code = this.GetListCheck(session, req) + if code != pb.ErrorCode_Success { + return // 参数校验失败直接返回 + } + + // list, err := this.module.modelLibrary.getLibraryList(session.GetUserId()) + // if err != nil { + // code = pb.ErrorCode_DBError + // return + // } + + //session.SendMsg(string(this.module.GetType()), LibraryGetListResp, &pb.LibraryGetListResp{Data: list}) + return +} diff --git a/modules/library/comp_configure.go b/modules/library/comp_configure.go new file mode 100644 index 000000000..20981c97e --- /dev/null +++ b/modules/library/comp_configure.go @@ -0,0 +1,101 @@ +package library + +import ( + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/log" + "go_dreamfactory/modules" + "go_dreamfactory/sys/configure" + cfg "go_dreamfactory/sys/configure/structs" + "sync" +) + +const ( + game_huntingboss = "game_huntingboss.json" + game_challenge = "game_huntingchallenge.json" +) + +///配置管理基础组件 +type configureComp struct { + hlock sync.RWMutex + modules.MCompConfigure + _huntingMap map[int64]*cfg.GameHuntingBossData +} + +//组件初始化接口 +func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + err = this.MCompConfigure.Init(service, module, comp, options) + + this._huntingMap = make(map[int64]*cfg.GameHuntingBossData, 0) + configure.RegisterConfigure(game_huntingboss, cfg.NewGameHuntingBoss, func() { + if v, err := this.GetConfigure(game_huntingboss); err == nil { + if configure, ok := v.(*cfg.GameHuntingBoss); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + for _, value := range configure.GetDataList() { + this._huntingMap[int64(value.Type<<16)+int64(value.Difficulty)] = value + } + return + } + } else { + log.Errorf("get game_huntingboss conf err:%v", err) + } + return + }) + err = this.LoadConfigure(game_challenge, cfg.NewGameHuntingChallenge) + return +} + +// 参数: boss类型 难度 +func (this *configureComp) GetHuntingBossConfigData(bossType int32, difficulty int32) (data *cfg.GameHuntingBossData) { + + return this._huntingMap[int64(bossType<<16)+int64(difficulty)] +} + +//加载多个配置文件 +func (this *configureComp) LoadMultiConfigure(confs map[string]interface{}) (err error) { + for k, v := range confs { + err = configure.RegisterConfigure(k, v, nil) + if err != nil { + log.Errorf("配置文件:%s解析失败!", k) + break + } + } + return +} + +//读取配置数据 +func (this *configureComp) GetConfigure(name string) (v interface{}, err error) { + return configure.GetConfigure(name) +} + +// get boss Type +func (this *configureComp) GetHuntingBossTypeConfigData() (mapType map[int32]struct{}) { + + mapType = make(map[int32]struct{}, 0) + if v, err := this.GetConfigure(game_huntingboss); err == nil { + if configure, ok := v.(*cfg.GameHuntingBoss); ok { + this.hlock.Lock() + defer this.hlock.Unlock() + for _, value := range configure.GetDataList() { + if _, ok := mapType[value.Type]; !ok { + mapType[value.Type] = struct{}{} + } + } + + } + } + return +} + +func (this *configureComp) GetBuyChallengeCount(index int32) (data *cfg.GameHuntingChallengeData) { + if v, err := this.GetConfigure(game_challenge); err == nil { + if configure, ok := v.(*cfg.GameHuntingChallenge); ok { + data = configure.Get(index) + return + } + } else { + log.Errorf("get game_challenge conf err:%v", err) + } + + return +} diff --git a/modules/library/model_hunting.go b/modules/library/model_hunting.go new file mode 100644 index 000000000..be267a399 --- /dev/null +++ b/modules/library/model_hunting.go @@ -0,0 +1,44 @@ +package library + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/mgo" + "go_dreamfactory/modules" + "go_dreamfactory/pb" + + "go.mongodb.org/mongo-driver/mongo" + "go.mongodb.org/mongo-driver/x/bsonx" +) + +type modelLibrary struct { + modules.MCompModel + module *Library +} + +func (this *modelLibrary) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) { + this.TableName = string(comm.TableLibrary) + err = this.MCompModel.Init(service, module, comp, options) + this.module = module.(*Library) + // uid 创建索引 + this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + }) + return +} + +func (this *modelLibrary) modifyLibraryDataByObjId(uid string, data map[string]interface{}) error { + return this.Change(uid, data) +} + +// 获取列表信息 +func (this *modelLibrary) getLibraryList(uid string) (result *pb.DBHero, err error) { + result = &pb.DBHero{} + if err = this.Get(uid, result); err != nil && mgo.MongodbNil != err { + + return + } + + err = nil + return result, err +} diff --git a/modules/library/module.go b/modules/library/module.go new file mode 100644 index 000000000..4666c2039 --- /dev/null +++ b/modules/library/module.go @@ -0,0 +1,46 @@ +package library + +import ( + "go_dreamfactory/comm" + "go_dreamfactory/lego/core" + "go_dreamfactory/modules" + "go_dreamfactory/pb" +) + +type Library struct { + modules.ModuleBase + modelLibrary *modelLibrary + api *apiComp + configure *configureComp +} + +func NewModule() core.IModule { + return &Library{} +} + +func (this *Library) GetType() core.M_Modules { + return comm.ModuleLibrary +} + +func (this *Library) Init(service core.IService, module core.IModule, options core.IModuleOptions) (err error) { + err = this.ModuleBase.Init(service, module, options) + + return +} + +func (this *Library) OnInstallComp() { + this.ModuleBase.OnInstallComp() + this.api = this.RegisterComp(new(apiComp)).(*apiComp) + this.modelLibrary = this.RegisterComp(new(modelLibrary)).(*modelLibrary) + + this.configure = this.RegisterComp(new(configureComp)).(*configureComp) +} + +// 接口信息 +func (this *Library) ModifyLibraryData(uid string, data map[string]interface{}) (code pb.ErrorCode) { + err := this.modelLibrary.modifyLibraryDataByObjId(uid, data) + if err != nil { + code = pb.ErrorCode_DBError + } + return +} diff --git a/modules/rtask/verifyHandle.go b/modules/rtask/verifyHandle.go index b0a649e91..ba68fa6f9 100644 --- a/modules/rtask/verifyHandle.go +++ b/modules/rtask/verifyHandle.go @@ -38,7 +38,7 @@ func (this *ModelRtaskRecord) verifyFromDb(uid string, cfg *cfg.GameRdtaskCondiD func (this *ModelRtask) verfiyRtype1(uid string, cfg *cfg.GameRdtaskCondiData) (err error, ok bool) { heroModule, err := this.service.GetModule(comm.ModuleHero) if err != nil { - return nil, false + return err, false } if h, y := heroModule.(comm.IHero); y { diff --git a/modules/user/model_expand.go b/modules/user/model_expand.go index e376778c8..e21499ec3 100644 --- a/modules/user/model_expand.go +++ b/modules/user/model_expand.go @@ -23,15 +23,7 @@ func (this *ModelExpand) Init(service core.IService, module core.IModule, comp c return } -//获取用户 -func (this *ModelExpand) getUserSession(uid string) (cuser *pb.CacheUser) { - cuser = &pb.CacheUser{} - if err := this.Get(uid, cuser); err != nil { - this.module.Errorf("GetUserSession err:%v", err) - return - } - return -} + //获取用户通过扩展表 func (this *ModelExpand) GetUserExpand(uid string) (result *pb.DBUserExpand, err error) { diff --git a/modules/user/model_setting.go b/modules/user/model_setting.go index 3848325b3..43aacb743 100644 --- a/modules/user/model_setting.go +++ b/modules/user/model_setting.go @@ -80,9 +80,7 @@ func (this *ModelSetting) checkInitCount(uid string) bool { return false } ue.InitdataCount++ - } else { - - } + } } diff --git a/modules/viking/api_getlist.go b/modules/viking/api_getlist.go index 7e3b6307b..426286715 100644 --- a/modules/viking/api_getlist.go +++ b/modules/viking/api_getlist.go @@ -4,7 +4,6 @@ import ( "go_dreamfactory/comm" "go_dreamfactory/pb" "go_dreamfactory/utils" - "strconv" "time" "google.golang.org/protobuf/proto" @@ -28,14 +27,7 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.VikingGetListReq code = pb.ErrorCode_DBError return } - if len(list.Boss) == 0 { - _cfg := this.module.configure.GetVikingBossTypeConfigData() - for k := range _cfg { - list.Boss[k] = 0 - str := strconv.Itoa(int(k)) + "_0" - list.BossTime[str] = 0 - } - } + // 校验 是不是当天 if !utils.IsToday(list.CTime) { list.CTime = time.Now().Unix() diff --git a/modules/viking/model_viking.go b/modules/viking/model_viking.go index 9a1b5d619..6e9270c5b 100644 --- a/modules/viking/model_viking.go +++ b/modules/viking/model_viking.go @@ -6,6 +6,7 @@ import ( "go_dreamfactory/lego/sys/mgo" "go_dreamfactory/modules" "go_dreamfactory/pb" + "strconv" "go.mongodb.org/mongo-driver/bson/primitive" "go.mongodb.org/mongo-driver/mongo" @@ -40,6 +41,14 @@ func (this *modelViking) getVikingList(uid string) (result *pb.DBViking, err err return } if mgo.MongodbNil == err { + if len(result.Boss) == 0 { + _cfg := this.module.configure.GetVikingBossTypeConfigData() + for k := range _cfg { + result.Boss[k] = 0 + str := strconv.Itoa(int(k)) + "_0" + result.BossTime[str] = 0 + } + } this.module.modelViking.Add(uid, result) } err = nil diff --git a/pb/hunting_db.pb.go b/pb/hunting_db.pb.go index 282bf4686..ca42f8fc3 100644 --- a/pb/hunting_db.pb.go +++ b/pb/hunting_db.pb.go @@ -28,7 +28,7 @@ type DBHunting struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid" bson:"uid"` //用户ID ChallengeCount int32 `protobuf:"varint,3,opt,name=challengeCount,proto3" json:"challengeCount" bson:"challengeCount"` //挑战次数 - Boss map[int32]int32 `protobuf:"bytes,4,rep,name=boss,proto3" json:"boss" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key boos 类型 value 难度 + Boss map[int32]int32 `protobuf:"bytes,4,rep,name=boss,proto3" json:"boss" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // key boss 类型 value 难度 BuyCount int32 `protobuf:"varint,5,opt,name=buyCount,proto3" json:"buyCount" bson:"buyCount"` //购买次数 CTime int64 `protobuf:"varint,6,opt,name=cTime,proto3" json:"cTime" bson:"cTime"` //修改时间 BossTime map[string]int32 `protobuf:"bytes,7,rep,name=bossTime,proto3" json:"bossTime" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"bossTime"` // diff --git a/pb/hunting_msg.pb.go b/pb/hunting_msg.pb.go index 8933626bc..f254fd629 100644 --- a/pb/hunting_msg.pb.go +++ b/pb/hunting_msg.pb.go @@ -111,7 +111,7 @@ type HuntingChallengeReq struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - BossType int32 `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boos 类型 + BossType int32 `protobuf:"varint,1,opt,name=bossType,proto3" json:"bossType"` // boss 类型 Difficulty int32 `protobuf:"varint,2,opt,name=difficulty,proto3" json:"difficulty"` // 难度 } diff --git a/sys/configure/structs/Game.HuntingBoss.go b/sys/configure/structs/Game.HuntingBoss.go index 08a506ae5..97427a05a 100644 --- a/sys/configure/structs/Game.HuntingBoss.go +++ b/sys/configure/structs/Game.HuntingBoss.go @@ -9,34 +9,26 @@ package cfg type GameHuntingBoss struct { - _dataMap map[int32]*GameHuntingBossData _dataList []*GameHuntingBossData } func NewGameHuntingBoss(_buf []map[string]interface{}) (*GameHuntingBoss, error) { _dataList := make([]*GameHuntingBossData, 0, len(_buf)) - dataMap := make(map[int32]*GameHuntingBossData) for _, _ele_ := range _buf { if _v, err2 := DeserializeGameHuntingBossData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v } } - return &GameHuntingBoss{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *GameHuntingBoss) GetDataMap() map[int32]*GameHuntingBossData { - return table._dataMap + return &GameHuntingBoss{_dataList:_dataList}, nil } func (table *GameHuntingBoss) GetDataList() []*GameHuntingBossData { return table._dataList } -func (table *GameHuntingBoss) Get(key int32) *GameHuntingBossData { - return table._dataMap[key] +func (table *GameHuntingBoss) Get(index int) *GameHuntingBossData { + return table._dataList[index] } - diff --git a/sys/configure/structs/Game.HuntingOpenTimeData.go b/sys/configure/structs/Game.HuntingOpenTimeData.go index 0fc3d8702..64acb97b9 100644 --- a/sys/configure/structs/Game.HuntingOpenTimeData.go +++ b/sys/configure/structs/Game.HuntingOpenTimeData.go @@ -13,6 +13,8 @@ import "errors" type GameHuntingOpenTimeData struct { Type int32 Opentime []int32 + Name string + Introduce string } const TypeId_GameHuntingOpenTimeData = 1854578068 @@ -37,6 +39,8 @@ func (_v *GameHuntingOpenTimeData)Deserialize(_buf map[string]interface{}) (err } } + {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["introduce"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Introduce error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Introduce, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } return } diff --git a/sys/configure/structs/Game.LibraryFavor.go b/sys/configure/structs/Game.LibraryFavor.go new file mode 100644 index 000000000..722621d04 --- /dev/null +++ b/sys/configure/structs/Game.LibraryFavor.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 GameLibraryFavor struct { + _dataMap map[int32]*GameLibraryFavorData + _dataList []*GameLibraryFavorData +} + +func NewGameLibraryFavor(_buf []map[string]interface{}) (*GameLibraryFavor, error) { + _dataList := make([]*GameLibraryFavorData, 0, len(_buf)) + dataMap := make(map[int32]*GameLibraryFavorData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLibraryFavorData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameLibraryFavor{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLibraryFavor) GetDataMap() map[int32]*GameLibraryFavorData { + return table._dataMap +} + +func (table *GameLibraryFavor) GetDataList() []*GameLibraryFavorData { + return table._dataList +} + +func (table *GameLibraryFavor) Get(key int32) *GameLibraryFavorData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LibraryFavorData.go b/sys/configure/structs/Game.LibraryFavorData.go new file mode 100644 index 000000000..f2d3edf3b --- /dev/null +++ b/sys/configure/structs/Game.LibraryFavorData.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 GameLibraryFavorData struct { + Id int32 + Star int32 + Favorlv int32 + Expneed int32 +} + +const TypeId_GameLibraryFavorData = 465616649 + +func (*GameLibraryFavorData) GetTypeId() int32 { + return 465616649 +} + +func (_v *GameLibraryFavorData)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["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorlv"].(float64); !_ok_ { err = errors.New("favorlv error"); return }; _v.Favorlv = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["expneed"].(float64); !_ok_ { err = errors.New("expneed error"); return }; _v.Expneed = int32(_tempNum_) } + return +} + +func DeserializeGameLibraryFavorData(_buf map[string]interface{}) (*GameLibraryFavorData, error) { + v := &GameLibraryFavorData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LibraryFetter.go b/sys/configure/structs/Game.LibraryFetter.go new file mode 100644 index 000000000..8eeb41c30 --- /dev/null +++ b/sys/configure/structs/Game.LibraryFetter.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 GameLibraryFetter struct { + _dataMap map[int32]*GameLibraryFetterData + _dataList []*GameLibraryFetterData +} + +func NewGameLibraryFetter(_buf []map[string]interface{}) (*GameLibraryFetter, error) { + _dataList := make([]*GameLibraryFetterData, 0, len(_buf)) + dataMap := make(map[int32]*GameLibraryFetterData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLibraryFetterData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameLibraryFetter{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLibraryFetter) GetDataMap() map[int32]*GameLibraryFetterData { + return table._dataMap +} + +func (table *GameLibraryFetter) GetDataList() []*GameLibraryFetterData { + return table._dataList +} + +func (table *GameLibraryFetter) Get(key int32) *GameLibraryFetterData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LibraryFetterData.go b/sys/configure/structs/Game.LibraryFetterData.go new file mode 100644 index 000000000..136d97a2b --- /dev/null +++ b/sys/configure/structs/Game.LibraryFetterData.go @@ -0,0 +1,75 @@ +//------------------------------------------------------------------------------ +// +// 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 GameLibraryFetterData struct { + Id int32 + Fid int32 + Ftype int32 + Name string + Lv int32 + Hid []int32 + Favorlv int32 + Prize []*Gameatn +} + +const TypeId_GameLibraryFetterData = -764317099 + +func (*GameLibraryFetterData) GetTypeId() int32 { + return -764317099 +} + +func (_v *GameLibraryFetterData)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["fid"].(float64); !_ok_ { err = errors.New("fid error"); return }; _v.Fid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["ftype"].(float64); !_ok_ { err = errors.New("ftype error"); return }; _v.Ftype = int32(_tempNum_) } + { var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["hid"].([]interface{}); !_ok_ { err = errors.New("hid error"); return } + + _v.Hid = 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.Hid = append(_v.Hid, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["favorlv"].(float64); !_ok_ { err = errors.New("favorlv error"); return }; _v.Favorlv = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return } + + _v.Prize = 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.Prize = append(_v.Prize, _list_v_) + } + } + + return +} + +func DeserializeGameLibraryFetterData(_buf map[string]interface{}) (*GameLibraryFetterData, error) { + v := &GameLibraryFetterData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LibraryHero.go b/sys/configure/structs/Game.LibraryHero.go new file mode 100644 index 000000000..c79719917 --- /dev/null +++ b/sys/configure/structs/Game.LibraryHero.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 GameLibraryHero struct { + _dataMap map[int32]*GameLibraryHeroData + _dataList []*GameLibraryHeroData +} + +func NewGameLibraryHero(_buf []map[string]interface{}) (*GameLibraryHero, error) { + _dataList := make([]*GameLibraryHeroData, 0, len(_buf)) + dataMap := make(map[int32]*GameLibraryHeroData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLibraryHeroData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Hid] = _v + } + } + return &GameLibraryHero{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLibraryHero) GetDataMap() map[int32]*GameLibraryHeroData { + return table._dataMap +} + +func (table *GameLibraryHero) GetDataList() []*GameLibraryHeroData { + return table._dataList +} + +func (table *GameLibraryHero) Get(key int32) *GameLibraryHeroData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LibraryHeroData.go b/sys/configure/structs/Game.LibraryHeroData.go new file mode 100644 index 000000000..a983110e6 --- /dev/null +++ b/sys/configure/structs/Game.LibraryHeroData.go @@ -0,0 +1,92 @@ +//------------------------------------------------------------------------------ +// +// 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 GameLibraryHeroData struct { + Hid int32 + Name string + Star int32 + History []int32 + Favorlv []int32 + Startid int32 + Rightend int32 + Stroyprize []*Gameatn + Endid1 int32 + Endid2 int32 +} + +const TypeId_GameLibraryHeroData = 1808545443 + +func (*GameLibraryHeroData) GetTypeId() int32 { + return 1808545443 +} + +func (_v *GameLibraryHeroData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hid"].(float64); !_ok_ { err = errors.New("hid error"); return }; _v.Hid = int32(_tempNum_) } + {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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["history"].([]interface{}); !_ok_ { err = errors.New("history error"); return } + + _v.History = 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.History = append(_v.History, _list_v_) + } + } + + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["favorlv"].([]interface{}); !_ok_ { err = errors.New("favorlv error"); return } + + _v.Favorlv = 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.Favorlv = append(_v.Favorlv, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["startid"].(float64); !_ok_ { err = errors.New("startid error"); return }; _v.Startid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rightend"].(float64); !_ok_ { err = errors.New("rightend error"); return }; _v.Rightend = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["stroyprize"].([]interface{}); !_ok_ { err = errors.New("stroyprize error"); return } + + _v.Stroyprize = 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.Stroyprize = append(_v.Stroyprize, _list_v_) + } + } + + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endid1"].(float64); !_ok_ { err = errors.New("endid1 error"); return }; _v.Endid1 = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["endid2"].(float64); !_ok_ { err = errors.New("endid2 error"); return }; _v.Endid2 = int32(_tempNum_) } + return +} + +func DeserializeGameLibraryHeroData(_buf map[string]interface{}) (*GameLibraryHeroData, error) { + v := &GameLibraryHeroData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LibraryHistory.go b/sys/configure/structs/Game.LibraryHistory.go new file mode 100644 index 000000000..9cef209ed --- /dev/null +++ b/sys/configure/structs/Game.LibraryHistory.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 GameLibraryHistory struct { + _dataMap map[int32]*GameLibraryHistoryData + _dataList []*GameLibraryHistoryData +} + +func NewGameLibraryHistory(_buf []map[string]interface{}) (*GameLibraryHistory, error) { + _dataList := make([]*GameLibraryHistoryData, 0, len(_buf)) + dataMap := make(map[int32]*GameLibraryHistoryData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLibraryHistoryData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Histroy] = _v + } + } + return &GameLibraryHistory{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLibraryHistory) GetDataMap() map[int32]*GameLibraryHistoryData { + return table._dataMap +} + +func (table *GameLibraryHistory) GetDataList() []*GameLibraryHistoryData { + return table._dataList +} + +func (table *GameLibraryHistory) Get(key int32) *GameLibraryHistoryData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LibraryHistoryData.go b/sys/configure/structs/Game.LibraryHistoryData.go new file mode 100644 index 000000000..5953d5448 --- /dev/null +++ b/sys/configure/structs/Game.LibraryHistoryData.go @@ -0,0 +1,52 @@ +//------------------------------------------------------------------------------ +// +// 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 GameLibraryHistoryData struct { + Histroy int32 + Txt string + Prize []*Gameatn +} + +const TypeId_GameLibraryHistoryData = -163361249 + +func (*GameLibraryHistoryData) GetTypeId() int32 { + return -163361249 +} + +func (_v *GameLibraryHistoryData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["histroy"].(float64); !_ok_ { err = errors.New("histroy error"); return }; _v.Histroy = int32(_tempNum_) } + { var _ok_ bool; if _v.Txt, _ok_ = _buf["txt"].(string); !_ok_ { err = errors.New("txt error"); return } } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return } + + _v.Prize = 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.Prize = append(_v.Prize, _list_v_) + } + } + + return +} + +func DeserializeGameLibraryHistoryData(_buf map[string]interface{}) (*GameLibraryHistoryData, error) { + v := &GameLibraryHistoryData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.LibraryStory.go b/sys/configure/structs/Game.LibraryStory.go new file mode 100644 index 000000000..21fbf999d --- /dev/null +++ b/sys/configure/structs/Game.LibraryStory.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 GameLibraryStory struct { + _dataMap map[int32]*GameLibraryStoryData + _dataList []*GameLibraryStoryData +} + +func NewGameLibraryStory(_buf []map[string]interface{}) (*GameLibraryStory, error) { + _dataList := make([]*GameLibraryStoryData, 0, len(_buf)) + dataMap := make(map[int32]*GameLibraryStoryData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameLibraryStoryData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Fid] = _v + } + } + return &GameLibraryStory{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameLibraryStory) GetDataMap() map[int32]*GameLibraryStoryData { + return table._dataMap +} + +func (table *GameLibraryStory) GetDataList() []*GameLibraryStoryData { + return table._dataList +} + +func (table *GameLibraryStory) Get(key int32) *GameLibraryStoryData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/Game.LibraryStoryData.go b/sys/configure/structs/Game.LibraryStoryData.go new file mode 100644 index 000000000..e1d3d2579 --- /dev/null +++ b/sys/configure/structs/Game.LibraryStoryData.go @@ -0,0 +1,52 @@ +//------------------------------------------------------------------------------ +// +// 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 GameLibraryStoryData struct { + Fid int32 + Stroy int32 + Prize []*Gameatn +} + +const TypeId_GameLibraryStoryData = -333035968 + +func (*GameLibraryStoryData) GetTypeId() int32 { + return -333035968 +} + +func (_v *GameLibraryStoryData)Deserialize(_buf map[string]interface{}) (err error) { + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["fid"].(float64); !_ok_ { err = errors.New("fid error"); return }; _v.Fid = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["stroy"].(float64); !_ok_ { err = errors.New("stroy error"); return }; _v.Stroy = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return } + + _v.Prize = 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.Prize = append(_v.Prize, _list_v_) + } + } + + return +} + +func DeserializeGameLibraryStoryData(_buf map[string]interface{}) (*GameLibraryStoryData, error) { + v := &GameLibraryStoryData{} + if err := v.Deserialize(_buf); err == nil { + return v, nil + } else { + return nil, err + } +} diff --git a/sys/configure/structs/Game.MainlineData.go b/sys/configure/structs/Game.MainlineData.go index 1a1d6e2b4..d1667789d 100644 --- a/sys/configure/structs/Game.MainlineData.go +++ b/sys/configure/structs/Game.MainlineData.go @@ -9,6 +9,7 @@ package cfg import "errors" +import "bright/serialization" type GameMainlineData struct { Id int32 @@ -20,7 +21,7 @@ type GameMainlineData struct { Chapter int32 Route int32 Episodetype int32 - Episodelocation []int32 + Episodelocation serialization.Vector2 Model string Effect string FormatList []int32 @@ -50,18 +51,11 @@ func (_v *GameMainlineData)Deserialize(_buf map[string]interface{}) (err error) { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chapter"].(float64); !_ok_ { err = errors.New("chapter error"); return }; _v.Chapter = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["route"].(float64); !_ok_ { err = errors.New("route error"); return }; _v.Route = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Episodetype"].(float64); !_ok_ { err = errors.New("Episodetype error"); return }; _v.Episodetype = int32(_tempNum_) } - { - var _arr_ []interface{} - var _ok_ bool - if _arr_, _ok_ = _buf["Episodelocation"].([]interface{}); !_ok_ { err = errors.New("Episodelocation error"); return } - - _v.Episodelocation = 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.Episodelocation = append(_v.Episodelocation, _list_v_) - } + { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["Episodelocation"].(map[string]interface{}); !_ok_ { err = errors.New("Episodelocation 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.Episodelocation = serialization.NewVector2(_x_, _y_) } { var _ok_ bool; if _v.Model, _ok_ = _buf["model"].(string); !_ok_ { err = errors.New("model error"); return } } diff --git a/sys/configure/structs/Game.StroyData.go b/sys/configure/structs/Game.StroyData.go index 0667c7489..23f5c2278 100644 --- a/sys/configure/structs/Game.StroyData.go +++ b/sys/configure/structs/Game.StroyData.go @@ -21,12 +21,12 @@ type GameStroyData struct { Place int32 Speak string Listen string - Emoji string Des string Modelstatetarget string Modelstate int32 Modelaction string - State string + Speakstate string + Listenstate string Chose []int32 Turn int32 Show int32 @@ -57,12 +57,12 @@ func (_v *GameStroyData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) } { var _ok_ bool; if _v.Speak, _ok_ = _buf["speak"].(string); !_ok_ { err = errors.New("speak error"); return } } { var _ok_ bool; if _v.Listen, _ok_ = _buf["listen"].(string); !_ok_ { err = errors.New("listen error"); return } } - { var _ok_ bool; if _v.Emoji, _ok_ = _buf["emoji"].(string); !_ok_ { err = errors.New("emoji error"); return } } { var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } } { var _ok_ bool; if _v.Modelstatetarget, _ok_ = _buf["modelstatetarget"].(string); !_ok_ { err = errors.New("modelstatetarget error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["modelstate"].(float64); !_ok_ { err = errors.New("modelstate error"); return }; _v.Modelstate = int32(_tempNum_) } { var _ok_ bool; if _v.Modelaction, _ok_ = _buf["modelaction"].(string); !_ok_ { err = errors.New("modelaction error"); return } } - { var _ok_ bool; if _v.State, _ok_ = _buf["state"].(string); !_ok_ { err = errors.New("state error"); return } } + { var _ok_ bool; if _v.Speakstate, _ok_ = _buf["speakstate"].(string); !_ok_ { err = errors.New("speakstate error"); return } } + { var _ok_ bool; if _v.Listenstate, _ok_ = _buf["listenstate"].(string); !_ok_ { err = errors.New("listenstate error"); return } } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 704ec21bc..4aba1ec8c 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -88,6 +88,11 @@ type Tables struct { LineStoryTask *GameLineStoryTask LineStoryStageTask *GameLineStoryStageTask VikingBossSkill *GameVikingBossSkill + LibraryFetter *GameLibraryFetter + LibraryStory *GameLibraryStory + LibraryHero *GameLibraryHero + LibraryHistory *GameLibraryHistory + LibraryFavor *GameLibraryFavor } func NewTables(loader JsonLoader) (*Tables, error) { @@ -557,5 +562,35 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.VikingBossSkill, err = NewGameVikingBossSkill(buf) ; err != nil { return nil, err } + if buf, err = loader("game_libraryfetter") ; err != nil { + return nil, err + } + if tables.LibraryFetter, err = NewGameLibraryFetter(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_librarystory") ; err != nil { + return nil, err + } + if tables.LibraryStory, err = NewGameLibraryStory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_libraryhero") ; err != nil { + return nil, err + } + if tables.LibraryHero, err = NewGameLibraryHero(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_libraryhistory") ; err != nil { + return nil, err + } + if tables.LibraryHistory, err = NewGameLibraryHistory(buf) ; err != nil { + return nil, err + } + if buf, err = loader("game_libraryfavor") ; err != nil { + return nil, err + } + if tables.LibraryFavor, err = NewGameLibraryFavor(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 c5e1fd6ac..2db96f5c5 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -80,6 +80,7 @@ type GameGlobalData struct { DreamlandTriggernum int32 HuntingNum int32 HuntingReset int32 + HuntingCap []int32 } const TypeId_GameGlobalData = 477542761 @@ -223,6 +224,20 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["dreamland_triggernum"].(float64); !_ok_ { err = errors.New("dreamland_triggernum error"); return }; _v.DreamlandTriggernum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_num"].(float64); !_ok_ { err = errors.New("hunting_num error"); return }; _v.HuntingNum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hunting_reset"].(float64); !_ok_ { err = errors.New("hunting_reset error"); return }; _v.HuntingReset = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["hunting_cap"].([]interface{}); !_ok_ { err = errors.New("hunting_cap error"); return } + + _v.HuntingCap = 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.HuntingCap = append(_v.HuntingCap, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.heroResonanceData.go b/sys/configure/structs/game.heroResonanceData.go index 9169b39cc..6a2539fc4 100644 --- a/sys/configure/structs/game.heroResonanceData.go +++ b/sys/configure/structs/game.heroResonanceData.go @@ -24,6 +24,7 @@ type GameHeroResonanceData struct { Atkscale int32 Defscale int32 Maxnum int32 + RecommendPercentage []int32 } const TypeId_GameHeroResonanceData = -2055259070 @@ -85,6 +86,20 @@ func (_v *GameHeroResonanceData)Deserialize(_buf map[string]interface{}) (err er { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atkscale"].(float64); !_ok_ { err = errors.New("atkscale error"); return }; _v.Atkscale = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["defscale"].(float64); !_ok_ { err = errors.New("defscale error"); return }; _v.Defscale = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxnum"].(float64); !_ok_ { err = errors.New("maxnum error"); return }; _v.Maxnum = int32(_tempNum_) } + { + var _arr_ []interface{} + var _ok_ bool + if _arr_, _ok_ = _buf["recommend_percentage"].([]interface{}); !_ok_ { err = errors.New("recommend_percentage error"); return } + + _v.RecommendPercentage = 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.RecommendPercentage = append(_v.RecommendPercentage, _list_v_) + } + } + return } diff --git a/sys/configure/structs/game.modelData.go b/sys/configure/structs/game.modelData.go index bc2c245b6..2520bc933 100644 --- a/sys/configure/structs/game.modelData.go +++ b/sys/configure/structs/game.modelData.go @@ -15,6 +15,7 @@ type GameModelData struct { Id string Preson string Presonshow string + Presonstory string Height float32 Ico string Fight string @@ -36,6 +37,7 @@ func (_v *GameModelData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } } { var _ok_ bool; if _v.Preson, _ok_ = _buf["preson"].(string); !_ok_ { err = errors.New("preson error"); return } } { var _ok_ bool; if _v.Presonshow, _ok_ = _buf["presonshow"].(string); !_ok_ { err = errors.New("presonshow error"); return } } + { var _ok_ bool; if _v.Presonstory, _ok_ = _buf["presonstory"].(string); !_ok_ { err = errors.New("presonstory error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["height"].(float64); !_ok_ { err = errors.New("height error"); return }; _v.Height = float32(_tempNum_) } { var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } } { var _ok_ bool; if _v.Fight, _ok_ = _buf["fight"].(string); !_ok_ { err = errors.New("fight error"); return } }