Merge branch 'master' into SaipoVersion

This commit is contained in:
SAIPO 2021-07-26 02:57:28 +08:00
commit d6b78ec9d1
5 changed files with 6088 additions and 745 deletions

File diff suppressed because it is too large Load Diff

View File

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

File diff suppressed because it is too large Load Diff

View File

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

View File

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