From cfe6e742b8e439007bfdda429accf4a101fced78 Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Tue, 24 Sep 2024 14:11:02 +0800 Subject: [PATCH 1/3] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E9=BB=84=E6=B3=89?= =?UTF-8?q?=E5=A4=A7=E5=89=A7=E9=99=A2=E8=B7=AF=E7=BA=BF=E5=81=B6=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E5=AF=B9=E8=AF=9D=E9=94=99=E8=AF=AF=E8=B7=AF=E7=BA=BF?= =?UTF-8?q?=20#339?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- map/HuangQuan/map_4-7_8.json | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/map/HuangQuan/map_4-7_8.json b/map/HuangQuan/map_4-7_8.json index 06198836..9b8be6e4 100644 --- a/map/HuangQuan/map_4-7_8.json +++ b/map/HuangQuan/map_4-7_8.json @@ -18,25 +18,37 @@ ], "map": [ { - "d": 12 + "d": 6 }, { - "a": 1.3 + "w": 7 }, { - "a": 1.3 + "fighting": 2 }, { - "s": 4 + "s": 1 + }, + { + "d": 0.8 + }, + { + "w": 1 + }, + { + "a": 4 + }, + { + "fighting": 2 }, { - "w": 6 + "s": 0.6 }, { - "a": 2.3 + "d": 0.4 }, { - "w": 0.5 + "w": 0.2 }, { "f": 1 From 5fc8d7e666eee8768ec119d6b0c6545e836a80a0 Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:23:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E4=BD=8E?= =?UTF-8?q?=E6=80=A7=E8=83=BD=E6=9C=BA=E5=99=A8=E4=B8=8A=E5=81=B6=E5=8F=91?= =?UTF-8?q?=E7=9A=84=E6=9C=88=E5=8D=A1=E7=82=B9=E5=87=BB=E7=AC=AC=E4=BA=8C?= =?UTF-8?q?=E6=AC=A1=E5=BB=B6=E8=BF=9F=E8=BF=87=E4=BD=8E=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=EF=BC=8C=E5=8A=A0=E5=85=A5=E6=A3=80=E6=B5=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- picture/monthly_pass_pic_3.png | Bin 0 -> 5515 bytes utils/calculated.py | 24 +++++++++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-) create mode 100644 picture/monthly_pass_pic_3.png diff --git a/picture/monthly_pass_pic_3.png b/picture/monthly_pass_pic_3.png new file mode 100644 index 0000000000000000000000000000000000000000..85f1a20d768c09ec46cc2fa1219fc5eb42e6ef24 GIT binary patch literal 5515 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 N002ovPDHLkV1gaZew6?K literal 0 HcmV?d00001 diff --git a/utils/calculated.py b/utils/calculated.py index 118f4f5d..5eed19cc 100644 --- a/utils/calculated.py +++ b/utils/calculated.py @@ -1135,7 +1135,7 @@ def monthly_pass(self): time.sleep(5) # 延时，等待动画可能的加载 self.try_click_pass() - def check_for_monthly_pass(self): + def check_for_monthly_pass(self) -> bool: """无月卡检测 """ log.info("判断是否存在月卡") @@ -1145,6 +1145,9 @@ def check_for_monthly_pass(self): points = self.calculated(result, target.shape) log.info(f"识别到此刻正在主界面，无月卡，图片匹配度: {result['max_val']:.2f} ({points[0]}, {points[1]})") self.monthly_pass_success = 2 # 月卡检查完成，无月卡 + return False + else: + return True def try_click_pass(self, threshold=0.91, delay=0): """ @@ -1154,8 +1157,7 @@ def try_click_pass(self, threshold=0.91, delay=0): time.sleep(abs(delay)) # 无月卡 - self.check_for_monthly_pass() - if self.monthly_pass_success > 0: + if not self.check_for_monthly_pass(): return # 有月卡 @@ -1164,6 +1166,7 @@ def try_click_pass(self, threshold=0.91, delay=0): ("./picture/monthly_pass_pic.png", "月卡下方文字部分"), ("./picture/monthly_pass_pic_2.png", "月卡动画中心图片") ] + pic_data_check = cv.imread("./picture/monthly_pass_pic_3.png") for pic_path, pic_desc in monthly_pass_pics: pic_data = cv.imread(pic_path) result = self.scan_screenshot(pic_data) @@ -1173,8 +1176,19 @@ def try_click_pass(self, threshold=0.91, delay=0): log.info(f"点击月卡，图片匹配度: {result['max_val']:.2f} ({points[0]}, {points[1]})") self.click(points) time.sleep(5) # 等待动画 - self.relative_click((50,75)) - time.sleep(5) # 等待动画 + for _ in range(5): + result_check = self.scan_screenshot(pic_data_check) + if result_check["max_val"] > threshold: + log.info(f"找到月卡奖励图标，图片匹配度：{result_check['max_val']:.2f}") + time.sleep(2) + self.relative_click((50,75)) + time.sleep(5) # 等待动画 + break + else: + time.sleep(2) + else: + self.relative_click((50,75)) + time.sleep(5) # 等待动画 self.have_monthly_pass = True self.monthly_pass_success = 1 # 月卡检查，已领取 break From da2822843a137f144fbfd96749dc61f2b7212b02 Mon Sep 17 00:00:00 2001 From: Lhy <33685788+smjes3@users.noreply.github.com> Date: Thu, 26 Sep 2024 17:29:22 +0800 Subject: [PATCH 3/3] =?UTF-8?q?-=20=E9=87=8D=E6=9E=84=E8=BF=9C=E7=A8=8B?= =?UTF-8?q?=E6=A2=A6=E5=A2=83=E5=9C=B0=E5=9B=BE=EF=BC=8C=E5=8A=A0=E5=85=A5?= =?UTF-8?q?=E8=BD=AC=E5=90=91=EF=BC=8C=E5=87=8F=E5=B0=91=E8=B7=91=E5=9B=BE?= =?UTF-8?q?=E6=97=B6=E9=97=B4=20by=E5=92=8C=E6=9C=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- map/default/map_4-3_1.json | 36 +--- map/default/map_4-3_10.json | 65 ------- map/default/map_4-3_11.json | 140 --------------- map/default/map_4-3_12.json | 47 ----- map/default/map_4-3_13.json | 119 ------------- map/default/map_4-3_14.json | 182 ------------------- map/default/map_4-3_15.json | 182 ------------------- map/default/map_4-3_16.json | 83 --------- map/default/map_4-3_17.json | 113 ------------ map/default/map_4-3_18.json | 134 -------------- map/default/map_4-3_19.json | 191 -------------------- map/default/map_4-3_2.json | 53 ++++++ map/default/map_4-3_20.json | 179 ------------------- map/default/map_4-3_21.json | 80 --------- map/default/map_4-3_22.json | 164 ----------------- map/default/map_4-3_23.json | 98 ---------- map/default/map_4-3_24.json | 152 ---------------- map/default/map_4-3_25.json | 137 -------------- map/default/map_4-3_3.json | 93 +++++----- map/default/map_4-3_4.json | 138 ++++++--------- map/default/map_4-3_5.json | 261 +++++++++++++++++++++++++-- map/default/map_4-3_6.json | 189 ++++++++++++++++---- map/default/map_4-3_7.json | 339 ++++++++++++++++++++++++++++------- map/default/map_4-3_8.json | 345 ++++++++++++++++++++++++++++++------ map/default/map_4-3_9.json | 151 ++++++++++++---- 25 files changed, 1252 insertions(+), 2419 deletions(-) delete mode 100644 map/default/map_4-3_10.json delete mode 100644 map/default/map_4-3_11.json delete mode 100644 map/default/map_4-3_12.json delete mode 100644 map/default/map_4-3_13.json delete mode 100644 map/default/map_4-3_14.json delete mode 100644 map/default/map_4-3_15.json delete mode 100644 map/default/map_4-3_16.json delete mode 100644 map/default/map_4-3_17.json delete mode 100644 map/default/map_4-3_18.json delete mode 100644 map/default/map_4-3_19.json create mode 100644 map/default/map_4-3_2.json delete mode 100644 map/default/map_4-3_20.json delete mode 100644 map/default/map_4-3_21.json delete mode 100644 map/default/map_4-3_22.json delete mode 100644 map/default/map_4-3_23.json delete mode 100644 map/default/map_4-3_24.json delete mode 100644 map/default/map_4-3_25.json diff --git a/map/default/map_4-3_1.json b/map/default/map_4-3_1.json index a1244a86..de4f4e95 100644 --- a/map/default/map_4-3_1.json +++ b/map/default/map_4-3_1.json @@ -15,10 +15,7 @@ "picture\\map_4-3.png": 2 }, { - "picture\\1floor.png": 2 - }, - { - "picture\\map_4-3_point_1.png": 1.5 + "picture\\map_4-3_point_4.png": 1.5 }, { "picture\\transfer.png": 1.5 @@ -26,41 +23,14 @@ ], "map": [ { - "w": 0.4 - }, - { - "r": 0.5 - }, - { - "d": 1.855 + "a": 2.7 }, { - "f": 3.5 - }, - { - "main": 1 - }, - { - "w": 4.68 + "w": 4.6 }, { "fighting": 1 }, - { - "w": 2.25 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - }, - { - "fighting": 1 - }, - { - "w": 2.25 - }, { "fighting": 2 }, diff --git a/map/default/map_4-3_10.json b/map/default/map_4-3_10.json deleted file mode 100644 index 3784803c..00000000 --- a/map/default/map_4-3_10.json +++ /dev/null @@ -1,65 +0,0 @@ -{ - "name": "酒店梦境-10", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_6.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 7.59 - }, - { - "f": 10.0 - }, - { - "r": 3.5 - }, - { - "w": 1.9 - }, - { - "d": 3.32 - }, - { - "w": 4.38 - }, - { - "f": 10.0 - }, - { - "d": 0.57 - }, - { - "w": 7.13 - }, - { - "fighting": 2 - }, - { - "s": 1.85 - }, - { - "a": 9.35 - }, - { - "r": 3.5 - }, - { - "a": 1.35 - }, - { - "s": 2.0 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_11.json b/map/default/map_4-3_11.json deleted file mode 100644 index 1d8cd81a..00000000 --- a/map/default/map_4-3_11.json +++ /dev/null @@ -1,140 +0,0 @@ -{ - "name": "酒店梦境-11", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\map_4-3_point_6.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 7.59 - }, - { - "f": 10.0 - }, - { - "r": 3.5 - }, - { - "w": 1.9 - }, - { - "d": 3.32 - }, - { - "w": 4.38 - }, - { - "f": 10.0 - }, - { - "d": 0.57 - }, - { - "w": 7.13 - }, - { - "fighting": 2 - }, - { - "s": 1.85 - }, - { - "a": 9.35 - }, - { - "r": 3.5 - }, - { - "a": 2.33 - }, - { - "s": 0.62 - }, - { - "a": 4.11 - }, - { - "fighting": 2 - }, - { - "d": 0.88 - }, - { - "w": 1.46 - }, - { - "r": 3.5 - }, - { - "w": 7.81 - }, - { - "a": 1.62 - }, - { - "w": 1.96 - }, - { - "f": 10.0 - }, - { - "d": 0.68 - }, - { - "w": 1.42 - }, - { - "r": 3.5 - }, - { - "w": 1.26 - }, - { - "d": 2.35 - }, - { - "s": 2.25 - }, - { - "r": 3.5 - }, - { - "s": 4.0 - }, - { - "fighting": 2 - }, - { - "d": 2.44 - }, - { - "fighting": 2 - }, - { - "d": 2.3 - }, - { - "fighting": 2 - }, - { - "s": 2.58 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_12.json b/map/default/map_4-3_12.json deleted file mode 100644 index 6f72e569..00000000 --- a/map/default/map_4-3_12.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "name": "酒店梦境-12", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_8.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 7.66 - }, - { - "a": 0.78 - }, - { - "r": 2.5 - }, - { - "a": 2.58 - }, - { - "r": 1.5 - }, - { - "a": 0.9 - }, - { - "w": 0.46 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_13.json b/map/default/map_4-3_13.json deleted file mode 100644 index 7b3f4d99..00000000 --- a/map/default/map_4-3_13.json +++ /dev/null @@ -1,119 +0,0 @@ -{ - "name": "酒店梦境-13", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_8.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 7.66 - }, - { - "a": 0.78 - }, - { - "r": 2.5 - }, - { - "a": 2.58 - }, - { - "r": 0.5 - }, - { - "a": 5.8 - }, - { - "fighting": 2 - }, - { - "d": 0.43 - }, - { - "w": 8.05 - }, - { - "fighting": 2 - }, - { - "a": 2.72 - }, - { - "s": 1.04 - }, - { - "d": 0.3 - }, - { - "s": 6.69 - }, - { - "d": 3.68 - }, - { - "fighting": 2 - }, - { - "a": 0.4 - }, - { - "w": 8.59 - }, - { - "fighting": 2 - }, - { - "s": 0.75 - }, - { - "d": 5.21 - }, - { - "s": 1.68 - }, - { - "d": 0.98 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - }, - { - "d": 0.21 - }, - { - "fighting": 2 - }, - { - "a": 0.21 - }, - { - "fighting": 1 - }, - { - "d": 1.99 - }, - { - "w": 0.2 - }, - { - "fighting": 2 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_14.json b/map/default/map_4-3_14.json deleted file mode 100644 index 07e50ad4..00000000 --- a/map/default/map_4-3_14.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "酒店梦境-14", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_8.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 7.66 - }, - { - "a": 0.78 - }, - { - "r": 2.5 - }, - { - "a": 2.58 - }, - { - "r": 0.5 - }, - { - "a": 5.8 - }, - { - "fighting": 2 - }, - { - "d": 0.43 - }, - { - "w": 8.05 - }, - { - "fighting": 2 - }, - { - "a": 2.72 - }, - { - "s": 1.04 - }, - { - "d": 0.3 - }, - { - "s": 6.69 - }, - { - "d": 3.68 - }, - { - "fighting": 2 - }, - { - "a": 0.4 - }, - { - "w": 8.59 - }, - { - "fighting": 2 - }, - { - "d": 1.58 - }, - { - "s": 0.73 - }, - { - "d": 1.99 - }, - { - "s": 2.37 - }, - { - "f": 10.0 - }, - { - "d": 0.35 - }, - { - "w": 3.55 - }, - { - "a": 2.86 - }, - { - "w": 2.6 - }, - { - "d": 1.1 - }, - { - "w": 0.55 - }, - { - "a": 1.12 - }, - { - "r": 3.5 - }, - { - "a": 2.86 - }, - { - "f": 10.0 - }, - { - "w": 0.25 - }, - { - "d": 2.72 - }, - { - "r": 3.5 - }, - { - "d": 1.34 - }, - { - "s": 7.12 - }, - { - "fighting": 2 - }, - { - "w": 0.58 - }, - { - "d": 0.63 - }, - { - "s": 0.91 - }, - { - "r": 3.5 - }, - { - "s": 8.88 - }, - { - "fighting": 2 - }, - { - "w": 1.41 - }, - { - "d": 3.23 - }, - { - "fighting": 2 - }, - { - "s": 0.35 - }, - { - "fighting": 2 - }, - { - "s": 1.35 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_15.json b/map/default/map_4-3_15.json deleted file mode 100644 index d1eb31ec..00000000 --- a/map/default/map_4-3_15.json +++ /dev/null @@ -1,182 +0,0 @@ -{ - "name": "酒店梦境-15", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_8.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 7.66 - }, - { - "a": 0.78 - }, - { - "r": 2.5 - }, - { - "a": 2.58 - }, - { - "r": 0.5 - }, - { - "a": 5.8 - }, - { - "fighting": 2 - }, - { - "d": 0.43 - }, - { - "w": 8.05 - }, - { - "fighting": 2 - }, - { - "a": 2.72 - }, - { - "s": 1.04 - }, - { - "d": 0.3 - }, - { - "s": 6.69 - }, - { - "d": 3.68 - }, - { - "fighting": 2 - }, - { - "a": 0.4 - }, - { - "w": 8.59 - }, - { - "fighting": 2 - }, - { - "d": 1.58 - }, - { - "s": 0.73 - }, - { - "d": 1.99 - }, - { - "s": 2.37 - }, - { - "f": 10.0 - }, - { - "d": 0.35 - }, - { - "w": 3.55 - }, - { - "a": 2.86 - }, - { - "w": 2.6 - }, - { - "d": 1.1 - }, - { - "w": 0.55 - }, - { - "a": 1.12 - }, - { - "r": 3.5 - }, - { - "a": 2.86 - }, - { - "f": 10.0 - }, - { - "w": 0.25 - }, - { - "d": 2.72 - }, - { - "r": 3.5 - }, - { - "d": 1.34 - }, - { - "s": 7.12 - }, - { - "fighting": 2 - }, - { - "w": 0.58 - }, - { - "d": 0.68 - }, - { - "s": 0.91 - }, - { - "r": 3.5 - }, - { - "s": 8.88 - }, - { - "fighting": 2 - }, - { - "w": 1.35 - }, - { - "d": 7.69 - }, - { - "r": 3.5 - }, - { - "d": 5.09 - }, - { - "w": 0.83 - }, - { - "fighting": 1 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_16.json b/map/default/map_4-3_16.json deleted file mode 100644 index 006cbe4e..00000000 --- a/map/default/map_4-3_16.json +++ /dev/null @@ -1,83 +0,0 @@ -{ - "name": "酒店梦境-16", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\map_4-2.png": 1.5 - }, - { - "picture\\map_4-2_point_1.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - }, - { - "map": 1 - }, - { - "picture\\map_4-3.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 1.1 - }, - { - "a": 5.94 - }, - { - "w": 1.15 - }, - { - "a": 9.73 - }, - { - "fighting": 2 - }, - { - "d": 0.58 - }, - { - "s": 1.19 - }, - { - "a": 6.68 - }, - { - "r": 2.5 - }, - { - "a": 7.06 - }, - { - "w": 0.11 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - }, - { - "s": 0.35 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_17.json b/map/default/map_4-3_17.json deleted file mode 100644 index 50bd6343..00000000 --- a/map/default/map_4-3_17.json +++ /dev/null @@ -1,113 +0,0 @@ -{ - "name": "酒店梦境-17", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 1.1 - }, - { - "a": 6.33 - }, - { - "w": 1.15 - }, - { - "a": 9.73 - }, - { - "fighting": 2 - }, - { - "d": 0.58 - }, - { - "s": 1.19 - }, - { - "a": 6.68 - }, - { - "r": 2.5 - }, - { - "a": 1.86 - }, - { - "s": 1.93 - }, - { - "a": 2.16 - }, - { - "fighting": 2 - }, - { - "d": 0.325 - }, - { - "w": 1.29 - }, - { - "f": 10.0 - }, - { - "a": 0.79 - }, - { - "w": 1.0 - }, - { - "fighting": 2 - }, - { - "d": 0.65 - }, - { - "w": 5.79 - }, - { - "fighting": 2 - }, - { - "s": 0.68 - }, - { - "a": 1.73 - }, - { - "r": 3.5 - }, - { - "a": 4.59 - }, - { - "s": 1.05 - }, - { - "a": 0.52 - }, - { - "s": 1.21 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_18.json b/map/default/map_4-3_18.json deleted file mode 100644 index 2f9c329a..00000000 --- a/map/default/map_4-3_18.json +++ /dev/null @@ -1,134 +0,0 @@ -{ - "name": "酒店梦境-18", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 1.1 - }, - { - "a": 6.33 - }, - { - "w": 1.15 - }, - { - "a": 9.73 - }, - { - "fighting": 2 - }, - { - "d": 0.58 - }, - { - "s": 1.19 - }, - { - "a": 6.68 - }, - { - "r": 2.5 - }, - { - "a": 1.86 - }, - { - "s": 1.93 - }, - { - "a": 2.16 - }, - { - "fighting": 2 - }, - { - "d": 0.325 - }, - { - "w": 1.29 - }, - { - "f": 10.0 - }, - { - "a": 0.79 - }, - { - "s": 4.86 - }, - { - "fighting": 2 - }, - { - "w": 0.46 - }, - { - "d": 0.62 - }, - { - "s": 1.0 - }, - { - "r": 3.5 - }, - { - "s": 3.26 - }, - { - "fighting": 2 - }, - { - "w": 0.75 - }, - { - "a": 5.22 - }, - { - "fighting": 2 - }, - { - "d": 0.43 - }, - { - "w": 3.4 - }, - { - "r": 3.5 - }, - { - "w": 2.53 - }, - { - "fighting": 1 - }, - { - "view_reset": 0.1 - }, - { - "w": 3 - }, - { - "d": 0.35 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_19.json b/map/default/map_4-3_19.json deleted file mode 100644 index 001c8ede..00000000 --- a/map/default/map_4-3_19.json +++ /dev/null @@ -1,191 +0,0 @@ -{ - "name": "酒店梦境-19", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\3floor.png": 1.5 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 1.1 - }, - { - "a": 6.33 - }, - { - "w": 1.15 - }, - { - "a": 9.73 - }, - { - "fighting": 2 - }, - { - "d": 0.58 - }, - { - "s": 1.19 - }, - { - "a": 6.68 - }, - { - "r": 2.5 - }, - { - "a": 1.86 - }, - { - "s": 1.93 - }, - { - "a": 2.16 - }, - { - "fighting": 2 - }, - { - "d": 0.325 - }, - { - "w": 1.29 - }, - { - "f": 10.0 - }, - { - "a": 0.79 - }, - { - "s": 4.86 - }, - { - "fighting": 2 - }, - { - "w": 0.46 - }, - { - "d": 0.62 - }, - { - "s": 1.0 - }, - { - "r": 3.5 - }, - { - "s": 3.26 - }, - { - "fighting": 2 - }, - { - "w": 0.75 - }, - { - "a": 5.22 - }, - { - "fighting": 2 - }, - { - "d": 0.43 - }, - { - "w": 3.4 - }, - { - "r": 3.5 - }, - { - "w": 9.11 - }, - { - "fighting": 2 - }, - { - "s": 0.75 - }, - { - "d": 0.98 - }, - { - "f": 10.0 - }, - { - "a": 4.3 - }, - { - "fighting": 2 - }, - { - "a": 1.3 - }, - { - "fighting": 2 - }, - { - "d": 0.7 - }, - { - "w": 2.99 - }, - { - "r": 3.5 - }, - { - "w": 2.66 - }, - { - "d": 1.36 - }, - { - "w": 0.32 - }, - { - "d": 0.15 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - }, - { - "a": 2.53 - }, - { - "s": 1.36 - }, - { - "a": 0.14 - }, - { - "fighting": 2 - }, - { - "d": 0.14 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_2.json b/map/default/map_4-3_2.json new file mode 100644 index 00000000..f6c4615e --- /dev/null +++ b/map/default/map_4-3_2.json @@ -0,0 +1,53 @@ +{ + "name": "酒店梦境-2", + "author": "和月", + "start": [ + { + "map": 1 + }, + { + "picture\\map_4-3_point_5.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "view_set": 0.1 + }, + { + "s": 1.0 + }, + { + "a": 8.0 + }, + { + "w": 1.5 + }, + { + "a": 2.7 + }, + { + "r": 5.0 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 1.0 + }, + { + "w": 3.0 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + } + ] +} \ No newline at end of file diff --git a/map/default/map_4-3_20.json b/map/default/map_4-3_20.json deleted file mode 100644 index 87e86d5d..00000000 --- a/map/default/map_4-3_20.json +++ /dev/null @@ -1,179 +0,0 @@ -{ - "name": "酒店梦境-20", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\map_4-3_point_1.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 0.4 - }, - { - "r": 0.5 - }, - { - "d": 1.855 - }, - { - "f": 10.0 - }, - { - "r": 2.33 - }, - { - "w": 9.440162420272827 - }, - { - "d": 4.327356576919556 - }, - { - "s": 5.9 - }, - { - "a": 1.5 - }, - { - "s": 1.0 - }, - { - "fighting": 2 - }, - { - "w": 0.75 - }, - { - "d": 2.51 - }, - { - "s": 11.0 - }, - { - "f": 5.5 - }, - { - "w": 6.764140901565552 - }, - { - "a": 2.705061912536621 - }, - { - "s": 2.2959096431732178 - }, - { - "fighting": 2 - }, - { - "w": 0.6009871959686279 - }, - { - "a": 5.687059640884399 - }, - { - "f": 5.5 - }, - { - "w": 5.391319751739502 - }, - { - "fighting": 2 - }, - { - "s": 0.36 - }, - { - "a": 3.8564820289611816 - }, - { - "w": 2.0 - }, - { - "d": 1.3723591327667236 - }, - { - "s": 3.23 - }, - { - "d": 2.5843095779418945 - }, - { - "f": 3.5 - }, - { - "w": 7.048770904541016 - }, - { - "d": 1.5 - }, - { - "w": 0.28 - }, - { - "d": 2.33 - }, - { - "r": 3.5 - }, - { - "d": 6.824139833450317 - }, - { - "fighting": 2 - }, - { - "d": 1.3 - }, - { - "fighting": 2 - }, - { - "a": 1.36 - }, - { - "s": 4.04 - }, - { - "a": 1 - }, - { - "w": 0.36 - }, - { - "d": 1.5 - }, - { - "s": 2.33 - }, - { - "a": 1.0640578269958496 - }, - { - "w": 0.376389741897583 - }, - { - "fighting": 1 - }, - { - "s": 0.8955836296081543 - }, - { - "a": 1.1163086414337158 - }, - { - "fighting": 1 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_21.json b/map/default/map_4-3_21.json deleted file mode 100644 index 73a103e7..00000000 --- a/map/default/map_4-3_21.json +++ /dev/null @@ -1,80 +0,0 @@ -{ - "name": "酒店梦境-21", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\2floor.png": 1.5 - }, - { - "picture\\map_4-3_point_7.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 0.9676434993743896 - }, - { - "d": 14.287784337997437 - }, - { - "fighting": 2 - }, - { - "a": 1.0090892314910889 - }, - { - "w": 2.439167022705078 - }, - { - "d": 6.176150321960449 - }, - { - "w": 2.5 - }, - { - "fighting": 2 - }, - { - "a": 0.6403653621673584 - }, - { - "s": 3.695833921432495 - }, - { - "fighting": 1 - }, - { - "a": 1.79 - }, - { - "w": 5.82492995262146 - }, - { - "fighting": 1 - }, - { - "d": 0.2 - }, - { - "fighting": 1 - }, - { - "a": 0.73 - }, - { - "w": 2.01 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_22.json b/map/default/map_4-3_22.json deleted file mode 100644 index 8848f1b2..00000000 --- a/map/default/map_4-3_22.json +++ /dev/null @@ -1,164 +0,0 @@ -{ - "name": "酒店梦境-22", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\map_4-3_point_1.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 0.4 - }, - { - "r": 0.5 - }, - { - "d": 1.855 - }, - { - "f": 10.0 - }, - { - "r": 2.33 - }, - { - "w": 9.440162420272827 - }, - { - "d": 4.327356576919556 - }, - { - "s": 5.9 - }, - { - "a": 1.5 - }, - { - "s": 1.0 - }, - { - "fighting": 2 - }, - { - "w": 0.75 - }, - { - "d": 2.51 - }, - { - "s": 11.0 - }, - { - "f": 5.5 - }, - { - "w": 6.744140901565552 - }, - { - "a": 2.705061912536621 - }, - { - "s": 2.2959096431732178 - }, - { - "fighting": 2 - }, - { - "w": 0.6009871959686279 - }, - { - "a": 5.687059640884399 - }, - { - "f": 5.5 - }, - { - "w": 5.391319751739502 - }, - { - "fighting": 2 - }, - { - "s": 0.36 - }, - { - "a": 3.8564820289611816 - }, - { - "w": 2.0 - }, - { - "d": 1.3723591327667236 - }, - { - "s": 3.13 - }, - { - "d": 2.5843095779418945 - }, - { - "f": 3.5 - }, - { - "w": 7.048770904541016 - }, - { - "d": 1.5 - }, - { - "w": 0.28 - }, - { - "d": 2.33 - }, - { - "r": 3.5 - }, - { - "d": 6.824139833450317 - }, - { - "fighting": 2 - }, - { - "a": 0.865 - }, - { - "w": 2.2787318229675293 - }, - { - "r": 3.5 - }, - { - "w": 4.023309946060181 - }, - { - "a": 1.4558897018432617 - }, - { - "w": 2.728868007659912 - }, - { - "d": 0.448 - }, - { - "fighting": 1 - }, - { - "s": 0.9765479564666748 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_23.json b/map/default/map_4-3_23.json deleted file mode 100644 index 39a1ae59..00000000 --- a/map/default/map_4-3_23.json +++ /dev/null @@ -1,98 +0,0 @@ -{ - "name": "酒店梦境-23", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\2floor.png": 1.5 - }, - { - "picture\\map_4-3_point_7.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 0.9676434993743896 - }, - { - "d": 14.287784337997437 - }, - { - "fighting": 2 - }, - { - "a": 1.0090892314910889 - }, - { - "w": 2.439167022705078 - }, - { - "d": 6.176150321960449 - }, - { - "w": 2.5 - }, - { - "fighting": 2 - }, - { - "a": 0.6403653621673584 - }, - { - "s": 6.695833921432495 - }, - { - "d": 1.37562894821167 - }, - { - "w": 2.737356662750244 - }, - { - "a": 1.8077008724212646 - }, - { - "s": 4.504109144210815 - }, - { - "f": 2.33 - }, - { - "a": 0.4167919158935547 - }, - { - "s": 5.328118324279785 - }, - { - "a": 1.0638511180877686 - }, - { - "w": 0.807384729385376 - }, - { - "a": 0.6878988742828369 - }, - { - "s": 0.7927651405334473 - }, - { - "r": 3.5 - }, - { - "s": 1.9745450019836426 - }, - { - "d": 1.617098331451416 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_24.json b/map/default/map_4-3_24.json deleted file mode 100644 index 42066c01..00000000 --- a/map/default/map_4-3_24.json +++ /dev/null @@ -1,152 +0,0 @@ -{ - "name": "酒店梦境-24", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\map_4-3_point_1.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 0.4 - }, - { - "r": 0.5 - }, - { - "d": 1.855 - }, - { - "f": 10.0 - }, - { - "r": 2.33 - }, - { - "w": 9.440162420272827 - }, - { - "d": 4.327356576919556 - }, - { - "s": 5.9 - }, - { - "a": 1.5 - }, - { - "s": 1.0 - }, - { - "fighting": 2 - }, - { - "w": 0.75 - }, - { - "d": 2.51 - }, - { - "s": 11.0 - }, - { - "f": 5.5 - }, - { - "w": 6.744140901565552 - }, - { - "a": 2.705061912536621 - }, - { - "s": 2.2959096431732178 - }, - { - "fighting": 2 - }, - { - "w": 0.6009871959686279 - }, - { - "a": 5.687059640884399 - }, - { - "f": 5.5 - }, - { - "w": 5.391319751739502 - }, - { - "fighting": 2 - }, - { - "s": 0.36 - }, - { - "a": 3.8564820289611816 - }, - { - "w": 2.0 - }, - { - "d": 1.3723591327667236 - }, - { - "s": 3.13 - }, - { - "d": 2.5843095779418945 - }, - { - "f": 3.5 - }, - { - "w": 7.048770904541016 - }, - { - "a": 8.88 - }, - { - "s": 2.5 - }, - { - "a": 0.78 - }, - { - "r": 3.5 - }, - { - "a": 5.67 - }, - { - "r": 3.5 - }, - { - "a": 3.34 - }, - { - "w": 1.03 - }, - { - "fighting": 1 - }, - { - "w": 1.03 - }, - { - "d": 0.53 - }, - { - "fighting": 2 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_25.json b/map/default/map_4-3_25.json deleted file mode 100644 index 53c0ae51..00000000 --- a/map/default/map_4-3_25.json +++ /dev/null @@ -1,137 +0,0 @@ -{ - "name": "酒店梦境-25", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\fanhui_1.png": 1.5 - }, - { - "picture\\2floor.png": 1.5 - }, - { - "picture\\map_4-3_point_7.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 0.9676434993743896 - }, - { - "d": 14.287784337997437 - }, - { - "fighting": 2 - }, - { - "a": 1.0090892314910889 - }, - { - "w": 2.439167022705078 - }, - { - "d": 6.176150321960449 - }, - { - "w": 2.5 - }, - { - "fighting": 2 - }, - { - "a": 0.6403653621673584 - }, - { - "s": 6.695833921432495 - }, - { - "d": 1.37562894821167 - }, - { - "w": 2.737356662750244 - }, - { - "a": 1.8077008724212646 - }, - { - "s": 4.504109144210815 - }, - { - "f": 2.33 - }, - { - "a": 0.4167919158935547 - }, - { - "s": 5.328118324279785 - }, - { - "a": 1.0638511180877686 - }, - { - "w": 0.807384729385376 - }, - { - "a": 0.6878988742828369 - }, - { - "s": 0.7927651405334473 - }, - { - "r": 3.5 - }, - { - "s": 1.9745450019836426 - }, - { - "d": 6.66 - }, - { - "s": 2.88 - }, - { - "fighting": 2 - }, - { - "a": 0.8 - }, - { - "s": 0.5678322315216064 - }, - { - "r": 3.5 - }, - { - "s": 1.01 - }, - { - "a": 3.161 - }, - { - "s": 0.6 - }, - { - "fighting": 1 - }, - { - "d": 1.6321563720703125 - }, - { - "w": 2.7839720249176025 - }, - { - "a": 2.151 - }, - { - "fighting": 1 - }, - { - "fighting": 1 - } - ] -} \ No newline at end of file diff --git a/map/default/map_4-3_3.json b/map/default/map_4-3_3.json index 513c1542..9010eee2 100644 --- a/map/default/map_4-3_3.json +++ b/map/default/map_4-3_3.json @@ -1,44 +1,53 @@ { - "name": "酒店梦境-3", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_2.png": 1.5 - }, - { - "picture\\map_4-3_point_3.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 2.9835100173950195 - }, - { - "a": 13.5 - }, - { - "w": 3.9056477546691895 - }, - { - "fighting": 2 - }, - { - "d": 0.15 - }, - { - "fighting": 2 - }, - { - "a": 0.10 - }, - { - "fighting": 1 - } - ] + "name": "酒店梦境-3", + "author": "喵不可言", + "start": [ + { + "map": 1 + }, + { + "picture\\map_4-3_point_5.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "w": 1.6946470737457275 + }, + { + "a": 2.784348487854004 + }, + { + "w": 1.599660873413086 + }, + { + "fighting": 1 + }, + { + "d": 1.0324838161468506 + }, + { + "w": 4.344441652297974 + }, + { + "d": 1.167309284210205 + }, + { + "s": 0.41704511642456055 + }, + { + "d": 1.0557498931884766 + }, + { + "fighting": 1 + }, + { + "d": 1.3273046016693115 + }, + { + "fighting": 1 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_4.json b/map/default/map_4-3_4.json index 3e43b212..5f3ef674 100644 --- a/map/default/map_4-3_4.json +++ b/map/default/map_4-3_4.json @@ -1,86 +1,56 @@ { - "name": "酒店梦境-4", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_2.png": 1.5 - }, - { - "picture\\map_4-3_point_3.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 2.9835100173950195 - }, - { - "a": 13.5 - }, - { - "w": 2.6319055557250977 - }, - { - "a": 5.687119007110596 - }, - { - "w": 0.34366750717163086 - }, - { - "a": 1.1197950839996338 - }, - { - "s": 1.0638794898986816 - }, - { - "fighting": 2 - }, - { - "w": 4.159693717956543 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - }, - { - "w": 2.288041114807129 - }, - { - "a": 2.4643678665161133 - }, - { - "w": 3.0331242084503174 - }, - { - "d": 3.5 - }, - { - "w": 0.2 - }, - { - "fighting": 1 - }, - { - "w": 0.5 - }, - { - "d": 0.3 - }, - { - "fighting": 2 - }, - { - "d": 0.3 - }, - { - "fighting": 1 - } - ] + "name": "酒店梦境-4", + "author": "喵不可言", + "start": [ + { + "map": 1 + }, + { + "picture\\1floor.png": 1.5 + }, + { + "picture\\map_4-3_point_6.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "a": 0.9517734432220459 + }, + { + "w": 4.516014080047607 + }, + { + "d": 10.9 + }, + { + "w": 1.5 + }, + { + "d": 1.5 + }, + { + "s": 9.11 + }, + { + "fighting": 1 + }, + { + "d": 0.2 + }, + { + "fighting": 2 + }, + { + "s": 0.2 + }, + { + "fighting": 1 + }, + { + "fighting": 2 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_5.json b/map/default/map_4-3_5.json index dc72633e..6fcc3b8c 100644 --- a/map/default/map_4-3_5.json +++ b/map/default/map_4-3_5.json @@ -1,20 +1,245 @@ { - "name": "酒店梦境-5", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_1.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 6.127450466156006 - } - ] + "name": "酒店梦境(3D)-5", + "author": "喵不可言,和月", + "start": [ + { + "map": 1 + }, + { + "picture\\fanhui_1.png": 1.5 + }, + { + "picture\\1floor.png": 1.5 + }, + { + "picture\\map_4-3_point_6.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + }, + { + "map": 1 + }, + { + "picture\\3floor.png": 1.5 + }, + { + "picture\\map_4-3_point_8.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "view_set": 0.1 + }, + { + "w": 7.6 + }, + { + "a": 0.8 + }, + { + "r": 2.5 + }, + { + "a": 2.5 + }, + { + "r": 1.5 + }, + { + "a": 0.9 + }, + { + "w": 0.2 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "a": 1.5 + }, + { + "w": 7.5 + }, + { + "fighting": 2 + }, + { + "w": 1.5 + }, + { + "a": 2.5 + }, + { + "s": 7.5 + }, + { + "d": 3.5 + }, + { + "a": 0.4 + }, + { + "w": 8.5 + }, + { + "d": 1.0 + }, + { + "s": 0.7 + }, + { + "d": 4.5 + }, + { + "s": 2.4 + }, + { + "d": 1.0 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "a": 8.5 + }, + { + "s": 4.5 + }, + { + "w": 0.9 + }, + { + "a": 8.0 + }, + { + "w": 4.0 + }, + { + "d": 0.7 + }, + { + "s": 1.45 + }, + { + "f": 3.5 + }, + { + "w": 4.5 + }, + { + "a": 1.0 + }, + { + "r": 3.5 + }, + { + "a": 2.7 + }, + { + "fighting": 2 + }, + { + "a": 3.6 + }, + { + "s": 1.8 + }, + { + "d": 2.8 + }, + { + "f": 3.5 + }, + { + "w": 0.75 + }, + { + "d": 2.8 + }, + { + "r": 3.5 + }, + { + "d": 1.0 + }, + { + "s": 5.0 + }, + { + "f": 3.5 + }, + { + "a": 2.0 + }, + { + "d": 2.0 + }, + { + "s": 2.0 + }, + { + "r": 3.5 + }, + { + "s": 6.0 + }, + { + "a": 1.5 + }, + { + "d": 4.2 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "w": 0.8 + }, + { + "d": 2.0 + }, + { + "s": 1.5 + }, + { + "w": 1.2 + }, + { + "d": 2.0 + }, + { + "r": 3.5 + }, + { + "d": 5.2 + }, + { + "w": 1.4 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_6.json b/map/default/map_4-3_6.json index d185872d..a69fdb13 100644 --- a/map/default/map_4-3_6.json +++ b/map/default/map_4-3_6.json @@ -1,32 +1,161 @@ { - "name": "酒店梦境-6", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_4.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "a": 2.7039904594421387 - }, - { - "w": 4.5763917922973633 - }, - { - "fighting": 1 - }, - { - "fighting": 2 - }, - { - "fighting": 1 - } - ] + "name": "酒店梦境(3D)-6", + "author": "喵不可言,和月", + "start": [ + { + "map": 1 + }, + { + "picture\\fanhui_1.png": 1.5 + }, + { + "picture\\1floor.png": 2 + }, + { + "picture\\map_4-3_point_6.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "s": 7.59 + }, + { + "f": 10.0 + }, + { + "view_set": 0.1 + }, + { + "w": 1.9 + }, + { + "d": 3.32 + }, + { + "w": 4.38 + }, + { + "f": 10.0 + }, + { + "d": 0.57 + }, + { + "w": 7.13 + }, + { + "fighting": 2 + }, + { + "s": 1.85 + }, + { + "a": 9.35 + }, + { + "r": 3.5 + }, + { + "a": 1.35 + }, + { + "s": 2.0 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "w": 7.0 + }, + { + "a": 2.0 + }, + { + "s": 2.1 + }, + { + "a": 2.5 + }, + { + "w": 1.7 + }, + { + "s": 1.1 + }, + { + "d": 0.7 + }, + { + "w": 0.5 + }, + { + "r": 3.5 + }, + { + "w": 7.81 + }, + { + "a": 1.62 + }, + { + "w": 1.96 + }, + { + "f": 10.0 + }, + { + "d": 0.68 + }, + { + "w": 1.42 + }, + { + "r": 3.5 + }, + { + "w": 1.26 + }, + { + "d": 2.35 + }, + { + "s": 2.25 + }, + { + "r": 3.5 + }, + { + "s": 4.0 + }, + { + "fighting": 2 + }, + { + "d": 2.44 + }, + { + "fighting": 2 + }, + { + "d": 2.3 + }, + { + "fighting": 2 + }, + { + "s": 2.58 + }, + { + "fighting": 2 + }, + { + "fighting": 1 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_7.json b/map/default/map_4-3_7.json index 7b86f2e7..1e137f51 100644 --- a/map/default/map_4-3_7.json +++ b/map/default/map_4-3_7.json @@ -1,65 +1,278 @@ { - "name": "酒店梦境-7", - "author": "喵不可言", - "start": [ - { - "map": 2 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "s": 1.1048564910888672 - }, - { - "a": 7.183839797973633 - }, - { - "w": 1.3196651935577393 - }, - { - "a": 3.056006669998169 - }, - { - "r": 1.0 - }, - { - "s": 0.25 - }, - { - "a": 0.15 - }, - { - "fighting": 1 - }, - { - "fighting": 1 - }, - { - "d": 3.7 - }, - { - "fighting": 2 - }, - { - "w": 0.3 - }, - { - "fighting": 1 - }, - { - "a": 0.66 - }, - { - "w": 1.35 - }, - { - "fighting": 1 - } - ] + "name": "酒店梦境(3D)-7", + "author": "和月", + "start": [ + { + "map": 1 + }, + { + "picture\\fanhui_1.png": 1.5 + }, + { + "picture\\map_4-3.png": 1.5 + }, + { + "picture\\3floor.png": 1.5 + }, + { + "picture\\map_4-3_point_5.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "s": 1.1 + }, + { + "a": 18.0 + }, + { + "view_set": 0.1 + }, + { + "view_reset": 0.1 + }, + { + "a": 1.5 + }, + { + "w": 6.5 + }, + { + "d": 0.6 + }, + { + "w": 2.25 + }, + { + "a": 0.6 + }, + { + "f": 3.0 + }, + { + "fighting": 2 + }, + { + "s": 0.6 + }, + { + "d": 5.5 + }, + { + "a": 0.7 + }, + { + "w": 0.5 + }, + { + "r": 3.0 + }, + { + "w": 4.5 + }, + { + "a": 2.0 + }, + { + "w": 0.2 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "w": 2.5 + }, + { + "d": 2.5 + }, + { + "s": 2.5 + }, + { + "fighting": 2 + }, + { + "s": 2.0 + }, + { + "w": 1.0 + }, + { + "d": 3.0 + }, + { + "a": 0.6 + }, + { + "s": 4.5 + }, + { + "d": 1.5 + }, + { + "a": 5.3 + }, + { + "w": 0.65 + }, + { + "f": 3.0 + }, + { + "d": 1.1 + }, + { + "w": 5.0 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "a": 1.3 + }, + { + "w": 1.5 + }, + { + "d": 1.2 + }, + { + "s": 0.8 + }, + { + "d": 0.8 + }, + { + "w": 0.5 + }, + { + "r": 3.0 + }, + { + "w": 5.5 + }, + { + "a": 2.5 + }, + { + "s": 1.5 + }, + { + "f": 3.0 + }, + { + "d": 3.5 + }, + { + "s": 1.6 + }, + { + "d": 3.2 + }, + { + "r": 3.0 + }, + { + "d": 1.5 + }, + { + "w": 1.0 + }, + { + "s": 1.2 + }, + { + "d": 1.5 + }, + { + "w": 0.8 + }, + { + "d": 1.3 + }, + { + "w": 0.3 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "w": 2.0 + }, + { + "d": 4.0 + }, + { + "s": 2.9 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "s": 4.0 + }, + { + "a": 1.5 + }, + { + "w": 2.5 + }, + { + "a": 0.65 + }, + { + "s": 1.0 + }, + { + "r": 3.0 + }, + { + "s": 3.4 + }, + { + "d": 1.0 + }, + { + "fighting": 1 + }, + { + "fighting": 2 + }, + { + "view_reset": 0.1 + }, + { + "s": 1.5 + }, + { + "a": 0.5 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_8.json b/map/default/map_4-3_8.json index 68eeaf00..5479deaa 100644 --- a/map/default/map_4-3_8.json +++ b/map/default/map_4-3_8.json @@ -1,53 +1,296 @@ { - "name": "酒店梦境-8", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\map_4-3_point_5.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ - { - "w": 1.6946470737457275 - }, - { - "a": 2.784348487854004 - }, - { - "w": 1.599660873413086 - }, - { - "fighting": 1 - }, - { - "d": 1.0324838161468506 - }, - { - "w": 4.344441652297974 - }, - { - "d": 1.167309284210205 - }, - { - "s": 0.41704511642456055 - }, - { - "d": 1.0557498931884766 - }, - { - "fighting": 1 - }, - { - "d": 1.3273046016693115 - }, - { - "fighting": 1 - } - ] + "name": "酒店梦境(3D)-8", + "author": "和月", + "start": [ + { + "map": 1 + }, + { + "picture\\fanhui_1.png": 1.5 + }, + { + "picture\\map_4-2.png": 2 + }, + { + "picture\\map_4-2_point_1.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + }, + { + "map": 1 + }, + { + "picture\\map_4-3.png": 2 + }, + { + "picture\\1floor.png": 2 + }, + { + "picture\\map_4-3_point_1.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "w": 0.5 + }, + { + "d": 2.0 + }, + { + "f": 3.5 + }, + { + "view_set": 0.1 + }, + { + "a": 0.3 + }, + { + "w": 5.3 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "w": 2.0 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 2.0 + }, + { + "w": 2.0 + }, + { + "a": 1.0 + }, + { + "w": 1.5 + }, + { + "d": 2.5 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 6.0 + }, + { + "s": 2.0 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 2.0 + }, + { + "w": 1.0 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "s": 5.0 + }, + { + "d": 4.0 + }, + { + "w": 0.5 + }, + { + "a": 3.4 + }, + { + "fighting": 2 + }, + { + "a": 1.2 + }, + { + "s": 10.0 + }, + { + "f": 3.5 + }, + { + "w": 6.6 + }, + { + "a": 8.5 + }, + { + "f": 3.5 + }, + { + "view_set": 0.1 + }, + { + "w": 4.0 + }, + { + "a": 3.5 + }, + { + "w": 1.8 + }, + { + "d": 1.1 + }, + { + "s": 2.0 + }, + { + "d": 1.5 + }, + { + "f": 3.5 + }, + { + "w": 2.5 + }, + { + "a": 4.0 + }, + { + "w": 1.2 + }, + { + "a": 1.0 + }, + { + "r": 3.5 + }, + { + "a": 5.0 + }, + { + "r": 3.5 + }, + { + "a": 3.5 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 16.0 + }, + { + "s": 6.0 + }, + { + "a": 3.0 + }, + { + "w": 0.5 + }, + { + "f": 3.5 + }, + { + "w": 10.0 + }, + { + "d": 3.0 + }, + { + "s": 2.0 + }, + { + "a": 0.8 + }, + { + "s": 0.8 + }, + { + "d": 0.5 + }, + { + "r": 3.5 + }, + { + "d": 1.5 + }, + { + "s": 5.2 + }, + { + "d": 1.5 + }, + { + "fighting": 1 + }, + { + "fighting": 2 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "a": 2.5 + }, + { + "w": 9.0 + }, + { + "d": 2.5 + }, + { + "s": 1.6 + }, + { + "d": 2.0 + }, + { + "w": 1.7 + }, + { + "r": 3.5 + }, + { + "w": 3.5 + }, + { + "a": 1.0 + }, + { + "w": 3.3 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + } + ] } \ No newline at end of file diff --git a/map/default/map_4-3_9.json b/map/default/map_4-3_9.json index b2f723dc..c719543e 100644 --- a/map/default/map_4-3_9.json +++ b/map/default/map_4-3_9.json @@ -1,56 +1,143 @@ { - "name": "酒店梦境-9", - "author": "喵不可言", - "start": [ - { - "map": 1 - }, - { - "picture\\1floor.png": 1.5 - }, - { - "picture\\map_4-3_point_6.png": 1.5 - }, - { - "picture\\transfer.png": 1.5 - } - ], - "map": [ + "name": "酒店梦境(3D)-9", + "author": "和月", + "start": [ { - "a": 0.9517734432220459 + "map": 1 }, { - "w": 4.516014080047607 + "picture\\fanhui_1.png": 1.5 }, { - "d": 10.9 - }, + "picture\\3floor.png": 2 + }, + { + "picture\\map_4-3_point_2.png": 1.5 + }, + { + "picture\\map_4-3_point_3.png": 1.5 + }, + { + "picture\\transfer.png": 1.5 + } + ], + "map": [ + { + "view_set": 0.1 + }, + { + "w": 3.05 + }, { - "w": 1.5 - }, + "a": 33.0 + }, { - "d": 1.5 + "f": 3.5 }, { - "s": 9.11 + "w": 2.65 }, { "fighting": 1 - }, + }, + { + "view_reset": 0.1 + }, { - "d": 0.2 + "s": 1.3 }, { - "fighting": 2 - }, + "d": 2.0 + }, + { + "s": 3.7 + }, { - "s": 0.2 + "a": 0.5 }, { "fighting": 1 - }, + }, { - "fighting": 2 + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "s": 2.5 + }, + { + "a": 1.5 + }, + { + "w": 0.8 + }, + { + "a": 0.6 + }, + { + "s": 0.5 + }, + { + "r": 3.5 + }, + { + "s": 2.0 + }, + { + "d": 1.8 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "d": 3.0 + }, + { + "a": 0.65 + }, + { + "s": 1.0 + }, + { + "r": 3.5 + }, + { + "s": 1.5 + }, + { + "a": 3.0 + }, + { + "fighting": 1 + }, + { + "fighting": 1 + }, + { + "view_reset": 0.1 + }, + { + "a": 3.0 + }, + { + "s": 3.0 + }, + { + "d": 4.5 + }, + { + "fighting": 1 + }, + { + "d": 1.0 + }, + { + "fighting": 1 } ] } \ No newline at end of file