From ba7bbbc7bec041acdc2a5b2b3a4b5306e0aaafb8 Mon Sep 17 00:00:00 2001
From: YouWei Zhao <zhao.uv@gmail.com>
Date: Sun, 31 Dec 2017 12:15:19 +0800
Subject: [PATCH] editor: import main.js
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

目前状态是都能工作,需要重写editor的方法
---
 drawMapGUI.html          | 160 +++++++++++++++++++++++++++++++++------
 libs/core.js             |  14 ++--
 main.js                  |   2 +-
 test_main_init_mode.html | 150 ++++++++++++++++++++++++++++++++++++
 4 files changed, 294 insertions(+), 32 deletions(-)
 create mode 100644 test_main_init_mode.html

diff --git a/drawMapGUI.html b/drawMapGUI.html
index 5505e776..0f0c0ba7 100644
--- a/drawMapGUI.html
+++ b/drawMapGUI.html
@@ -328,8 +328,8 @@
       <table class="row" id='mapRowMark'></table>
       <div class="map" id="mapEdit">
         <canvas class='gameCanvas' id='bg' width='416' height='416' style='z-index:1'></canvas>
-        <canvas class='gameCanvas' id='eventLayer' width='416' height='416' style='z-index:2'></canvas>
-        <canvas class='gameCanvas' id='ui' width='416' height='416' style='z-index:100'></canvas>
+        <canvas class='gameCanvas' id='event' width='416' height='416' style='z-index:2'></canvas>
+        <canvas class='gameCanvas' id='eui' width='416' height='416' style='z-index:100'></canvas>
       </div>
       <div class="tools">
         <div id="tip" v-cloak >
@@ -362,13 +362,111 @@
     </div>
     <div id="right">
       <div id="iconLib">
-        <canvas class='gameCanvas' id='data' width='416' height='416' style='z-index:0'></canvas>
+        <canvas class='gameCanvas' id='edata' width='416' height='416' style='z-index:0'></canvas>
         <div id="selectBox">
             <div id='dataSelection' v-show="isSelected" v-cloak></div>
         </div>
       </div>
     </div>
   </div>
+  <!-- <script>/* -->
+  <div id='gameGroup' style='display:none'>
+    <p id='mainTips'>请稍后...</p>
+    <div id='startPanel'>
+        <div id='startTop'>
+            <div id='startTopProgressBar'>
+                <div id='startTopProgress'></div>
+            </div>
+            <p id='startTopLoadTips'>资源即将开始加载</p>
+        </div>
+        <img id='startBackground' src='images/bg.png'>
+        <!-- 标题界面；可以改style的color使标题改变颜色 -->
+        <p id='startLogo' style="color: black"></p>
+        <div id='startButtonGroup'>
+            <div id='startButtons'>
+                <span class='startButton' id='playGame'>开始游戏</span>
+                <span class='startButton' id='loadGame'>载入游戏</span>
+                <span class='startButton' id='aboutGame'>关于本塔</span>
+            </div>
+            <div id='levelChooseButtons'>
+                <span class='startButton' id='easyLevel'>简单</span>
+                <span class='startButton' id='normalLevel'>普通</span>
+                <span class='startButton' id='hardLevel'>困难</span>
+            </div>
+        </div>
+    </div>
+    <div id='floorMsgGroup'>
+        <p id='logoLabel'></p>
+        <p id='versionLabel'></p>
+        <p id='floorNameLabel'></p>
+    </div>
+    <div id='statusBar' class="clearfix">
+        <div class="status" id="floorCol">
+            <img src='images/floor.png' id="img-floor">
+            <p class='statusLabel' id='floor'></p>
+        </div>
+        <div class="status" id="lvCol">
+            <img src='images/lv.png' id="img-lv">
+            <p class='statusLabel' id='lv'></p>
+        </div>
+        <div class="status">
+            <img src='images/hp.png' id="img-hp">
+            <p class='statusLabel' id='hp'></p>
+        </div>
+        <div class="status">
+            <img src='images/atk.png' id="img-atk">
+            <p class='statusLabel' id='atk'></p>
+        </div>
+        <div class="status">
+            <img src='images/def.png' id="img-def">
+            <p class='statusLabel' id='def'></p>
+        </div>
+        <div class="status" id="mdefCol">
+            <img src='images/mdef.png' id="img-mdef">
+            <p class='statusLabel' id='mdef'></p>
+        </div>
+        <div class="status" id="moneyCol">
+            <img src='images/money.png' id="img-money">
+            <p class='statusLabel' id='money'></p>
+        </div>
+        <div class="status" id="expCol">
+            <img src='images/experience.png' id="img-experience">
+            <p class='statusLabel' id='experience'></p>
+        </div>
+        <div class="status" id="upCol">
+            <img src='images/up.png' id="img-up">
+            <p class='statusLabel' id='up'></p>
+        </div>
+        <div class="status">
+            <span class='statusLabel' id='yellowKey' style="color:#FFCCAA"></span>
+            <span class='statusLabel' id='blueKey' style="color:#AAAADD"></span>
+            <span class='statusLabel' id='redKey' style="color:#FF8888"></span>
+        </div>
+        <div class="status" id="debuffCol">
+            <span class='statusLabel' id='poison' style="color: #AFFCA8;"></span>
+            <span class='statusLabel' id='weak' style="color: #FECCD0;"></span>
+            <span class='statusLabel' id='curse' style="color: #C2F4E7;"></span>
+        </div>
+    </div>
+    <div id="toolBar" class="clearfix">
+        <img src="images/book.png" class="tools" id='img-book'>
+        <img src="images/fly.png" class="tools" id='img-fly'>
+        <img src="images/toolbox.png" class="tools" id='img-toolbox'>
+        <img src="images/shop.png" class="tools" id='img-shop'>
+        <img src="images/save.png" class="tools" id='img-save'>
+        <img src="images/load.png" class="tools" id='img-load'>
+        <img src="images/settings.png" class="tools" id='img-settings'>
+        <p class="statusLabel tools" id="hard"></p>
+    </div>
+    <div id="curtain"></div>
+    <!-- <canvas class='gameCanvas' id='bg' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='event' width='416' height='416'></canvas> -->
+    <canvas class='gameCanvas' id='fg' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='hero' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='ui' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='data' width='416' height='416'>此浏览器不支持HTML5</canvas>
+  </div>
+  <!-- */</script> -->
 <script>
 // 生成定位编号
 (function(){
@@ -396,6 +494,7 @@
 <script src='_server/fs.js'></script>
 <script src='_server/editor_file.js'></script>
 <script src='_server/vm.js'></script>
+<script id='mainScript' src='main.js'></script>
 <script>
 printf = function(str,weak) {
   var prefix='<span class="result">',postfix='</span>';
@@ -405,16 +504,16 @@ printf = function(str,weak) {
 }
 //所有全局量
 __all__=['Vue','fs','printf','editor','main','core','fullX','fullY'];
-__id__=['printOut','arrRowMark','mapRowMark','data','bg','dataSelection'];
+__id__=['printOut','arrRowMark','mapRowMark','edata','bg','dataSelection'];
 __Vue__=['exportM','editArea','editTip','clear','tip','selectBox'];
+//var event = document.getElementById('event');
 
 var hasOwnProperty = Object.prototype.hasOwnProperty;
 function hasOwnProp (obj, key) {
   return hasOwnProperty.call(obj, key)
 }
 
-var main={'instance':{}};
-var core={};
+
 
 function editor() {
   this.version = "1.2";
@@ -580,9 +679,9 @@ editor.prototype.drawInitData = function (icons) {
   var fullWidth=~~(sumWidth*ratio);
   var fullHeight=~~(maxHeight*ratio);
 
-  if (fullWidth > data.width) data.style.width = (data.width = fullWidth)/ratio + 'px';
-  data.style.height = (data.height = fullHeight)/ratio + 'px';
-  var dc = data.getContext('2d');
+  if (fullWidth > edata.width) edata.style.width = (edata.width = fullWidth)/ratio + 'px';
+  edata.style.height = (edata.height = fullHeight)/ratio + 'px';
+  var dc = edata.getContext('2d');
   var nowx = 0;
   var nowy = 0;
   for(var ii=0; ii<imgNames.length; ii++){
@@ -608,7 +707,7 @@ editor.prototype.drawInitData = function (icons) {
   editor.mapInit();
 }
 editor.prototype.mapInit = function(){
-  var ec = eventLayer.getContext('2d');
+  var ec = document.getElementById('event').getContext('2d');
   ec.clearRect(0, 0, 416, 416);
   editor.map = [];
   for(var y=0; y<13; y++){
@@ -738,7 +837,7 @@ editor.prototype.updateMap = function(){
   }
 
   // 绘制地图 start
-  var eventCtx = eventLayer.getContext("2d");
+  var eventCtx = document.getElementById('event').getContext("2d");
   for(var y=0; y<13; y++)
     for(var x=0; x<13; x++){
       var tileInfo = editor.map[y][x];
@@ -752,7 +851,7 @@ editor.prototype.updateMap = function(){
 
 editor.prototype.listen = function() {
 
-  var uc = ui.getContext('2d');
+  var uc = eui.getContext('2d');
 
   function fillPos(pos) {
     uc.fillStyle = '#' + ~~(Math.random() * 8) + ~~(Math.random() * 8) + ~~(Math.random() * 8);
@@ -787,7 +886,7 @@ editor.prototype.listen = function() {
     uc.clearRect(0, 0, 416, 416);
   }//用于鼠标移出canvas时的自动清除状态
 
-  ui.onmousedown = function (e) {
+  eui.onmousedown = function (e) {
     if(!selectBox.isSelected) {
       tip.whichShow = 1;
       return;
@@ -805,7 +904,7 @@ editor.prototype.listen = function() {
     fillPos(pos);
   }
 
-  ui.onmousemove = function (e) {
+  eui.onmousemove = function (e) {
     if(!selectBox.isSelected) {
       // tip.whichShow = 1;
       return;
@@ -834,7 +933,7 @@ editor.prototype.listen = function() {
     }
   }
 
-  ui.onmouseup = function (e) {
+  eui.onmouseup = function (e) {
     if(!selectBox.isSelected) {
       tip.whichShow = 1;
       return;
@@ -888,7 +987,7 @@ editor.prototype.listen = function() {
     }
   }
 
-  data.onmousedown = function (e) {
+  edata.onmousedown = function (e) {
     e.stopPropagation();
     var loc = { 
       'x': document.documentElement.scrollLeft + e.clientX + iconLib.scrollLeft - right.offsetLeft-iconLib.offsetLeft, 
@@ -957,12 +1056,29 @@ editor.info
 始终是最后一次点击的结果
 注意editor.info可能因为点击其他地方而被清空
 */
-var editor = new editor();
-editor.init();
-editor.main=main;
-editor.core=core;
-editor.fs=fs;
-editor.file=editor_file;
+editor = new editor();
+main.init('editor');
+//main.listen();
+var afterMainInit = function(){
+  //main.editor.drawMapBg();
+  //main.editor.updateMap();
+  main.instance={};
+  editor.main=main;
+  editor.core=core;
+  editor.fs=fs;
+  editor.file=editor_file;
+  editor.init();
+}
+var startgame = function(){
+    var hard = 'Hard';
+    core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, core.initStatus.maps);
+    core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() {
+        /* core.setHeroMoveTriggerInterval(); */
+        afterMainInit();
+    });
+    core.events.setInitData(hard);
+}
+setTimeout(startgame, 300);
 
 </script>
 <script type="text/javascript">
diff --git a/libs/core.js b/libs/core.js
index 74ef79ec..02d53cab 100644
--- a/libs/core.js
+++ b/libs/core.js
@@ -1997,14 +1997,12 @@ core.prototype.drawMap = function (mapName, callback) {
             }
         }
     }
-
+    drawBg();
     if (main.mode=='editor'){
         main.editor.drawMapBg = function(){
             core.clearMap('bg', 0, 0, 416, 416);
             drawBg();
         }
-    } else {
-        drawBg();
     }
 
     var drawEvent = function(){
@@ -2032,14 +2030,12 @@ core.prototype.drawMap = function (mapName, callback) {
         }
         core.drawAutotile(mapName, 'event', autotileMaps, 0, 0, 32);
     }
-
+    drawEvent();
     if (main.mode=='editor'){
         main.editor.updateMap = function(){
             core.clearMap('event', 0, 0, 416, 416);
             drawEvent();
         }
-    } else {
-        drawEvent();
     }
     core.setGlobalAnimate(core.values.animateSpeed);
 
@@ -2448,7 +2444,7 @@ core.prototype.removeBlockByIds = function (floorId, ids) {
 
 ////// 添加一个全局动画 //////
 core.prototype.addGlobalAnimate = function (animateMore, x, y, loc, image) {
-    if (main.mode=='editor') return;
+    if (main.mode=='editor' && main.editor.disableGlobalAnimate) return;
     if (animateMore == 2) {
         core.status.twoAnimateObjs.push({
             'x': x,
@@ -2471,7 +2467,7 @@ core.prototype.addGlobalAnimate = function (animateMore, x, y, loc, image) {
 
 ////// 删除一个或所有全局动画 //////
 core.prototype.removeGlobalAnimate = function (x, y, all) {
-    if (main.mode=='editor') return;
+    if (main.mode=='editor' && main.editor.disableGlobalAnimate) return;
     if (all == true) {
         core.status.twoAnimateObjs = [];
         core.status.fourAnimateObjs = [];
@@ -2492,7 +2488,7 @@ core.prototype.removeGlobalAnimate = function (x, y, all) {
 
 ////// 设置全局动画的显示效果 //////
 core.prototype.setGlobalAnimate = function (speed) {
-    if (main.mode=='editor') return;
+    if (main.mode=='editor' && main.editor.disableGlobalAnimate) return;
     clearInterval(core.interval.twoAnimate);
     clearInterval(core.interval.fourAnimate);
     var animateClose = false;
diff --git a/main.js b/main.js
index 4d33ced5..c3becd31 100644
--- a/main.js
+++ b/main.js
@@ -110,7 +110,7 @@ main.prototype.init = function (mode) {
     }
     if (({"editor":0,"replay":0}).hasOwnProperty(mode)) {
         main.mode = mode;
-        if (mode === 'editor')main.editor = {};
+        if (mode === 'editor')main.editor = {'disableGlobalAnimate':true};
     }
     main.loadPureData(function(){
         main.useCompress=data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.main.useCompress;
diff --git a/test_main_init_mode.html b/test_main_init_mode.html
new file mode 100644
index 00000000..61a2b11a
--- /dev/null
+++ b/test_main_init_mode.html
@@ -0,0 +1,150 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta http-equiv='content-type' content='text/html' charset='utf-8'>
+    <meta http-equiv='X-UA-Compatible' content='IE=Edge, chrome=1'>
+    <meta name='author' content='ckcz123'>
+    <meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=yes'>
+    <title></title>
+    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent"/>
+    <meta name="screen-orientation" content="portrait">
+    <meta name="full-screen" content="yes">
+    <meta name="browsermode" content="application">
+    <meta name="x5-orientation" content="portrait">
+    <meta name="x5-fullscreen" content="true">
+    <meta name="x5-page-mode" content="app">
+    <link type='text/css' href='styles.css' rel='stylesheet'>
+</head>
+<body>
+<div id='gameGroup'>
+    <p id='mainTips'>请稍后...</p>
+    <div id='startPanel'>
+        <div id='startTop'>
+            <div id='startTopProgressBar'>
+                <div id='startTopProgress'></div>
+            </div>
+            <p id='startTopLoadTips'>资源即将开始加载</p>
+        </div>
+        <img id='startBackground' src='images/bg.png'>
+        <!-- 标题界面；可以改style的color使标题改变颜色 -->
+        <p id='startLogo' style="color: black"></p>
+        <div id='startButtonGroup'>
+            <div id='startButtons'>
+                <span class='startButton' id='playGame'>开始游戏</span>
+                <span class='startButton' id='loadGame'>载入游戏</span>
+                <span class='startButton' id='aboutGame'>关于本塔</span>
+            </div>
+            <div id='levelChooseButtons'>
+                <span class='startButton' id='easyLevel'>简单</span>
+                <span class='startButton' id='normalLevel'>普通</span>
+                <span class='startButton' id='hardLevel'>困难</span>
+            </div>
+        </div>
+    </div>
+    <div id='floorMsgGroup'>
+        <p id='logoLabel'></p>
+        <p id='versionLabel'></p>
+        <p id='floorNameLabel'></p>
+    </div>
+    <div id='statusBar' class="clearfix">
+        <div class="status" id="floorCol">
+            <img src='images/floor.png' id="img-floor">
+            <p class='statusLabel' id='floor'></p>
+        </div>
+        <div class="status" id="lvCol">
+            <img src='images/lv.png' id="img-lv">
+            <p class='statusLabel' id='lv'></p>
+        </div>
+        <div class="status">
+            <img src='images/hp.png' id="img-hp">
+            <p class='statusLabel' id='hp'></p>
+        </div>
+        <div class="status">
+            <img src='images/atk.png' id="img-atk">
+            <p class='statusLabel' id='atk'></p>
+        </div>
+        <div class="status">
+            <img src='images/def.png' id="img-def">
+            <p class='statusLabel' id='def'></p>
+        </div>
+        <div class="status" id="mdefCol">
+            <img src='images/mdef.png' id="img-mdef">
+            <p class='statusLabel' id='mdef'></p>
+        </div>
+        <div class="status" id="moneyCol">
+            <img src='images/money.png' id="img-money">
+            <p class='statusLabel' id='money'></p>
+        </div>
+        <div class="status" id="expCol">
+            <img src='images/experience.png' id="img-experience">
+            <p class='statusLabel' id='experience'></p>
+        </div>
+        <div class="status" id="upCol">
+            <img src='images/up.png' id="img-up">
+            <p class='statusLabel' id='up'></p>
+        </div>
+        <div class="status">
+            <span class='statusLabel' id='yellowKey' style="color:#FFCCAA"></span>
+            <span class='statusLabel' id='blueKey' style="color:#AAAADD"></span>
+            <span class='statusLabel' id='redKey' style="color:#FF8888"></span>
+        </div>
+        <div class="status" id="debuffCol">
+            <span class='statusLabel' id='poison' style="color: #AFFCA8;"></span>
+            <span class='statusLabel' id='weak' style="color: #FECCD0;"></span>
+            <span class='statusLabel' id='curse' style="color: #C2F4E7;"></span>
+        </div>
+    </div>
+    <div id="toolBar" class="clearfix">
+        <img src="images/book.png" class="tools" id='img-book'>
+        <img src="images/fly.png" class="tools" id='img-fly'>
+        <img src="images/toolbox.png" class="tools" id='img-toolbox'>
+        <img src="images/shop.png" class="tools" id='img-shop'>
+        <img src="images/save.png" class="tools" id='img-save'>
+        <img src="images/load.png" class="tools" id='img-load'>
+        <img src="images/settings.png" class="tools" id='img-settings'>
+        <p class="statusLabel tools" id="hard"></p>
+    </div>
+    <div id="curtain"></div>
+    <canvas class='gameCanvas' id='bg' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='event' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='fg' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='hero' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='ui' width='416' height='416'></canvas>
+    <canvas class='gameCanvas' id='data' width='416' height='416'>此浏览器不支持HTML5</canvas>
+</div>
+<script id='mainScript' src='main.js'></script>
+<script>
+main.init('editor');
+//main.init('replay');
+main.listen();
+
+var replayActions = function(){
+    //core.onclick(7,7,[]);
+}
+
+var replay = function(){
+    core.events.startGame('');
+    //setTimeout(function(){Array.from(Array(200)).forEach(function(){core.onclick(7,7,[]);});console.log(1);},1000);//关开场剧情
+    //setTimeout(function(){try {Array.from(Array(200)).forEach(function(){core.drawText();})} catch (error){}},3000);//关firstArrive
+    //console.log(1);
+    
+}
+
+var afterInit = function(){
+    main.editor.drawMapBg();
+    main.editor.updateMap();
+}
+var start = function(){
+    var hard = 'Hard';
+    core.resetStatus(core.firstData.hero, hard, core.firstData.floorId, core.initStatus.maps);
+    core.changeFloor(core.status.floorId, null, core.firstData.hero.loc, null, function() {
+        /* core.setHeroMoveTriggerInterval(); */
+        //afterInit();
+    });
+    core.events.setInitData(hard);
+}
+setTimeout(start, 300);
+//setTimeout(replay, 300);
+</script>
+</body>
+</html>
\ No newline at end of file