Merge remote-tracking branch 'origin/master' into LouDi_Pig

Assets/Scripts/Controller/StateMachineController.cs

@@ -37,7 +37,7 @@ public class StateMachineController : MonoSingleton<StateMachineController>
 
     private void OnStart(OnModuleStart start)
     {
-        foreach (var item in Global.Instance.appData.Modules[0].FSM)
+        foreach (var item in Global.Instance.curModule.FSM)
         {
             FSM<string> fsm = new FSM<string>();
             var fsmInfo = new FsmInfo();

Doc/Xml配置文档.xml

@@ -183,6 +183,10 @@
 							<Action type="NextOperation"></Action>
 						</Action>
 					</Start>
+					<Finished>
+						<Action type="Sequence">
+						</Action>
+					</Finished>
 				</Step>
 			</Step>
 		</Operation>