From 78c7a17509b8c628c078c77e179188707365d065 Mon Sep 17 00:00:00 2001
From: Roman <1325980292@qq.com>
Date: Wed, 7 Jul 2021 00:33:07 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=88=91=E4=BF=AE=E6=94=B9=E4=BA=86Fungus?=
=?UTF-8?q?=E5=86=85=E9=83=A8=E8=84=9A=E6=9C=AC=EF=BC=8C=E4=BD=BF=E5=BE=97?=
=?UTF-8?q?=E6=B8=B8=E6=88=8F=E5=8F=AF=E4=BB=A5=E7=9B=91=E5=90=AC=E6=89=8B?=
=?UTF-8?q?=E6=9F=84=E6=8C=89=E9=94=AEA=E6=88=96=E8=80=85=E9=94=AE?=
=?UTF-8?q?=E7=9B=98J=E9=94=AE=E6=9D=A5=E7=BB=8F=E8=A1=8C=E4=B8=8B?=
=?UTF-8?q?=E4=B8=80=E5=8F=A5=E3=80=82=202.=E6=88=91=E5=8F=91=E7=8E=B0?=
=?UTF-8?q?=E4=BA=86Fungus=E7=9A=84=E5=A4=96=E9=83=A8=E6=8E=A5=E5=85=A5?=
=?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=8C=E4=BD=BF=E5=BE=97=E6=88=91=E5=8F=AF?=
=?UTF-8?q?=E4=BB=A5=E8=87=AA=E5=AE=9A=E4=B9=89=E5=AF=B9=E8=AF=9D=E7=BB=93?=
=?UTF-8?q?=E6=9D=9F=E5=90=8E=E7=9A=84=E6=93=8D=E4=BD=9C=E3=80=82=E4=BD=8D?=
=?UTF-8?q?=E7=BD=AE=E5=9C=A8Block=E5=86=85=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Fungus/Fungus.asmdef | 8 +-
.../Fungus-PlayMaker.unitypackage.meta | 7 +
.../Spine/Fungus-Spine.unitypackage.meta | 7 +
Assets/Fungus/NewAssemblyReference.asmref | 3 +
.../Fungus/NewAssemblyReference.asmref.meta | 7 +
.../Fungus/Scripts/Components/DialogInput.cs | 27 +-
Assets/Fungus/Scripts/Components/SayDialog.cs | 2 +
Assets/Scenes/序章-回忆.unity | 927 +++++++++++++++++-
Assets/Scripts/NormalInvestableItems.cs | 1 -
Logs/ApiUpdaterCheck.txt | 240 +++++
ProjectSettings/InputManager.asset | 32 +
11 files changed, 1244 insertions(+), 17 deletions(-)
create mode 100644 Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
create mode 100644 Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
create mode 100644 Assets/Fungus/NewAssemblyReference.asmref
create mode 100644 Assets/Fungus/NewAssemblyReference.asmref.meta
diff --git a/Assets/Fungus/Fungus.asmdef b/Assets/Fungus/Fungus.asmdef
index 3c6ad2a..e5da2ae 100644
--- a/Assets/Fungus/Fungus.asmdef
+++ b/Assets/Fungus/Fungus.asmdef
@@ -1,9 +1,10 @@
{
"name": "Fungus",
+ "rootNamespace": "",
"references": [
- "GUID:6055be8ebefd69e48b49212b09b47b2f"
+ "GUID:6055be8ebefd69e48b49212b09b47b2f",
+ "GUID:75469ad4d38634e559750d17036d5f7c"
],
- "optionalUnityReferences": [],
"includePlatforms": [],
"excludePlatforms": [],
"allowUnsafeCode": false,
@@ -11,5 +12,6 @@
"precompiledReferences": [],
"autoReferenced": true,
"defineConstraints": [],
- "versionDefines": []
+ "versionDefines": [],
+ "noEngineReferences": false
}
\ No newline at end of file
diff --git a/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
new file mode 100644
index 0000000..e474937
--- /dev/null
+++ b/Assets/Fungus/Integrations/Playmaker/Fungus-PlayMaker.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 81dbcde0f90df4e9ba9ca2794490e57a
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
new file mode 100644
index 0000000..eebd079
--- /dev/null
+++ b/Assets/Fungus/Integrations/Spine/Fungus-Spine.unitypackage.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd02c799f3f5c4c83b2fc26c105a3821
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Fungus/NewAssemblyReference.asmref b/Assets/Fungus/NewAssemblyReference.asmref
new file mode 100644
index 0000000..558f5d4
--- /dev/null
+++ b/Assets/Fungus/NewAssemblyReference.asmref
@@ -0,0 +1,3 @@
+{
+ "reference": "GUID:75469ad4d38634e559750d17036d5f7c"
+}
\ No newline at end of file
diff --git a/Assets/Fungus/NewAssemblyReference.asmref.meta b/Assets/Fungus/NewAssemblyReference.asmref.meta
new file mode 100644
index 0000000..91cea33
--- /dev/null
+++ b/Assets/Fungus/NewAssemblyReference.asmref.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8d7727f59cbba0c4aa01dac243acd821
+AssemblyDefinitionReferenceImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Fungus/Scripts/Components/DialogInput.cs b/Assets/Fungus/Scripts/Components/DialogInput.cs
index 9d7090f..0589fa5 100644
--- a/Assets/Fungus/Scripts/Components/DialogInput.cs
+++ b/Assets/Fungus/Scripts/Components/DialogInput.cs
@@ -3,6 +3,9 @@
using UnityEngine;
using UnityEngine.EventSystems;
+//我加的，引入新的输入系统，来监听下一步的指令
+using UnityEngine.InputSystem;
+//
namespace Fungus
{
@@ -18,7 +21,10 @@ namespace Fungus
/// Click anywhere on Say Dialog to advance.
ClickOnDialog,
/// Click on continue button to advance.
- ClickOnButton
+ ClickOnButton,
+ ClikeAsMyself
+ /// 我自己设计的点击模式，用来响应键盘按键和鼠标
+
}
///
@@ -47,12 +53,15 @@ namespace Fungus
protected StandaloneInputModule currentStandaloneInputModule;
protected Writer writer;
+ private Gamepad gamepad;
+
protected virtual void Awake()
{
writer = GetComponent();
CheckEventSystem();
+ gamepad = Gamepad.current;
}
// There must be an Event System in the scene for Say and Menu input to work.
@@ -112,6 +121,22 @@ namespace Fungus
dialogClickedFlag = false;
}
break;
+ case ClickMode.ClikeAsMyself:
+ if(gamepad!=null)
+ {
+ if(gamepad.aButton.wasPressedThisFrame || Input.GetKeyDown(KeyCode.J))
+ {
+ SetNextLineFlag();
+ }
+ }
+ else
+ {
+ if(Input.GetKeyDown(KeyCode.J))
+ {
+ SetNextLineFlag();
+ }
+ }
+ break;
}
if (ignoreClickTimer > 0f)
diff --git a/Assets/Fungus/Scripts/Components/SayDialog.cs b/Assets/Fungus/Scripts/Components/SayDialog.cs
index c0a8fc1..8174561 100644
--- a/Assets/Fungus/Scripts/Components/SayDialog.cs
+++ b/Assets/Fungus/Scripts/Components/SayDialog.cs
@@ -109,6 +109,7 @@ namespace Fungus
protected virtual void OnDestroy()
{
activeSayDialogs.Remove(this);
+
}
protected virtual Writer GetWriter()
@@ -534,6 +535,7 @@ namespace Fungus
{
fadeWhenDone = true;
GetWriter().Stop();
+
}
///
diff --git a/Assets/Scenes/序章-回忆.unity b/Assets/Scenes/序章-回忆.unity
index 59d2bf4..7c2e601 100644
--- a/Assets/Scenes/序章-回忆.unity
+++ b/Assets/Scenes/序章-回忆.unity
@@ -282,7 +282,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.61048114, y: 0.20600002}
m_AnchorMax: {x: 0.86200005, y: 0.572}
- m_AnchoredPosition: {x: 2.199997, y: -3.9000092}
+ m_AnchoredPosition: {x: 2.199997, y: -3.899994}
m_SizeDelta: {x: 297, y: 142}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &181444957
@@ -395,6 +395,402 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &439525097
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 439525098}
+ - component: {fileID: 439525101}
+ - component: {fileID: 439525100}
+ - component: {fileID: 439525099}
+ m_Layer: 5
+ m_Name: StoryText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &439525098
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439525097}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 751638228}
+ m_Father: {fileID: 1584681279}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 0.78700006}
+ m_AnchoredPosition: {x: 3, y: 14.130005}
+ m_SizeDelta: {x: -61, y: -63}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &439525099
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439525097}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: 1150
+ m_PreferredHeight: 200
+ m_FlexibleWidth: 1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
+--- !u!114 &439525100
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439525097}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: 79197ecfbc3a4294a89ce589dac02cf2, type: 3}
+ m_FontSize: 45
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 4
+ m_MaxSize: 50
+ m_Alignment: 0
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Story text
+--- !u!222 &439525101
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 439525097}
+ m_CullTransparentMesh: 1
+--- !u!1 &582064874
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 582064884}
+ - component: {fileID: 582064883}
+ - component: {fileID: 582064882}
+ - component: {fileID: 582064881}
+ - component: {fileID: 582064880}
+ - component: {fileID: 582064879}
+ - component: {fileID: 582064878}
+ - component: {fileID: 582064877}
+ - component: {fileID: 582064876}
+ - component: {fileID: 582064875}
+ m_Layer: 5
+ m_Name: "\u5BF9\u8BDD\u6846\u6837\u5F0F"
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 0
+--- !u!82 &582064875
+AudioSource:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ serializedVersion: 4
+ OutputAudioMixerGroup: {fileID: 0}
+ m_audioClip: {fileID: 0}
+ m_PlayOnAwake: 0
+ m_Volume: 1
+ m_Pitch: 1
+ Loop: 0
+ Mute: 0
+ Spatialize: 0
+ SpatializePostEffects: 0
+ Priority: 128
+ DopplerLevel: 1
+ MinDistance: 1
+ MaxDistance: 500
+ Pan2D: 0
+ rolloffMode: 0
+ BypassEffects: 0
+ BypassListenerEffects: 0
+ BypassReverbZones: 0
+ rolloffCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ - serializedVersion: 3
+ time: 1
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ panLevelCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 0
+ spreadCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 0
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 4
+ reverbZoneMixCustomCurve:
+ serializedVersion: 2
+ m_Curve:
+ - serializedVersion: 3
+ time: 0
+ value: 1
+ inSlope: 0
+ outSlope: 0
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0.33333334
+ outWeight: 0.33333334
+ m_PreInfinity: 2
+ m_PostInfinity: 2
+ m_RotationOrder: 0
+--- !u!114 &582064876
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 43b85556abd314f3f870c18c013fdcef, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ clickMode: 4
+ nextClickDelay: 0
+ cancelEnabled: 1
+ ignoreMenuClicks: 1
+--- !u!114 &582064877
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: c4782cf42f2644447b9631f6e522160b, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ volume: 1
+ loop: 1
+ targetAudioSource: {fileID: 0}
+ audioMode: 0
+ beepSounds:
+ - {fileID: 8300000, guid: 774486030b696474e8b3cf7f178123da, type: 3}
+ - {fileID: 8300000, guid: f637c5ce9d10e45c7855ed89bfc6b97e, type: 3}
+ - {fileID: 8300000, guid: c53b7c20372e444c6bd7f2ac0729bbe2, type: 3}
+ soundEffect: {fileID: 0}
+ inputSound: {fileID: 8300000, guid: 14a396b1562834718b2d52b9c4639264, type: 3}
+--- !u!114 &582064878
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: a676940fce6344af1a70043b089a6c14, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ targetTextObject: {fileID: 439525097}
+ punchObject: {fileID: 1584681274}
+ writingSpeed: 60
+ punctuationPause: 0.25
+ hiddenTextColor: {r: 1, g: 1, b: 1, a: 0}
+ writeWholeWords: 0
+ forceRichText: 1
+ instantComplete: 1
+ doReadAheadText: 1
+--- !u!114 &582064879
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3a0bbe22c246e4c78ad8e9816cbae9d5, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ fadeDuration: 0.25
+ continueButton: {fileID: 751638229}
+ dialogCanvas: {fileID: 582064883}
+ nameText: {fileID: 817315568}
+ nameTextGO: {fileID: 0}
+ storyText: {fileID: 439525100}
+ storyTextGO: {fileID: 0}
+ characterImage: {fileID: 1207233240}
+ fitTextWithImage: 1
+ closeOtherDialogs: 0
+--- !u!114 &582064880
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreReversedGraphics: 1
+ m_BlockingObjects: 0
+ m_BlockingMask:
+ serializedVersion: 2
+ m_Bits: 4294967295
+--- !u!225 &582064881
+CanvasGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_Alpha: 1
+ m_Interactable: 1
+ m_BlocksRaycasts: 1
+ m_IgnoreParentGroups: 0
+--- !u!114 &582064882
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 1
+ m_ReferencePixelsPerUnit: 32
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 1600, y: 1200}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 1
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 1
+ m_PresetInfoIsWorld: 0
+--- !u!223 &582064883
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 0
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 1
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 0
+ m_OverridePixelPerfect: 0
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 25
+ m_SortingLayerID: 0
+ m_SortingOrder: 1
+ m_TargetDisplay: 0
+--- !u!224 &582064884
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 582064874}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0, y: 0, z: 0}
+ m_Children:
+ - {fileID: 1584681279}
+ m_Father: {fileID: 0}
+ m_RootOrder: 12
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 0, y: 0}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &644217698
GameObject:
m_ObjectHideFlags: 0
@@ -468,7 +864,8 @@ MonoBehaviour:
height: 859
selectedBlocks:
- {fileID: 644217699}
- selectedCommands: []
+ selectedCommands:
+ - {fileID: 644217702}
variables: []
description:
stepPause: 0
@@ -492,7 +889,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 15
+ m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &644217702
MonoBehaviour:
@@ -520,7 +917,7 @@ MonoBehaviour:
waitForClick: 1
stopVoiceover: 1
waitForVO: 0
- setSayDialog: {fileID: 0}
+ setSayDialog: {fileID: 582064879}
--- !u!114 &644217703
MonoBehaviour:
m_ObjectHideFlags: 2
@@ -659,6 +1056,218 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &751638227
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 751638228}
+ - component: {fileID: 751638231}
+ - component: {fileID: 751638230}
+ - component: {fileID: 751638229}
+ m_Layer: 5
+ m_Name: Continue
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &751638228
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751638227}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 1430432768}
+ m_Father: {fileID: 439525098}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: -38.900024, y: 38.074993}
+ m_SizeDelta: {x: 77.900024, y: 77}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &751638229
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751638227}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Navigation:
+ m_Mode: 3
+ m_WrapAround: 0
+ m_SelectOnUp: {fileID: 0}
+ m_SelectOnDown: {fileID: 0}
+ m_SelectOnLeft: {fileID: 0}
+ m_SelectOnRight: {fileID: 0}
+ m_Transition: 1
+ m_Colors:
+ m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+ m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+ m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+ m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+ m_ColorMultiplier: 1
+ m_FadeDuration: 0.1
+ m_SpriteState:
+ m_HighlightedSprite: {fileID: 0}
+ m_PressedSprite: {fileID: 0}
+ m_SelectedSprite: {fileID: 0}
+ m_DisabledSprite: {fileID: 0}
+ m_AnimationTriggers:
+ m_NormalTrigger: Normal
+ m_HighlightedTrigger: Highlighted
+ m_PressedTrigger: Pressed
+ m_SelectedTrigger: Highlighted
+ m_DisabledTrigger: Disabled
+ m_Interactable: 1
+ m_TargetGraphic: {fileID: 751638230}
+ m_OnClick:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 582064876}
+ m_TargetAssemblyTypeName:
+ m_MethodName: SetButtonClickedFlag
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!114 &751638230
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751638227}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: 226248ac6f184e448af731df91b91958, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 0
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &751638231
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 751638227}
+ m_CullTransparentMesh: 1
+--- !u!1 &817315566
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 817315567}
+ - component: {fileID: 817315569}
+ - component: {fileID: 817315568}
+ m_Layer: 5
+ m_Name: NameText
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &817315567
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 817315566}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1584681279}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 1}
+ m_AnchorMax: {x: 0, y: 1}
+ m_AnchoredPosition: {x: 586.5, y: -38.369995}
+ m_SizeDelta: {x: 1106, y: 71}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &817315568
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 817315566}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.25882354, g: 0.25490198, b: 0.2627451, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 12800000, guid: bb145366ce7024469a5758b08d31802c, type: 3}
+ m_FontSize: 50
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 50
+ m_Alignment: 3
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 1
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text: Character Name
+--- !u!222 &817315569
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 817315566}
+ m_CullTransparentMesh: 1
--- !u!1 &913332108
GameObject:
m_ObjectHideFlags: 0
@@ -908,7 +1517,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 12
+ m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1070038164
GameObject:
@@ -1072,10 +1681,8 @@ MonoBehaviour:
y: -340
width: 1114
height: 859
- selectedBlocks:
- - {fileID: 1132274498}
- selectedCommands:
- - {fileID: 1132274501}
+ selectedBlocks: []
+ selectedCommands: []
variables: []
description:
stepPause: 0
@@ -1099,7 +1706,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 13
+ m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1132274501
MonoBehaviour:
@@ -1127,7 +1734,7 @@ MonoBehaviour:
waitForClick: 1
stopVoiceover: 1
waitForVO: 0
- setSayDialog: {fileID: 0}
+ setSayDialog: {fileID: 582064879}
--- !u!1 &1195339597
GameObject:
m_ObjectHideFlags: 0
@@ -1237,6 +1844,102 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1207233237
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1207233238}
+ - component: {fileID: 1207233241}
+ - component: {fileID: 1207233240}
+ - component: {fileID: 1207233239}
+ m_Layer: 5
+ m_Name: Image
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1207233238
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1207233237}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1584681279}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 1, y: 0}
+ m_AnchorMax: {x: 1, y: 0}
+ m_AnchoredPosition: {x: -178.5, y: 263.13}
+ m_SizeDelta: {x: 357, y: 435}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1207233239
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1207233237}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_IgnoreLayout: 0
+ m_MinWidth: -1
+ m_MinHeight: -1
+ m_PreferredWidth: 350
+ m_PreferredHeight: 350
+ m_FlexibleWidth: -1
+ m_FlexibleHeight: -1
+ m_LayoutPriority: 1
+--- !u!114 &1207233240
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1207233237}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
+ m_Type: 0
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 4
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1207233241
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1207233237}
+ m_CullTransparentMesh: 1
--- !u!1 &1223691861
GameObject:
m_ObjectHideFlags: 0
@@ -1311,6 +2014,85 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1430432767
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1430432768}
+ - component: {fileID: 1430432770}
+ - component: {fileID: 1430432769}
+ m_Layer: 5
+ m_Name: Text
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1430432768
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1430432767}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 751638228}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0, y: 0}
+ m_AnchorMax: {x: 1, y: 1}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1430432769
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1430432767}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_FontData:
+ m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+ m_FontSize: 14
+ m_FontStyle: 0
+ m_BestFit: 0
+ m_MinSize: 10
+ m_MaxSize: 40
+ m_Alignment: 4
+ m_AlignByGeometry: 0
+ m_RichText: 1
+ m_HorizontalOverflow: 0
+ m_VerticalOverflow: 0
+ m_LineSpacing: 1
+ m_Text:
+--- !u!222 &1430432770
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1430432767}
+ m_CullTransparentMesh: 1
--- !u!1 &1463945084
GameObject:
m_ObjectHideFlags: 1
@@ -1353,7 +2135,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 14
+ m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1500782587
GameObject:
@@ -1434,6 +2216,127 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1500782587}
m_CullTransparentMesh: 1
+--- !u!1 &1584681274
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1584681279}
+ - component: {fileID: 1584681278}
+ - component: {fileID: 1584681277}
+ - component: {fileID: 1584681276}
+ - component: {fileID: 1584681275}
+ m_Layer: 5
+ m_Name: Panel
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1584681275
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1584681274}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Delegates:
+ - eventID: 4
+ callback:
+ m_PersistentCalls:
+ m_Calls:
+ - m_Target: {fileID: 582064876}
+ m_TargetAssemblyTypeName:
+ m_MethodName: SetDialogClickedFlag
+ m_Mode: 1
+ m_Arguments:
+ m_ObjectArgument: {fileID: 0}
+ m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+ m_IntArgument: 0
+ m_FloatArgument: 0
+ m_StringArgument:
+ m_BoolArgument: 0
+ m_CallState: 2
+--- !u!225 &1584681276
+CanvasGroup:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1584681274}
+ m_Enabled: 1
+ m_Alpha: 1
+ m_Interactable: 1
+ m_BlocksRaycasts: 1
+ m_IgnoreParentGroups: 0
+--- !u!114 &1584681277
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1584681274}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Material: {fileID: 0}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
+ m_RaycastTarget: 1
+ m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 21300000, guid: e8ab00ef0d9684dcb9deb52811d91218, type: 3}
+ m_Type: 1
+ m_PreserveAspect: 1
+ m_FillCenter: 1
+ m_FillMethod: 0
+ m_FillAmount: 1
+ m_FillClockwise: 1
+ m_FillOrigin: 0
+ m_UseSpriteMesh: 0
+ m_PixelsPerUnitMultiplier: 1
+--- !u!222 &1584681278
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1584681274}
+ m_CullTransparentMesh: 1
+--- !u!224 &1584681279
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1584681274}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children:
+ - {fileID: 817315567}
+ - {fileID: 1207233238}
+ - {fileID: 439525098}
+ m_Father: {fileID: 582064884}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0}
+ m_AnchorMax: {x: 0.5, y: 0}
+ m_AnchoredPosition: {x: -750.0001, y: 0}
+ m_SizeDelta: {x: 1500, y: 335}
+ m_Pivot: {x: 0, y: 0}
--- !u!1 &1647231577
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/NormalInvestableItems.cs b/Assets/Scripts/NormalInvestableItems.cs
index bdfd6d7..4d70302 100644
--- a/Assets/Scripts/NormalInvestableItems.cs
+++ b/Assets/Scripts/NormalInvestableItems.cs
@@ -19,7 +19,6 @@ public class NormalInvestableItems : Interactive
public override void OnCall()
{
-
Debug.Log("我触发了"+ gameObject.name +"的对话");
Flowchart.BroadcastFungusMessage("谈论" + gameObject.name);
}
diff --git a/Logs/ApiUpdaterCheck.txt b/Logs/ApiUpdaterCheck.txt
index affe24c..8665a6e 100644
--- a/Logs/ApiUpdaterCheck.txt
+++ b/Logs/ApiUpdaterCheck.txt
@@ -98,3 +98,243 @@ C# parse time : 206ms
candidates check time : 42ms
console write time : 0ms
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:03:37 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 1595.2895ms
+moved types parse time: 92ms
+candidates parse time : 1ms
+C# parse time : 1210ms
+candidates check time : 88ms
+console write time : 1ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:06:33 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 126.9614ms
+moved types parse time: 82ms
+candidates parse time : 1ms
+C# parse time : 349ms
+candidates check time : 122ms
+console write time : 1ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:09:00 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 111.2154ms
+moved types parse time: 64ms
+candidates parse time : 5ms
+C# parse time : 377ms
+candidates check time : 536ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:09:45 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 130.0922ms
+moved types parse time: 112ms
+candidates parse time : 6ms
+C# parse time : 438ms
+candidates check time : 483ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:10:03 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 133.2705ms
+moved types parse time: 89ms
+candidates parse time : 4ms
+C# parse time : 425ms
+candidates check time : 456ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:10:43 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 103.7187ms
+moved types parse time: 53ms
+candidates parse time : 12ms
+C# parse time : 341ms
+candidates check time : 454ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:11:01 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 107.2887ms
+moved types parse time: 82ms
+candidates parse time : 1ms
+C# parse time : 363ms
+candidates check time : 119ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:13:40 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 101.4857ms
+moved types parse time: 79ms
+candidates parse time : 1ms
+C# parse time : 288ms
+candidates check time : 93ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:19:24 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 118.7093ms
+moved types parse time: 76ms
+candidates parse time : 5ms
+C# parse time : 395ms
+candidates check time : 500ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:19:47 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 177.2368ms
+moved types parse time: 93ms
+candidates parse time : 2ms
+C# parse time : 329ms
+candidates check time : 100ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:20:06 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 140.654ms
+moved types parse time: 110ms
+candidates parse time : 3ms
+C# parse time : 431ms
+candidates check time : 88ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:20:21 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 96.7438ms
+moved types parse time: 67ms
+candidates parse time : 62ms
+C# parse time : 396ms
+candidates check time : 1ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:21:02 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 125.7003ms
+moved types parse time: 64ms
+candidates parse time : 1ms
+C# parse time : 318ms
+candidates check time : 85ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:22:42 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 118.9557ms
+moved types parse time: 110ms
+candidates parse time : 2ms
+C# parse time : 299ms
+candidates check time : 76ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:22:56 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 105.7599ms
+moved types parse time: 90ms
+candidates parse time : 13ms
+C# parse time : 345ms
+candidates check time : 464ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:23:09 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 109.6894ms
+moved types parse time: 70ms
+candidates parse time : 68ms
+C# parse time : 458ms
+candidates check time : 2ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:23:44 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 142.9604ms
+moved types parse time: 83ms
+candidates parse time : 2ms
+C# parse time : 355ms
+candidates check time : 128ms
+console write time : 1ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:33:09 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 118.0162ms
+moved types parse time: 78ms
+candidates parse time : 5ms
+C# parse time : 400ms
+candidates check time : 435ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 10:33:34 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 97.3713ms
+moved types parse time: 70ms
+candidates parse time : 61ms
+C# parse time : 368ms
+candidates check time : 1ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 23:39:59 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 662.182ms
+moved types parse time: 53ms
+candidates parse time : 1ms
+C# parse time : 583ms
+candidates check time : 74ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 23:41:32 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 65.8241ms
+moved types parse time: 47ms
+candidates parse time : 1ms
+C# parse time : 200ms
+candidates check time : 73ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 23:42:27 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 85.7686ms
+moved types parse time: 57ms
+candidates parse time : 1ms
+C# parse time : 231ms
+candidates check time : 73ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 23:42:35 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 75.7995ms
+moved types parse time: 48ms
+candidates parse time : 1ms
+C# parse time : 201ms
+candidates check time : 69ms
+console write time : 0ms
+
+[api-updater (non-obsolete-error-filter)] 2021/7/6 23:43:00 : Starting D:/unity3.7/Unity/Editor/Data/Tools/ScriptUpdater/APIUpdater.NonObsoleteApiUpdaterDetector.exe
+[api-updater (non-obsolete-error-filter)]
+----------------------------------
+jit/startup time : 81.7823ms
+moved types parse time: 49ms
+candidates parse time : 1ms
+C# parse time : 204ms
+candidates check time : 65ms
+console write time : 0ms
+
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
index b16147e..45d6c65 100644
--- a/ProjectSettings/InputManager.asset
+++ b/ProjectSettings/InputManager.asset
@@ -5,6 +5,22 @@ InputManager:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Axes:
+ - serializedVersion: 3
+ m_Name: Skip
+ descriptiveName:
+ descriptiveNegativeName:
+ negativeButton: left
+ positiveButton: right
+ altNegativeButton: a
+ altPositiveButton: d
+ gravity: 3
+ dead: 0.001
+ sensitivity: 3
+ snap: 1
+ invert: 0
+ type: 0
+ axis: 0
+ joyNum: 0
- serializedVersion: 3
m_Name: Horizontal
descriptiveName:
@@ -485,3 +501,19 @@ InputManager:
type: 2
axis: 5
joyNum: 0
+ - serializedVersion: 3
+ m_Name: Debug Horizontal
+ descriptiveName:
+ descriptiveNegativeName:
+ negativeButton: left
+ positiveButton: right
+ altNegativeButton:
+ altPositiveButton:
+ gravity: 1000
+ dead: 0.001
+ sensitivity: 1000
+ snap: 0
+ invert: 0
+ type: 2
+ axis: 5
+ joyNum: 0