From 4c80ff300445de231f06a44f34a341a348f57f95 Mon Sep 17 00:00:00 2001
From: ckcz123 <ckcz123@126.com>
Date: Fri, 6 Jul 2018 21:15:10 +0800
Subject: [PATCH] No flags in save

---
 .gitignore      | 2 +-
 libs/control.js | 9 +++------
 libs/core.js    | 6 +++---
 更新说明.txt    | 1 +
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/.gitignore b/.gitignore
index 94816db6..928ab591 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 .vscode
 *ce5eec52_2fa1_447b_8dad_764e267a7fab*
 
-**/.DS_Store
+.DS_Store
 
 # Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and Webstorm
 # Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
diff --git a/libs/control.js b/libs/control.js
index 51622c78..390412ea 100644
--- a/libs/control.js
+++ b/libs/control.js
@@ -243,7 +243,7 @@ control.prototype.clearStatus = function() {
 }
 
 ////// 重置游戏状态和初始数据 //////
-control.prototype.resetStatus = function(hero, hard, floorId, route, maps, values, flags) {
+control.prototype.resetStatus = function(hero, hard, floorId, route, maps, values) {
 
     var totalTime=0;
     if (core.isset(core.status) && core.isset(core.status.hero)
@@ -292,9 +292,7 @@ control.prototype.resetStatus = function(hero, hard, floorId, route, maps, value
         core.values = core.clone(values);
     else core.values = core.clone(core.data.values);
 
-    if (core.isset(flags))
-        core.flags = core.clone(flags);
-    else core.flags = core.clone(core.data.flags);
+    core.flags = core.clone(core.data.flags);
 
     core.events.initGame();
 
@@ -2269,7 +2267,6 @@ control.prototype.saveData = function() {
         'maps': core.maps.save(core.status.maps),
         'route': core.encodeRoute(core.status.route),
         'values': core.clone(core.values),
-        'flags': core.clone(core.flags),
         'shops': {},
         'version': core.firstData.version,
         "time": new Date().getTime()
@@ -2290,7 +2287,7 @@ control.prototype.saveData = function() {
 control.prototype.loadData = function (data, callback) {
 
     core.resetStatus(data.hero, data.hard, data.floorId, core.decodeRoute(data.route), core.maps.load(data.maps),
-        data.values, data.flags);
+        data.values);
 
     // load shop times
     for (var shop in core.status.shops) {
diff --git a/libs/core.js b/libs/core.js
index 4ae431dc..264a76d4 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -304,13 +304,13 @@ core.prototype.clearStatus = function() {
 }
 
 ////// 重置游戏状态和初始数据 //////
-core.prototype.resetStatus = function(hero, hard, floorId, route, maps, values, flags) {
-    core.control.resetStatus(hero, hard, floorId, route, maps, values, flags);
+core.prototype.resetStatus = function(hero, hard, floorId, route, maps, values) {
+    core.control.resetStatus(hero, hard, floorId, route, maps, values);
 }
 
 ////// 开始游戏 //////
 core.prototype.startGame = function (hard, callback) {
-    core.control.startGame(hard, callback);
+    core.control.startGame(hard, callback);huo
 }
 
 ////// 重新开始游戏；此函数将回到标题页面 //////
diff --git a/更新说明.txt b/更新说明.txt
index 32a266cc..43aa8145 100644
--- a/更新说明.txt
+++ b/更新说明.txt
@@ -3,6 +3,7 @@
 启动服务的多开版本  √
 跟随效果  √
 怪物数据导出器
+RM动画导出器也能导出音效  √
 gif播放可随着分辨率自动放缩  √
 状态栏可随文字长度自动调整放缩  √
 也可以用status:exp来代替经验值的写法  √