更新

editor/excel.js

@@ -9,22 +9,29 @@ console.log(process.cwd());
 let excelArray = [
     {
         fullPath: "excel/全局表.xls",
-        isUse: true,
         name: "全局表.xls",
         sheet: "all",
     },
     {
         fullPath: "excel/关卡.xls",
-        isUse: true,
         name: "关卡.xls",
-        sheet: "smallLevel",
+        sheet: "smalllevel",
     },
     {
         fullPath: "excel/关卡.xls",
-        isUse: true,
         name: "关卡.xls",
         sheet: "nest",
-    }
+    },
+    {
+        fullPath: "excel/关卡.xls",
+        name: "关卡.xls",
+        sheet: "monster",
+    },
+    {
+        fullPath: "excel/关卡.xls",
+        name: "关卡.xls",
+        sheet: "bullet",
+    },
 ];
 
 jsonSavePath = path.join(cwd, 'web-desktop/json');
@@ -75,7 +82,7 @@ function _getJsonSaveData(excelData, itemSheet) {
             // } else if (lineData.length > title.length) {
             //     continue;
             // }
-            if(!lineData) continue;
+            if(!lineData || lineData.length == 0) continue;
             let saveLineData = {};
             for (let j = 1; j < title.length; j++) {
                 let key = title[j];
@@ -100,35 +107,31 @@ function _addLog(str){
 let jsonAllSaveData = {};// 保存的json数据
 for (let k in excelArray) {
     let itemSheet = excelArray[k];
-    if (itemSheet.isUse) {
-        let excelData = nodeXlsx.parse(itemSheet.fullPath);
-        let sheetData = null;
-        for (let j in excelData) {
-            if (excelData[j].name === itemSheet.sheet) {
-                sheetData = excelData[j].data;
-            }
+    let excelData = nodeXlsx.parse(itemSheet.fullPath);
+    let sheetData = null;
+    for (let j in excelData) {
+        if (excelData[j].name === itemSheet.sheet) {
+            sheetData = excelData[j].data;
         }
-        if (sheetData) {
-            if (sheetData.length > 2) {
-                // 保存为json
-                let jsonSaveData = _getJsonSaveData(sheetData, itemSheet);
-                {
-                    let saveStr = JSON.stringify(jsonSaveData);
+    }
+    if (sheetData) {
+        if (sheetData.length > 2) {
+            // 保存为json
+            let jsonSaveData = _getJsonSaveData(sheetData, itemSheet);
+            {
+                let saveStr = JSON.stringify(jsonSaveData);
 
-                    saveStr = jsonBeautifully(saveStr);
-                    
-                    let saveFileFullPath = path.join(jsonSavePath, itemSheet.sheet + ".json");
-                    fs.writeFileSync(saveFileFullPath, saveStr);
-                    _addLog("[Json]:" + saveFileFullPath);
-                }
-            } else {
-                _addLog("行数低于2行,无效sheet:" + itemSheet.sheet);
+                saveStr = jsonBeautifully(saveStr);
+                
+                let saveFileFullPath = path.join(jsonSavePath, itemSheet.sheet + ".json");
+                fs.writeFileSync(saveFileFullPath, saveStr);
+                _addLog("[Json]:" + saveFileFullPath);
             }
         } else {
-            _addLog("未发现数据");
+            _addLog("行数低于2行,无效sheet:" + itemSheet.sheet);
         }
-
     } else {
-        console.log("忽略配置: " + itemSheet.fullPath + ' - ' + itemSheet.sheet);
+        _addLog("未发现数据");
     }
+
 }

editor/web-desktop/assets/main/config.json

@@ -1 +1 @@
-{"paths":{},"types":[],"uuids":["2dL3kvpAxJu6GJ7RdqJG5J","02ikbUVLhF5aC6uHYyXO+R","0esnrmFttLGJzWSORxZgzM","16sjMSMzpKF5ztK5GpUBeN","3bOY1sdwVMMKx+tYSx5Uuj","3cdqXpOV5Px54AKarEXkwL","451EKaUppISYxb44sUugTV","4eg1Jst2lOG7h3yr/3Mm6f","53mk0B05JOzp0kCpYTtNgT","53xgDko8VDW7lLzqikLQAl","5dklvalvhJy7+hntRe0FtI","8aquZm1cNM7qvNYF0xYpeM","9dekChD6hC05XtZe1B8Bpv","c3HBV2+rBE9r4wQa2oCV2G","c4cWmT2s9DnqtTiqT0Y3KJ","d14pVyW0BGS4MQUEJz7gRO","d2H8t9UXJAzo6OVTLa4jxv","e7pN+DQ+tN15NHpUArfjP4","ecpdLyjvZBwrvm+cedCcQy","f1d5omTlZMtqnrEDYyNZuM","f4YhLmjb9CJp+zmZlC6ad8","fd5mHVP81AuIOkEItJTBCu","fe9wQ4jFJEu6Go8eHiIoko"],"scenes":{"db://assets/Scene/aniScene.fire":15,"db://assets/Scene/game.fire":0,"db://assets/Scene/pathtest.fire":13,"db://assets/Scene/test.fire":9},"redirect":[1,0,2,0,5,0,10,0,18,1,19,0,21,0,22,0],"deps":["resources","internal"],"packs":{"025a2aed5":[3,0,6,7,8,11,16,17,20],"05fa6546c":[12,14]},"name":"main","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":false}
+{"paths":{},"types":[],"uuids":["2dL3kvpAxJu6GJ7RdqJG5J","02ikbUVLhF5aC6uHYyXO+R","0esnrmFttLGJzWSORxZgzM","16sjMSMzpKF5ztK5GpUBeN","3bOY1sdwVMMKx+tYSx5Uuj","3cdqXpOV5Px54AKarEXkwL","451EKaUppISYxb44sUugTV","53mk0B05JOzp0kCpYTtNgT","53xgDko8VDW7lLzqikLQAl","5dklvalvhJy7+hntRe0FtI","9dekChD6hC05XtZe1B8Bpv","c3HBV2+rBE9r4wQa2oCV2G","d14pVyW0BGS4MQUEJz7gRO","d2H8t9UXJAzo6OVTLa4jxv","e7pN+DQ+tN15NHpUArfjP4","ecpdLyjvZBwrvm+cedCcQy","f1d5omTlZMtqnrEDYyNZuM","fd5mHVP81AuIOkEItJTBCu","fe9wQ4jFJEu6Go8eHiIoko"],"scenes":{"db://assets/Scene/aniScene.fire":12,"db://assets/Scene/game.fire":0,"db://assets/Scene/pathtest.fire":11,"db://assets/Scene/test.fire":8},"redirect":[1,0,2,0,5,0,9,0,15,1,16,0,17,0,18,0],"deps":["resources","internal"],"packs":{"04e87cdb0":[3,0,6,7,13,14]},"name":"main","importBase":"import","nativeBase":"native","debug":false,"isZip":false,"encrypted":false}

editor/web-desktop/assets/main/import/05/05fa6546c.json

@@ -1 +0,0 @@
-{"type":"cc.Texture2D","data":"1,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1"}

editor/web-desktop/assets/main/import/53/53c600e4-a3c5-435b-b94b-cea8a42d0025.json

@@ -1 +1 @@
-[1,0,["node","scene","_parent"],[["cc.Node",["_name","_id","_components","_contentSize","_children","_trs","_parent"],1,9,5,2,7,1],["cc.SceneAsset",["_name","asyncLoadAssets"],1],["cc.Scene",["_name","_children","_anchorPoint","_trs"],2,2,5,7],["cc.Camera",["_clearFlags","_depth","node"],1,1],["cc.Canvas",["node"],3,1],["cc.Widget",["_alignFlags","node"],2,1],["c8ad6fhb1BESYIiTZAAD3ne",["node"],3,1]],[[1,0,1,3],[2,0,1,2,3,2],[0,0,1,4,2,3,5,3],[0,0,6,2,3,2],[3,0,1,2,3],[4,0,1],[5,0,1,2],[6,0,1]],[[0,"test",null],[2,"test","a5esZu+45LA5mBpvttspPD",[-4],[[5,-1],[6,45,-2],[7,-3]],[5,960,640],[480,320,0,0,0,0,1,1,1,1]],[1,"New Node",[1],[0,0,0],[0,0,0,0,0,0,1,1,1,1]],[3,"Main Camera",1,[[4,7,-1,-5]],[5,960,640]]],0,[0,0,1,0,0,1,0,0,1,0,-1,3,0,0,3,0,1,2,1,2,2,5],[],[],[]]
+[1,0,["node","$ui_node","$layer_node","scene","_parent"],[["cc.Node",["_name","_id","_components","_contentSize","_parent","_children","_trs"],1,9,5,1,2,7],["cc.SceneAsset",["_name","asyncLoadAssets"],1],["cc.Scene",["_name","_children","_anchorPoint","_trs"],2,2,5,7],["cc.Camera",["_clearFlags","_depth","node"],1,1],["cc.Canvas",["_fitWidth","_fitHeight","node","_designResolution"],1,1,5],["cc.Widget",["_alignFlags","node"],2,1],["c8ad6fhb1BESYIiTZAAD3ne",["node","$layer_node","$ui_node"],3,1,1,1]],[[0,0,4,2],[1,0,1,3],[2,0,1,2,3,2],[0,0,1,5,2,3,6,3],[0,0,4,2,3,2],[3,0,1,2,3],[4,0,1,2,3,3],[5,0,1,2],[6,0,1,2,1]],[[1,"test",null],[3,"test","a5esZu+45LA5mBpvttspPD",[-6,-7,-8],[[6,true,false,-1,[5,640,1136]],[7,45,-2],[8,-5,-4,-3]],[5,640,1136],[320,568,0,0,0,0,1,1,1,1]],[2,"New Node",[1],[0,0,0],[0,0,0,0,0,0,1,1,1,1]],[4,"Main Camera",1,[[5,7,-1,-9]],[5,960,640]],[0,"$layer_node",1],[0,"$ui_node",1]],0,[0,0,1,0,0,1,0,1,5,0,2,4,0,0,1,0,-1,3,0,-2,4,0,-3,5,0,0,3,0,3,2,1,4,2,9],[],[],[]]

editor/web-desktop/assets/main/import/9d/9d7a40a1-0fa8-42d3-95ed-65ed41f01a6f.json

@@ -0,0 +1 @@
+[1,0,0,["cc.Texture2D"],0,["1,9729,9729,33071,33071,0,0,1",-1],[0],0,[],[],[]]

editor/web-desktop/assets/resources/import/02/028a46d4-54b8-45e5-a0ba-b876325cef91.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy","0esnrmFttLGJzWSORxZgzM"],["node","_spriteFrame","root","data"],[["cc.Node",["_name","_objFlags","_components","_prefab","_contentSize","_children","_parent"],1,9,4,5,2,1],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["37e54QPZ2pBMr/zg2i7rOZu",["node"],3,1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["43ca4XWdF1CwJKowXL8JAQ/",["_collide_shape","collide_group_id","node","_polygon_points"],1,1,12],["cc.PolygonCollider",["_enabled","node","points"],2,1,12]],[[2,0,2],[0,0,5,2,3,4,2],[0,0,1,6,2,3,4,3],[3,0,1,2,1],[4,0,1],[1,0,1,2,2],[1,1,2,1],[5,0,1],[6,0,1,2,3,3],[7,0,1,2,2]],[[0,"monster"],[1,"monster",[-5],[[7,-2],[8,3,4,-3,[[[0,-25,-27],[0,25,-27],[0,25,27],[0,-25,27]],8,8,8,8]],[9,false,-4,[[[0,-25,-27],[0,25,-27],[0,25,27],[0,-25,27]],8,8,8,8]]],[6,-1,0],[5,50,53]],[2,"m2",512,1,[[3,-6,[0],1],[4,-7]],[5,"c9cSlCP85DH6RiPv9OMVIj",1,0],[5,50,53]]],0,[0,2,1,0,0,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,3,1,7],[0,0],[-1,1],[0,1]]
+[1,["ecpdLyjvZBwrvm+cedCcQy","0esnrmFttLGJzWSORxZgzM"],["node","_spriteFrame","root","data"],[["cc.Node",["_name","_objFlags","_components","_prefab","_contentSize","_children","_parent"],1,9,4,5,2,1],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["37e54QPZ2pBMr/zg2i7rOZu",["node"],3,1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["43ca4XWdF1CwJKowXL8JAQ/",["_collide_shape","collide_group_id","node","_polygon_points"],1,1,12],["cc.PolygonCollider",["_enabled","node","points"],2,1,12],["04ca8qenmhF+JPBued9pzXQ",["node"],3,1]],[[2,0,2],[0,0,5,2,3,4,2],[0,0,1,6,2,3,4,3],[3,0,1,2,1],[4,0,1],[1,0,1,2,2],[1,1,2,1],[5,0,1],[6,0,1,2,3,3],[7,0,1,2,2],[8,0,1]],[[0,"monster"],[1,"monster",[-6],[[7,-2],[8,3,4,-3,[[[0,-25,-27],[0,25,-27],[0,25,27],[0,-25,27]],8,8,8,8]],[9,false,-4,[[[0,-25,-27],[0,25,-27],[0,25,27],[0,-25,27]],8,8,8,8]],[10,-5]],[6,-1,0],[5,50,53]],[2,"m2",512,1,[[3,-7,[0],1],[4,-8]],[5,"c9cSlCP85DH6RiPv9OMVIj",1,0],[5,50,53]]],0,[0,2,1,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,3,1,8],[0,0],[-1,1],[0,1]]

editor/web-desktop/assets/resources/import/0e/0e1f11c7e.json → editor/web-desktop/assets/resources/import/02/02c6c9fda.json

@@ -1 +1 @@
-{"type":"cc.Texture2D","data":"0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1"}
+{"type":"cc.Texture2D","data":"0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1|0,9729,9729,33071,33071,0,0,1"}

editor/web-desktop/assets/resources/import/08/08f3a35c4.json

@@ -0,0 +1 @@
+[1,["aewcOk9ClIS7kGIFyy0q0G","ecpdLyjvZBwrvm+cedCcQy"],["node","root","$text_lb","data","_defaultClip"],[["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.AnimationClip",["_name","_duration","curveData"],1,11],["cc.Prefab",["_name"],2],["cc.Node",["_name","_children","_components","_prefab"],2,2,9,4],["cc.Node",["_name","_parent","_components","_prefab","_color","_contentSize"],2,1,12,4,5,5],["64b06xC6XVD6K6kbelO+Pgb",["node","$text_lb"],3,1,1],["cc.Animation",["playOnLoad","node","_clips","_defaultClip"],2,1,3,6],["cc.Label",["_string","_styleFlags","_N$horizontalAlign","_N$verticalAlign","_N$cacheMode","node","_materials"],-2,1,3]],[[1,0,1,2,3],[2,0,2],[3,0,1,2,3,2],[4,0,1,2,3,4,5,2],[5,0,1,1],[0,1,2,1],[0,0,1,2,2],[6,0,1,2,3,2],[7,0,1,2,3,4,5,6,6]],[[[[0,"harmAni",0.5,[{},"props",11,[{"position":[{"frame":0,"value":[0,0,0]},{"frame":0.16666666666666666,"value":[0,26,0]},{"frame":0.3333333333333333,"value":[0,0,0]}],"opacity":[{"frame":0,"value":255},{"frame":0.3333333333333333,"value":255},{"frame":0.5,"value":0}]},"scale",12,[[[{"frame":0},"value",8,[1,0,0,1]],[{"frame":0.3333333333333333},"value",8,[1,1,1,1]]],11,11]]]]],0,0,[],[],[]],[[[1,"harmNum"],[2,"harmNum",[-4],[[4,-3,-2]],[5,-1,0]],[3,"$text_lb",1,[[-5,[7,true,-6,[2],1]],1,4],[6,"f2t8sa3aFIs4pmb5DJJHBM",1,0],[4,4281874644],[5,66.75,40]],[8,"100",1,1,1,2,2,[0]]],0,[0,1,1,0,2,3,0,0,1,0,-1,2,0,-1,3,0,0,2,0,3,1,6],[0,0,0],[-1,4,-1],[1,0,0]]]]

editor/web-desktop/assets/resources/import/0a/0ab28d55b.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","e7q6FL+VZEgLJUjVeDLic/","56fc2Ai/RFNYpaMT8crweK"],["node","root","data","_spriteFrame","_textureSetter"],[["cc.Node",["_name","_components","_prefab","_contentSize","_children","_parent","_color"],2,9,4,5,2,1,5],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],"cc.SpriteFrame",["cc.Prefab",["_name","optimizationPolicy"],1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["32c5dQ4eHhH/p3yLOlKlGki",["collide_group_id","node","_size","_polygon_points"],2,1,5,12],["cc.Sprite",["_sizeMode","node","_materials","_spriteFrame"],2,1,3,6]],[[3,0,1,3],[0,0,4,1,2,3,2],[0,0,5,1,2,6,3,2],[4,0,1],[5,0,1,2,3,2],[1,1,2,1],[1,0,1,2,2],[6,0,1,2,3,2]],[[[[0,"monsterBullet",2],[1,"monsterBullet",[-4],[[3,-2],[4,5,-3,[5,5,5],[[[0,-45,-45],[0,45,-45],[0,60,40],[0,0,70],[0,-60,40]],8,8,8,8,8]]],[5,-1,0],[5,10,10]],[2,"New Sprite",1,[[7,0,-5,[0],1]],[6,"05mdVSrXZN46inx8U48lHd",1,0],[4,4278190335],[5,10,10]]],0,[0,1,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,2,1,5],[0,0],[-1,3],[0,1]],[[{"name":"default_radio_button_off","rect":[3,3,26,26],"offset":[0,0],"originalSize":[32,32],"capInsets":[0,0,0,0]}],[2],0,[0],[4],[2]]]]

editor/web-desktop/assets/resources/import/1f/1f94d866-76bd-47cd-a38b-72bc7cb8f19c.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"smallLevel",{"1":{"nest":"4;5"},"2":{"nest":"1;2"},"3":{"nest":"6;7"},"4":{"nest":"8;9"},"5":{"nest":10}}]],0,0,[],[],[]]

editor/web-desktop/assets/resources/import/44/4495443e-c939-4875-bfff-b7527e007920.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"all",{"1":{"name":"体力上限","value":""},"2":{"name":"自然恢复1体力需要多少秒","value":""},"3":{"name":"表示玩家关卡内战机升级所需经验值","value":""},"4":{"name":"表示玩家关卡内母舰升级所需经验值","value":""},"5":{"name":"玩家战机在战场的初始位置","value":""},"6":{"name":"战机的移动速度，像素/帧","value":""},"7":{"name":"初级母舰道具奖励的ID+美术资源ID+奖励经验","value":""},"8":{"name":"中级母舰道具奖励的ID+美术资源ID+奖励经验","value":""},"9":{"name":"超级母舰道具奖励的ID+美术资源ID+奖励经验","value":""},"10":{"name":"玩家初始战机ID，对应战机表","value":""},"11":{"name":"设置为200，除以100意为爆伤结果是2倍普通伤害值","value":""},"12":{"name":"关卡内道具掉落后下坠速度，像素/帧","value":""},"13":{"name":"boss出场玩家锁血时间，除100，S","value":""},"14":{"name":"boss死亡场面冻结时间，除100，S","value":""}}]],0,0,[],[],[]]

editor/web-desktop/assets/resources/import/48/48813cb2-378b-46fd-b86c-07633635b095.json

@@ -0,0 +1 @@
+[1,["02ikbUVLhF5aC6uHYyXO+R"],["root","asset","data"],[["cc.Node",["_name","_objFlags","_prefab","_parent","_children","_trs"],1,4,1,2,7],["cc.Prefab",["_name"],2],["cc.PrefabInfo",["fileId","sync","root","asset"],1,1,6],["cc.PrefabInfo",["root","asset"],3,1,1]],[[2,0,1,2,3,3],[1,0,2],[0,0,1,4,2,3],[0,0,3,2,2],[0,0,3,2,5,2],[3,0,1,1]],[[1,"pattern202"],[2,"pattern2",512,[-2,-3],[5,-1,0]],[3,"monster",1,[0,"56nHSGvT9OSqCtbtW0qxRE",true,-4,0]],[4,"monster",1,[0,"3eW7b71odDWZrZ5Drq/V0Q",true,-5,1],[-58,65,0,0,0,0,1,1,1,1]]],0,[0,0,1,0,-1,2,0,-2,3,0,0,2,0,0,3,0,2,1,5],[0,0],[1,1],[0,0]]

editor/web-desktop/assets/resources/import/62/62f99c06-a1d6-4983-b8d7-0f847f26edb4.json

@@ -0,0 +1 @@
+[1,["02ikbUVLhF5aC6uHYyXO+R"],["root","asset","data"],[["cc.Node",["_name","_objFlags","_prefab","_parent","_children","_trs"],1,4,1,2,7],["cc.Prefab",["_name"],2],["cc.PrefabInfo",["fileId","sync","root","asset"],1,1,6],["cc.PrefabInfo",["root","asset"],3,1,1]],[[2,0,1,2,3,3],[1,0,2],[0,0,1,4,2,3],[0,0,3,2,2],[0,0,3,2,5,2],[3,0,1,1]],[[1,"pattern201"],[2,"pattern201",512,[-2,-3],[5,-1,0]],[3,"monster",1,[0,"56nHSGvT9OSqCtbtW0qxRE",true,-4,0]],[4,"monster",1,[0,"3eW7b71odDWZrZ5Drq/V0Q",true,-5,1],[58,65,0,0,0,0,1,1,1,1]]],0,[0,0,1,0,-1,2,0,-2,3,0,0,2,0,0,3,0,2,1,5],[0,0],[1,1],[0,0]]

editor/web-desktop/assets/resources/import/cc/cc39b835-e004-4191-a305-c42a972d5c4a.json

@@ -1 +0,0 @@
-[1,0,0,[["cc.JsonAsset",["_name","json"],1]],[[0,0,1,3]],[[0,"nest",{"1":{"pos":"160;0","type":1,"num":1,"time":1,"delay":0,"pattern":2},"2":{"pos":"480;0","type":1,"num":1,"time":0,"delay":0,"pattern":2},"3":{"pos":"320;0","type":1,"num":1,"time":0,"delay":0,"pattern":1},"4":{"pos":"160;0","type":2,"num":1,"time":0,"delay":0,"pattern":3},"5":{"pos":"480;0","type":2,"num":1,"time":0,"delay":0,"pattern":3},"6":{"pos":"0;200","type":3,"num":4,"time":0.2,"delay":0,"pattern":1},"7":{"pos":"640;200","type":4,"num":4,"time":0.2,"delay":0,"pattern":1},"8":{"pos":"-50;900","type":5,"num":4,"time":0.2,"delay":0,"pattern":1},"9":{"pos":"690;900","type":6,"num":4,"time":0.2,"delay":0,"pattern":1},"10":{"pos":"320;0","type":7,"num":1,"time":0,"delay":0,"pattern":4}}]],0,0,[],[],[]]

editor/web-desktop/assets/resources/import/cf/cf363edf-a19e-4d39-8dfd-26d970dfb58a.json

@@ -1 +1 @@
-[1,["ecpdLyjvZBwrvm+cedCcQy","0esnrmFttLGJzWSORxZgzM"],["node","_spriteFrame","root","data"],[["cc.Node",["_name","_objFlags","_components","_prefab","_contentSize","_children","_parent","_trs"],1,9,4,5,2,1,7],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["37e54QPZ2pBMr/zg2i7rOZu",["node"],3,1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["43ca4XWdF1CwJKowXL8JAQ/",["_collide_shape","collide_group_id","node","_polygon_points"],1,1,12],["cc.PolygonCollider",["node","points"],3,1,12]],[[2,0,2],[0,0,5,2,3,4,2],[0,0,1,6,2,3,4,7,3],[3,0,1,2,1],[4,0,1],[1,0,1,2,2],[1,1,2,1],[5,0,1],[6,0,1,2,3,3],[7,0,1,1]],[[0,"monsterboss"],[1,"monsterboss",[-5],[[7,-2],[8,3,4,-3,[[[0,-1.7,-46.8],[0,73.1,0.1],[0,90.7,49.7],[0,-89.8,50.1],[0,-77.4,1.5]],8,8,8,8,8]],[9,-4,[[[0,-1.7,-46.8],[0,73.1,0.1],[0,90.7,49.7],[0,-89.8,50.1],[0,-77.4,1.5]],8,8,8,8,8]]],[6,-1,0],[5,50,53]],[2,"m2",512,1,[[3,-6,[0],1],[4,-7]],[5,"c9cSlCP85DH6RiPv9OMVIj",1,0],[5,50,53],[0,0,0,0,0,0,1,4,2,1]]],0,[0,2,1,0,0,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,3,1,7],[0,0],[-1,1],[0,1]]
+[1,["ecpdLyjvZBwrvm+cedCcQy","0esnrmFttLGJzWSORxZgzM"],["node","_spriteFrame","root","data"],[["cc.Node",["_name","_objFlags","_components","_prefab","_contentSize","_children","_parent","_trs"],1,9,4,5,2,1,7],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["37e54QPZ2pBMr/zg2i7rOZu",["node"],3,1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["43ca4XWdF1CwJKowXL8JAQ/",["_collide_shape","collide_group_id","node","_polygon_points"],1,1,12],["cc.PolygonCollider",["node","points"],3,1,12],["04ca8qenmhF+JPBued9pzXQ",["node"],3,1]],[[2,0,2],[0,0,5,2,3,4,2],[0,0,1,6,2,3,4,7,3],[3,0,1,2,1],[4,0,1],[1,0,1,2,2],[1,1,2,1],[5,0,1],[6,0,1,2,3,3],[7,0,1,1],[8,0,1]],[[0,"monsterboss"],[1,"monsterboss",[-6],[[7,-2],[8,3,4,-3,[[[0,-1.7,-46.8],[0,73.1,0.1],[0,90.7,49.7],[0,-89.8,50.1],[0,-77.4,1.5]],8,8,8,8,8]],[9,-4,[[[0,-1.7,-46.8],[0,73.1,0.1],[0,90.7,49.7],[0,-89.8,50.1],[0,-77.4,1.5]],8,8,8,8,8]],[10,-5]],[6,-1,0],[5,50,53]],[2,"m2",512,1,[[3,-7,[0],1],[4,-8]],[5,"c9cSlCP85DH6RiPv9OMVIj",1,0],[5,50,53],[0,0,0,0,0,0,1,4,2,1]]],0,[0,2,1,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,3,1,8],[0,0],[-1,1],[0,1]]

editor/web-desktop/assets/resources/import/fa/fab12e25-4f7c-4cc7-b7a2-ca5f4c6a0478.json

@@ -0,0 +1 @@
+[1,["ecpdLyjvZBwrvm+cedCcQy","0esnrmFttLGJzWSORxZgzM"],["node","_spriteFrame","root","data"],[["cc.Node",["_name","_objFlags","_components","_prefab","_contentSize","_children","_parent","_trs"],1,9,4,5,2,1,7],["cc.PrefabInfo",["fileId","root","asset"],2,1,1],["cc.Prefab",["_name"],2],["cc.Sprite",["node","_materials","_spriteFrame"],3,1,3,6],["37e54QPZ2pBMr/zg2i7rOZu",["node"],3,1],["3491dCwpnhFEqX9BL4D2ZCF",["node"],3,1],["43ca4XWdF1CwJKowXL8JAQ/",["_collide_shape","collide_group_id","node","_polygon_points"],1,1,12],["cc.PolygonCollider",["node","points"],3,1,12],["04ca8qenmhF+JPBued9pzXQ",["node"],3,1]],[[2,0,2],[0,0,5,2,3,4,2],[0,0,1,6,2,3,4,7,3],[3,0,1,2,1],[4,0,1],[1,0,1,2,2],[1,1,2,1],[5,0,1],[6,0,1,2,3,3],[7,0,1,1],[8,0,1]],[[0,"monsterboss2"],[1,"monsterboss",[-6],[[7,-2],[8,3,4,-3,[[[0,-1.7,-35.2],[0,55.4,1.2],[0,72.7,40.4],[0,-73.2,40.1],[0,-56.3,1.2]],8,8,8,8,8]],[9,-4,[[[0,-1.7,-35.2],[0,55.4,1.2],[0,72.7,40.4],[0,-73.2,40.1],[0,-56.3,1.2]],8,8,8,8,8]],[10,-5]],[6,-1,0],[5,50,53]],[2,"m2",512,1,[[3,-7,[0],1],[4,-8]],[5,"c9cSlCP85DH6RiPv9OMVIj",1,0],[5,50,53],[0,0,0,0,0,0,1,3,1.5,1]]],0,[0,2,1,0,0,1,0,0,1,0,0,1,0,0,1,0,-1,2,0,0,2,0,0,2,0,3,1,8],[0,0],[-1,1],[0,1]]

editor/web-desktop/json/bullet.json

@@ -0,0 +1,56 @@
+{
+    "1001":{
+        "travel":1,
+        "param":"[0;0;0]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":5
+    },
+    "2001":{
+        "travel":2,
+        "param":"[0;90;3]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":5
+    },
+    "2002":{
+        "travel":2,
+        "param":"[0;120;7]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":2
+    },
+    "2003":{
+        "travel":2,
+        "param":"[0;360;12]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":1
+    },
+    "3001":{
+        "travel":3,
+        "param":"[0;30;8]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":2
+    },
+    "4001":{
+        "travel":4,
+        "param":"[0;60;2003]",
+        "speed":500,
+        "end":"[2;300]",
+        "volume":5,
+        "effect1":10,
+        "cd":1
+    }
+}

editor/web-desktop/json/monster.json

@@ -0,0 +1,14 @@
+{
+    "1001":{
+        "atk":"[100;10]",
+        "hp":"[100;10]"
+    },
+    "2001":{
+        "atk":"[150;15]",
+        "hp":"[150;15]"
+    },
+    "3001":{
+        "atk":"[200;20]",
+        "hp":"[200;20]"
+    }
+}

editor/web-desktop/json/nest.json

@@ -1,250 +1,262 @@
 {
-    "1":{
-        "pos":"160;0",
+    "101":{
+        "pos":"[160;0]",
         "type":1,
-        "num":1,
-        "time":1,
-        "delay":0,
-        "pattern":2
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "2":{
-        "pos":"480;0",
+    "102":{
+        "pos":"[320;0]",
         "type":1,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":2
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "3":{
-        "pos":"320;0",
+    "103":{
+        "pos":"[480;0]",
         "type":1,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":1
-    },
-    "4":{
-        "pos":"160;0",
-        "type":2,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":3
-    },
-    "5":{
-        "pos":"480;0",
-        "type":2,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":3
-    },
-    "6":{
-        "pos":"0;200",
-        "type":3,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "7":{
-        "pos":"640;200",
-        "type":4,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
-    },
-    "8":{
-        "pos":"-50;900",
+    "104":{
+        "pos":"[-50;900]",
         "type":5,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+        "shape":201,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[2;1001;0]]",
+        "time":20,
+        "num":3
     },
-    "9":{
-        "pos":"690;900",
+    "105":{
+        "pos":"[690;900]",
         "type":6,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+        "shape":202,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[2;1001;0]]",
+        "time":20,
+        "num":3
     },
-    "10":{
-        "pos":"320;0",
-        "type":7,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":4
+    "106":{
+        "pos":"[160;0]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
+        "time":20,
+        "num":3
     },
-    "11":{
-        "pos":"0;100",
-        "type":8,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "107":{
+        "pos":"[320;-50]",
+        "type":1,
+        "shape":102,
+        "atktiming":"",
+        "pattern":"[[1;2001]]",
+        "bullet":"[[1;2002]]",
+        "time":20,
+        "num":3
     },
-    "12":{
-        "pos":"640;100",
-        "type":9,
-        "num":4,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "108":{
+        "pos":"[480;0]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
+        "time":20,
+        "num":3
+    },
+    "109":{
+        "pos":"[0;300]",
+        "type":11,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "13":{
-        "pos":"160;0",
-        "type":10,
-        "num":1,
+    "110":{
+        "pos":"[320;0]",
+        "type":7,
+        "shape":103,
+        "atktiming":"",
+        "pattern":"[[1;3001]]",
+        "bullet":"[[1;3001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "14":{
-        "pos":"320;-100",
-        "type":10,
-        "num":1,
+    "111":{
+        "pos":"[160;0]",
+        "type":13,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":4
     },
-    "15":{
-        "pos":"480;0",
-        "type":10,
-        "num":1,
+    "112":{
+        "pos":"[480;0]",
+        "type":14,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":4
     },
-    "16":{
-        "pos":"0;300",
-        "type":11,
-        "num":4,
+    "113":{
+        "pos":"[0;200]",
+        "type":3,
+        "shape":201,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[2;1001;0]]",
         "time":0.2,
-        "delay":0,
-        "pattern":1
+        "num":4
     },
-    "17":{
-        "pos":"640;300",
-        "type":12,
-        "num":4,
+    "114":{
+        "pos":"[640;200]",
+        "type":4,
+        "shape":202,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[2;1001;0]]",
         "time":0.2,
-        "delay":0,
-        "pattern":1
+        "num":4
     },
-    "18":{
-        "pos":"60;0",
-        "type":13,
-        "num":8,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "115":{
+        "pos":"[160;0]",
+        "type":2,
+        "shape":102,
+        "atktiming":"",
+        "pattern":"[[1;2001]]",
+        "bullet":"[[1;2001;0;3001;2]]",
+        "time":1,
+        "num":1
     },
-    "19":{
-        "pos":"260;0",
-        "type":14,
-        "num":8,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "116":{
+        "pos":"[480;0]",
+        "type":2,
+        "shape":102,
+        "atktiming":"",
+        "pattern":"[[1;2001]]",
+        "bullet":"[[1;2001;0;3001;2]]",
+        "time":1,
+        "num":1
     },
-    "20":{
-        "pos":"380;0",
-        "type":13,
-        "num":8,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "117":{
+        "pos":"[0;200]",
+        "type":8,
+        "shape":201,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "21":{
-        "pos":"580;0",
-        "type":14,
-        "num":8,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
+    "118":{
+        "pos":"[640;200]",
+        "type":9,
+        "shape":202,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[]]",
+        "time":20,
+        "num":3
     },
-    "22":{
-        "pos":"160;0",
+    "119":{
+        "pos":"[160;0]",
         "type":15,
-        "num":8,
-        "time":0.2,
-        "delay":0,
-        "pattern":1
-    },
-    "23":{
-        "pos":"60;0",
-        "type":16,
-        "num":1,
+        "shape":201,
+        "atktiming":"",
+        "pattern":"[[2;1001]]",
+        "bullet":"[[]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":4
     },
-    "24":{
-        "pos":"160;-50",
-        "type":16,
-        "num":1,
-        "time":0,
-        "delay":0,
-        "pattern":1
-    },
-    "25":{
-        "pos":"260;-100",
-        "type":16,
-        "num":1,
+    "120":{
+        "pos":"[80;0]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "26":{
-        "pos":"380;-100",
-        "type":16,
-        "num":1,
+    "121":{
+        "pos":"[160;-50]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "27":{
-        "pos":"480;-50",
-        "type":16,
-        "num":1,
+    "122":{
+        "pos":"[480;-50]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "28":{
-        "pos":"580;0",
-        "type":16,
-        "num":1,
+    "123":{
+        "pos":"[540;0]",
+        "type":1,
+        "shape":101,
+        "atktiming":"",
+        "pattern":"[[1;1001]]",
+        "bullet":"[[1;1001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "29":{
-        "pos":"320;0",
+    "124":{
+        "pos":"[320;0]",
         "type":16,
-        "num":1,
+        "shape":103,
+        "atktiming":"",
+        "pattern":"[[1;3001]]",
+        "bullet":"[[1;4001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "30":{
-        "pos":"320;0",
+    "125":{
+        "pos":"[320;0]",
         "type":17,
-        "num":1,
+        "shape":102,
+        "atktiming":"",
+        "pattern":"[[1;2001]]",
+        "bullet":"[[1;2001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     },
-    "31":{
-        "pos":"320;0",
+    "126":{
+        "pos":"[320;0]",
         "type":18,
-        "num":1,
+        "shape":102,
+        "atktiming":"",
+        "pattern":"[[1;2001]]",
+        "bullet":"[[1;2001]]",
         "time":0,
-        "delay":0,
-        "pattern":1
+        "num":1
     }
 }

editor/web-desktop/json/smallLevel.json

@@ -1,38 +1,41 @@
 {
     "1":{
-        "nest":"4;5"
+        "nest1":"[[101;1][102;1][103;1]]",
+        "interval2":"[5;99]",
+        "nest2":"[[104;2][105;2]]",
+        "interval3":"[5;99]",
+        "nest3":"[[106;3][107;3][108;3]]",
+        "interval4":"[5;99]",
+        "nest4":"",
+        "interval5":"[5;99]",
+        "nest5":"",
+        "interval6":"",
+        "nest6":""
     },
     "2":{
-        "nest":"1;2"
+        "nest1":"[[109;2]]",
+        "interval2":"[2;99]",
+        "nest2":"[[110;2]]",
+        "interval3":"[5;99]",
+        "nest3":"[[111;3][112;3]]",
+        "interval4":"[5;99]",
+        "nest4":"[[113;4][114;4]]",
+        "interval5":"[3;99]",
+        "nest5":"[[115;5][116;5]]",
+        "interval6":"",
+        "nest6":""
     },
     "3":{
-        "nest":"6;7"
-    },
-    "4":{
-        "nest":"8;9"
-    },
-    "5":{
-        "nest":10
-    },
-    "6":{
-        "nest":"11;12"
-    },
-    "7":{
-        "nest":"13;14;15"
-    },
-    "8":{
-        "nest":"16;17"
-    },
-    "9":{
-        "nest":"18;19;20;21"
-    },
-    "10":{
-        "nest":22
-    },
-    "11":{
-        "nest":"23;24;25;26;27;28"
-    },
-    "12":{
-        "nest":"29;30;31"
+        "nest1":"[[117;3]]",
+        "interval2":"[2;99]",
+        "nest2":"[[118;3]]",
+        "interval3":"[3;99]",
+        "nest3":"[[119;4]]",
+        "interval4":"[5;99]",
+        "nest4":"[[120;4][121;4][122;4][123;4]]",
+        "interval5":"[5;99]",
+        "nest5":"[[124;5]]",
+        "interval6":"[3;99]",
+        "nest6":"[[125;4][126;4]]"
     }
 }