From 74a52fc793e19f5f90e3d70c1c890de7e82b9e20 Mon Sep 17 00:00:00 2001
From: Zye <1838979562@qq.com>
Date: Sun, 16 Oct 2022 12:41:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B9=90=E5=AD=90=E4=BA=BA=E5=BC=80=E5=A7=8B?=
 =?UTF-8?q?=E5=88=B6=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Readme.md          | 6 +-----
 data/MapInfos.json | 3 ---
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/Readme.md b/Readme.md
index fd50099..abb74dc 100644
--- a/Readme.md
+++ b/Readme.md
@@ -2,7 +2,7 @@
 异常生物见闻录 rpg 第二版 仓库
 
 ## 使用者-锁
-
+乐子人
 
 ## 使用流程
 1. 在你进行你的内容更新之前，先执行一次拉取操作。正常情况下不会提示内容冲突，如果有，则VS code右上角点击文件，选择关闭文件夹。然后再把你本地那个同步文件夹删掉，重新从Github克隆。
@@ -22,12 +22,8 @@
 
 
 ## 更新记录
-<<<<<<< HEAD
-- **2022/10/10**；**乐子人**；补充错漏，补充武器和防具
-=======
 - **2022/10/07**；**不明枪兵**；前置剧情完成
 - **2022/10/07**；**不明枪兵**；把异常一的音效复制过来了，调整了飞船事件。
->>>>>>> c0b2311a20818b43ae9216d6605b7c0b3501bab2
 - **2022/10/05**；**乐子人**；补充怪物，补充开场释放的技能
 - **2022/10/04**；**乐子人**；写入实现新插件功能需要做的备注，写入部分武器和防具
 - **2022/10/02**；**不明枪兵**；现有文案制作完成。。
diff --git a/data/MapInfos.json b/data/MapInfos.json
index 13e9e77..e3a256e 100644
--- a/data/MapInfos.json
+++ b/data/MapInfos.json
@@ -1,6 +1,5 @@
 [
 null,
-<<<<<<< HEAD
 {"id":1,"expanded":true,"name":"地球","order":1,"parentId":0,"scrollX":691.1111111111111,"scrollY":418.6666666666667},
 {"id":2,"expanded":false,"name":"星港","order":41,"parentId":27,"scrollX":852,"scrollY":1988.4444444444443},
 {"id":3,"expanded":true,"name":"好人家二层","order":19,"parentId":22,"scrollX":772.5,"scrollY":529},
@@ -43,7 +42,6 @@ null,
 {"id":40,"expanded":false,"name":"装备店","order":30,"parentId":36,"scrollX":684,"scrollY":541.3333333333334},
 {"id":41,"expanded":false,"name":"世界之门","order":32,"parentId":32,"scrollX":684,"scrollY":1372.4444444444443},
 {"id":42,"expanded":false,"name":"魔王城","order":31,"parentId":35,"scrollX":756,"scrollY":726.2222222222222}
-=======
 {"id":1,"expanded":true,"name":"地球","order":1,"parentId":0,"scrollX":832,"scrollY":640},
 {"id":2,"expanded":false,"name":"星港","order":54,"parentId":27,"scrollX":1042.2,"scrollY":954},
 {"id":3,"expanded":true,"name":"好人家二层","order":19,"parentId":22,"scrollX":925.8,"scrollY":562.8},
@@ -99,5 +97,4 @@ null,
 {"id":53,"expanded":true,"name":"熔岩洞窟：B1","order":40,"parentId":52,"scrollX":1544,"scrollY":1494},
 {"id":54,"expanded":false,"name":"熔岩洞窟：B2","order":41,"parentId":53,"scrollX":1543,"scrollY":1086},
 {"id":55,"expanded":true,"name":"好人家一层（彩蛋）","order":21,"parentId":22,"scrollX":994.1999999999999,"scrollY":637.1999999999999}
->>>>>>> c0b2311a20818b43ae9216d6605b7c0b3501bab2
 ]
\ No newline at end of file