Merge branch 'master' into SaipoVersion

Assets/Scenes/各种系统测试与陈列.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: aa6cd6f6d731d1942a81f3d6de0d9fd3
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scripts/Event/WhenFinishFathersCode.cs

@@ -1,7 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
-
+using Fungus;
 public class WhenFinishFathersCode : Event
 {
     // Start is called before the first frame update
@@ -18,6 +18,7 @@ public class WhenFinishFathersCode : Event
 
     public override void OnCall()
     {
-        Debug.Log("打完了，执行下一步的代码请写这里");
+        Flowchart.BroadcastFungusMessage("玩家打完了父亲教的电码");
+        //Debug.Log("打完了，执行下一步的代码请写这里");
     }
 }

UserSettings/EditorUserSettings.asset

@@ -15,11 +15,14 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
+      value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
       flags: 0
     RecentlyUsedScenePath-4:
       value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
       flags: 0
+    RecentlyUsedScenePath-5:
+      value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
+      flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650
       flags: 0