diff --git a/_server/MotaAction.g4 b/_server/MotaAction.g4
index b257861a..5d4ef2a5 100644
--- a/_server/MotaAction.g4
+++ b/_server/MotaAction.g4
@@ -3184,6 +3184,6 @@ this.block('idTemp_e').output='idString_e';
 
 /* Functions
 
-MotaActionParse()
+MotaActionParser()
 
 */
\ No newline at end of file
diff --git a/_server/MotaActionParse.js b/_server/MotaActionParser.js
similarity index 99%
rename from _server/MotaActionParse.js
rename to _server/MotaActionParser.js
index b251288a..9889e46e 100644
--- a/_server/MotaActionParse.js
+++ b/_server/MotaActionParser.js
@@ -1,4 +1,4 @@
-MotaActionParse=function(){
+MotaActionParser=function(){
 function ActionParser(){
 }
 
diff --git a/editor-mobile.html b/editor-mobile.html
index a7ce7570..de06dc87 100644
--- a/editor-mobile.html
+++ b/editor-mobile.html
@@ -614,7 +614,7 @@
 <script src="_server/blockly/blocks_compressed.js"></script>
 <script src="_server/blockly/javascript_compressed.js"></script>
 <script src="_server/blockly/zh-hans.js"></script>
-<script src='_server/MotaActionParse.js'></script>
+<script src='_server/MotaActionParser.js'></script>
 <script src='_server/editor_blocklyconfig.js'></script>
 <script src='_server/editor_blockly.js'></script>
 <!-- codemirror -->
diff --git a/editor.html b/editor.html
index cdaa3916..a03d70db 100644
--- a/editor.html
+++ b/editor.html
@@ -598,7 +598,7 @@
 <script src="_server/blockly/blocks_compressed.js"></script>
 <script src="_server/blockly/javascript_compressed.js"></script>
 <script src="_server/blockly/zh-hans.js"></script>
-<script src='_server/MotaActionParse.js'></script>
+<script src='_server/MotaActionParser.js'></script>
 <script src='_server/editor_blocklyconfig.js'></script>
 <script src='_server/editor_blockly.js'></script>
 <!-- codemirror -->
diff --git a/v2.x-final更新.txt b/v2.x-final更新.txt
index aadfea45..1c49d733 100644
--- a/v2.x-final更新.txt
+++ b/v2.x-final更新.txt
@@ -66,6 +66,7 @@
 （已完成！） 更多的图块blockly化
 （已完成！） 勇士帧动画
 （不处理；现在静止状态可以有帧动画了，所以不考虑行走过程动画） 行走动画
+合并main中一些设置内容
 \t[this], 勇士朝下，flag:arg清理，瞬移扣血
 
 -------------