From 2adf9ed5294b409e7d322d8cc03e548077f49f68 Mon Sep 17 00:00:00 2001
From: ckcz123
Date: Sat, 23 May 2020 19:33:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E6=A1=A3=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
_server/MotaActionParser.js | 4 +-
_server/fs.js | 33 +-
_server/fsTest_cs.html | 49 ++-
_server/table/comment.js | 2 +-
main.js | 7 +
migration.html | 587 +++++++++++++++++++++++++++++++++
project/materials/animates.png | Bin 35445 -> 34472 bytes
project/materials/npcs.png | Bin 20746 -> 20724 bytes
server.py | 41 +++
9 files changed, 679 insertions(+), 44 deletions(-)
create mode 100644 migration.html
diff --git a/_server/MotaActionParser.js b/_server/MotaActionParser.js
index 6acd654f..e60d61c7 100644
--- a/_server/MotaActionParser.js
+++ b/_server/MotaActionParser.js
@@ -1256,7 +1256,7 @@ MotaActionFunctions.pattern.replaceStatusList = [
MotaActionFunctions.pattern.replaceItemList = [];
for (var id in core.material.items) {
var name = core.material.items[id].name;
- if (id && name && name != '新物品') {
+ if (id && name && name != '新物品' && /^[a-zA-Z0-9_\u4E00-\u9FCC]+$/.test(name)) {
MotaActionFunctions.pattern.replaceItemList.push([id, name]);
}
}
@@ -1264,7 +1264,7 @@ MotaActionFunctions.pattern.replaceStatusList = [
MotaActionFunctions.pattern.replaceEnemyList = [];
for (var id in core.material.enemys) {
var name = core.material.enemys[id].name;
- if (id && name && name != '新敌人') {
+ if (id && name && name != '新敌人' && /^[a-zA-Z0-9_\u4E00-\u9FCC]+$/.test(name)) {
MotaActionFunctions.pattern.replaceEnemyList.push([id, name]);
}
}
diff --git a/_server/fs.js b/_server/fs.js
index 0ece7748..d0110304 100644
--- a/_server/fs.js
+++ b/_server/fs.js
@@ -56,7 +56,8 @@
callback(null, data);
}
}, function (e) {
- main.log(e);
+ if (window.main != null && main.log) main.log(e);
+ else console.log(e);
callback(e+"：请检查启动服务是否处于正常运行状态。");
}, "text/plain; charset=x-user-defined");
}
@@ -153,15 +154,7 @@
throw 'Type Error in fs.readdir';
var data = '';
data += 'name=' + path;
- postsomething(data, '/makeDir', function (err, data) {
- try {
- data = JSON.parse(data);
- } catch (e) {
- err = "Invalid /makeDir";
- data = null;
- }
- callback(err, data);
- });
+ postsomething(data, '/makeDir', callback);
return;
}
@@ -174,15 +167,7 @@
throw 'Type Error in fs.readdir';
var data = '';
data += 'src=' + src + "&dest=" + dest;
- postsomething(data, '/moveFile', function (err, data) {
- try {
- data = JSON.parse(data);
- } catch (e) {
- err = "Invalid /moveFile";
- data = null;
- }
- callback(err, data);
- });
+ postsomething(data, '/moveFile', callback);
return;
}
@@ -195,15 +180,7 @@
throw 'Type Error in fs.readdir';
var data = '';
data += 'name=' + path;
- postsomething(data, '/deleteFile', function (err, data) {
- try {
- data = JSON.parse(data);
- } catch (e) {
- err = "Invalid /deleteFile";
- data = null;
- }
- callback(err, data);
- });
+ postsomething(data, '/deleteFile', callback);
return;
}
})();
\ No newline at end of file
diff --git a/_server/fsTest_cs.html b/_server/fsTest_cs.html
index 9a392e4a..0da50c14 100644
--- a/_server/fsTest_cs.html
+++ b/_server/fsTest_cs.html
@@ -7,40 +7,63 @@
diff --git a/_server/table/comment.js b/_server/table/comment.js
index 9a88381c..698cf390 100644
--- a/_server/table/comment.js
+++ b/_server/table/comment.js
@@ -335,7 +335,7 @@ var comment_c456ea59_6018_45ef_8bcc_211a24c627dc = {
"_leaf": true,
"_type": "select",
"_select": {
- "values": [1,2,3,4],
+ "values": [null,1,2,3,4],
},
"_docs": "动画帧数",
"_data": "null代表素材默认帧数"
diff --git a/main.js b/main.js
index 7f502e20..57e258ef 100644
--- a/main.js
+++ b/main.js
@@ -197,6 +197,13 @@ main.prototype.init = function (mode, callback) {
main.mode = mode;
main.loadJs('project', main.pureData, function(){
+ if (items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.itemEffect
+ && items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a.itemEffectTip) {
+ alert('即将跳转到接档工具...');
+ window.location = 'migration.html';
+ return;
+ }
+
var mainData = data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d.main;
for(var ii in mainData)main[ii]=mainData[ii];
diff --git a/migration.html b/migration.html
new file mode 100644
index 00000000..7655fda3
--- /dev/null
+++ b/migration.html
@@ -0,0 +1,587 @@
+
+
+