From 4e8c4c1798523ce30595d2f306adc374c5feba89 Mon Sep 17 00:00:00 2001
From: oc <ckcz123@126.com>
Date: Tue, 26 Mar 2019 22:32:21 +0800
Subject: [PATCH] startGame replay & init sys flags

---
 libs/core.js         | 17 ++++++++++-------
 libs/events.js       |  8 ++++++--
 project/functions.js |  1 +
 3 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/libs/core.js b/libs/core.js
index 58d41ec9..4ef06a69 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -227,13 +227,7 @@ core.prototype._init_flags = function () {
     core.flags = core.clone(core.data.flags);
     core.values = core.clone(core.data.values);
     core.firstData = core.clone(core.data.firstData);
-
-    if (!core.flags.enableExperience) core.flags.enableLevelUp = false;
-    if (!core.flags.enableLevelUp) core.flags.levelUpLeftMode = false;
-    if (core.flags.equipboxButton) core.flags.equipment = true;
-    core.flags.displayEnemyDamage = core.getLocalStorage('enemyDamage', core.flags.displayEnemyDamage);
-    core.flags.displayCritical = core.getLocalStorage('critical', core.flags.displayCritical);
-    core.flags.displayExtraDamage = core.getLocalStorage('extraDamage', core.flags.displayExtraDamage);
+    this._init_sys_flags();
 
     core.dom.versionLabel.innerHTML = core.firstData.version;
     core.dom.logoLabel.innerHTML = core.firstData.title;
@@ -248,6 +242,15 @@ core.prototype._init_flags = function () {
     core.material.icons = core.icons.getIcons();
 }
 
+core.prototype._init_sys_flags = function () {
+    if (!core.flags.enableExperience) core.flags.enableLevelUp = false;
+    if (!core.flags.enableLevelUp) core.flags.levelUpLeftMode = false;
+    if (core.flags.equipboxButton) core.flags.equipment = true;
+    core.flags.displayEnemyDamage = core.getLocalStorage('enemyDamage', core.flags.displayEnemyDamage);
+    core.flags.displayCritical = core.getLocalStorage('critical', core.flags.displayCritical);
+    core.flags.displayExtraDamage = core.getLocalStorage('extraDamage', core.flags.displayExtraDamage);
+}
+
 core.prototype._init_platform = function () {
     core.platform.isOnline = location.protocol.indexOf("http") == 0;
     if (!core.platform.isOnline) alert("请勿直接打开html文件！使用启动服务或者APP进行离线游戏。");
diff --git a/libs/events.js b/libs/events.js
index e15598e3..fd81f219 100644
--- a/libs/events.js
+++ b/libs/events.js
@@ -16,7 +16,7 @@ events.prototype._init = function () {
 
 /// 初始化游戏
 events.prototype.resetGame = function (hero, hard, floorId, maps, values) {
-    return this.eventdata.resetGame(hero, hard, floorId, maps, values);
+    this.eventdata.resetGame(hero, hard, floorId, maps, values);
 }
 
 ////// 游戏开始事件 //////
@@ -75,7 +75,11 @@ events.prototype._startGame_afterStart = function (nowLoc, callback) {
     core.ui.closePanel();
     core.showStatusBar();
     core.dom.musicBtn.style.display = 'none';
-    core.changeFloor(core.firstData.floorId, null, nowLoc, null, callback);
+    core.changeFloor(core.firstData.floorId, null, nowLoc, null, function () {
+        // 插入一个空事件避免直接回放录像出错
+        core.insertAction([]);
+        if (callback) callback();
+    });
     this._startGame_upload();
 }
 
diff --git a/project/functions.js b/project/functions.js
index 64fc7537..64e05bf8 100644
--- a/project/functions.js
+++ b/project/functions.js
@@ -34,6 +34,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a =
 	var globalFlags = core.getFlag("globalFlags", {});
 	for (var key in globalFlags)
 		core.flags[key] = globalFlags[key];
+	core._init_sys_flags();
 	// 初始化界面，状态栏等
 	core.resize();
 	core.updateGlobalAttribute();