From ee0b7a2b6b0ac5759f846f1689540a29e8eca426 Mon Sep 17 00:00:00 2001 From: s402520 <sven.gerlach@stud-mail.uni-wuerzburg.de> Date: Thu, 11 May 2023 15:13:37 +0200 Subject: [PATCH] UI Styling --- .../Generated/ArticyEditorSettings.asset | 2 +- .../Generated/Resources/ArticyDatabase.asset | 100 +- .../Generated/Resources/Export package.asset | 930 +++++++++--------- Assets/DialogSystem/Assets/Fonts.meta | 8 + .../Assets/Fonts/DMSans - OFL.txt | 93 ++ .../Assets/Fonts/DMSans - OFL.txt.meta | 7 + .../DialogSystem/Assets/Fonts/DMSans-Bold.ttf | 3 + .../Assets/Fonts/DMSans-Bold.ttf.meta | 21 + .../Assets/Fonts/DMSans-Medium.ttf | 3 + .../Assets/Fonts/DMSans-Medium.ttf.meta | 21 + Assets/DialogSystem/DialogueBox.uss | 71 +- Assets/DialogSystem/DialogueBox.uxml | 8 +- Assets/DialogSystem/DynamicFontResize.cs | 50 +- .../Prefabs/WorldSpaceDialogueBox.prefab | 76 +- Assets/DialogSystem/WorldSpaceDialogueBox.cs | 24 +- Assets/Scenes/ArticyTestScene.unity | 212 ++-- 16 files changed, 872 insertions(+), 757 deletions(-) create mode 100644 Assets/DialogSystem/Assets/Fonts.meta create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt.meta create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf.meta create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf create mode 100644 Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf.meta diff --git a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset index 2b4335c..b6c9f76 100644 --- a/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset +++ b/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset @@ -20,7 +20,7 @@ MonoBehaviour: mLastUsedPackagesHash: 1187110788 mLastUsedPackagesCount: 1 mLastBuildCode: 1 - mLastEditorStartupTimeTicks: 638192984127926069 + mLastEditorStartupTimeTicks: 638193835499770870 mNewVersionAvailable: 0 mLastSelectedCustomGvPath: mLastAttachedFlowPlayerValue: 0 diff --git a/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset b/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset index fe82ba6..4ed2d44 100644 --- a/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset +++ b/Assets/ArticyImporter/Content/Generated/Resources/ArticyDatabase.asset @@ -1,6 +1,52 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-2446674854737357872 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1676762633, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} + m_Name: ArticyDatabase + m_EditorClassIdentifier: + mHierarchy: {fileID: 2403019185819948930} + mLocalization: {fileID: 1105480772320505602} + mInternalProject: + mName: VIA/VR Scenario + mDetailName: + mId: 60d852f6-273d-4a9a-8b83-eef79f8dc671 + mTechnicalName: ViaVr + mImportedAssets: [] + mDefaultGlobalVariables: {fileID: 3353970325780243873} + mScriptFragments: {fileID: 5566347060672431205} + mPackages: + - PackageName: Export package + PackagePath: Export package + mIsDefaultPackage: 1 +--- !u!114 &1105480772320505602 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1174674681, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} + m_Name: LocalizationManager + m_EditorClassIdentifier: + OnLanguageChanged: + m_PersistentCalls: + m_Calls: [] + mUseLocalization: 0 + mLanguage: en + mThrowOnMissingText: 0 + mClearOnLanguageSwitch: 1 + mExportLanguage: en +--- !u!114 &2403019185819948930 MonoBehaviour: m_ObjectHideFlags: 3 m_CorrespondingSourceObject: {fileID: 0} @@ -263,52 +309,6 @@ MonoBehaviour: technicalName: articyType: RuleSetPackage childCount: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1676762633, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} - m_Name: ArticyDatabase - m_EditorClassIdentifier: - mHierarchy: {fileID: -2446674854737357872} - mLocalization: {fileID: 1105480772320505602} - mInternalProject: - mName: VIA/VR Scenario - mDetailName: - mId: 60d852f6-273d-4a9a-8b83-eef79f8dc671 - mTechnicalName: ViaVr - mImportedAssets: [] - mDefaultGlobalVariables: {fileID: 3353970325780243873} - mScriptFragments: {fileID: 5566347060672431205} - mPackages: - - PackageName: Export package - PackagePath: Export package - mIsDefaultPackage: 1 ---- !u!114 &1105480772320505602 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1174674681, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} - m_Name: LocalizationManager - m_EditorClassIdentifier: - OnLanguageChanged: - m_PersistentCalls: - m_Calls: [] - mUseLocalization: 0 - mLanguage: en - mThrowOnMissingText: 0 - mClearOnLanguageSwitch: 1 - mExportLanguage: en --- !u!114 &3353970325780243873 MonoBehaviour: m_ObjectHideFlags: 1 @@ -336,7 +336,11 @@ MonoBehaviour: - '"Hello"' LiveBoolVariableCache: [] LiveIntVariableCache: [] - LiveStringVariableCache: [] + LiveStringVariableCache: + - mFullQualifiedName: Variables.Question + mVar: + values: + - '"Hello"' isInitialized: 1 mVariables: _VariableStorage: {fileID: 3353970325780243873} diff --git a/Assets/ArticyImporter/Content/Generated/Resources/Export package.asset b/Assets/ArticyImporter/Content/Generated/Resources/Export package.asset index d168395..6d5b30c 100644 --- a/Assets/ArticyImporter/Content/Generated/Resources/Export package.asset +++ b/Assets/ArticyImporter/Content/Generated/Resources/Export package.asset @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!114 &-8408071451133169006 +--- !u!114 &-9211456787262620123 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -10,54 +10,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} - m_Name: B - m_EditorClassIdentifier: - id: 72057594037927975 - technicalName: B - parentId: 216172785005863603 - childrenIds: - mAttachments: - listIds: - mDisplayName: B - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: - mExternalId: B - mPosition: {x: 40, y: 40} - mZIndex: 2 - mSize: {x: 256, y: 196} - mPreviewImage: - mViewBoxX: 0 - mViewBoxY: 0 - mViewBoxWidth: 0 - mViewBoxHeight: 0 - mMode: 0 - mAsset: - objectRef: 0 - mShortId: 3013704420 ---- !u!114 &-7895705735676228707 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} - m_Name: Player + m_Name: A m_EditorClassIdentifier: - id: 72057594037927967 - technicalName: Player + id: 72057594037927971 + technicalName: A parentId: 216172785005863603 childrenIds: mAttachments: listIds: - mDisplayName: Player + mDisplayName: A mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} mText: - mExternalId: Player - mPosition: {x: 0, y: 0} - mZIndex: 0 + mExternalId: A + mPosition: {x: 20, y: 20} + mZIndex: 1 mSize: {x: 256, y: 196} mPreviewImage: mViewBoxX: 0 @@ -67,8 +33,8 @@ MonoBehaviour: mMode: 0 mAsset: objectRef: 0 - mShortId: 175041976 ---- !u!114 &-7806537544110019237 + mShortId: 2716827231 +--- !u!114 &-9040021552149171303 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -78,56 +44,51 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_CBE66EE6 + m_Name: DFr_A4971ED0 m_EditorClassIdentifier: - id: 72057594037928069 - technicalName: DFr_CBE66EE6 + id: 72057594037928076 + technicalName: DFr_A4971ED0 parentId: 72057594037927985 childrenIds: mMenuText: mStageDirections: mSpeaker: - objectRef: 72057594037928004 + objectRef: 0 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>Glad to be of service!</align> + mText: <align=left>End of Dialogue 2B.</align> mExternalId: - mPosition: {x: 550, y: 250} - mZIndex: 2 + mPosition: {x: 825, y: 250} + mZIndex: 4 mSize: {x: 225, y: 200} - mShortId: 3420876518 + mShortId: 2761367248 mInputPins: value: - - id: 72057594037928072 + - id: 72057594037928079 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928069 + mOwner: 72057594037928076 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928073 + - id: 72057594037928080 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928069 + mOwner: 72057594037928076 mConnections: - value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928079 - mTarget: - objectRef: 72057594037928076 + value: [] mOwnerInstanceId: 0 ---- !u!114 &-6429902785242276685 +--- !u!114 &-7283410416943534047 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -136,32 +97,63 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} - m_Name: C + m_Script: {fileID: 11500000, guid: 8ce712e14bc19a3499e0a3bf6d62505e, type: 3} + m_Name: Hub_B7DF6639 m_EditorClassIdentifier: - id: 72057594037928004 - technicalName: C - parentId: 216172785005863603 + id: 72057594037928008 + technicalName: Hub_B7DF6639 + parentId: 72057594037927979 childrenIds: - mAttachments: - listIds: - mDisplayName: C + mDisplayName: Question mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} mText: - mExternalId: C - mPosition: {x: 60, y: 60} - mZIndex: 3 - mSize: {x: 256, y: 196} - mPreviewImage: - mViewBoxX: 0 - mViewBoxY: 0 - mViewBoxWidth: 0 - mViewBoxHeight: 0 - mMode: 0 - mAsset: - objectRef: 0 - mShortId: 2652349448 ---- !u!114 &-6379587372251393562 + mExternalId: + mPosition: {x: 780, y: 288} + mZIndex: 1 + mSize: {x: 175, y: 50} + mShortId: 3084871225 + mInputPins: + value: + - id: 72057594037928010 + mText: + value: + handlerId: 0 + ownerId: 0 + ownerInstanceId: 0 + mRawScript: + mOwner: 72057594037928008 + mConnections: + value: [] + mOwnerInstanceId: 0 + mOutputPins: + value: + - id: 72057594037928011 + mText: + value: + handlerId: 0 + ownerId: 0 + ownerInstanceId: 0 + mRawScript: + mOwner: 72057594037928008 + mConnections: + value: + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928017 + mTarget: + objectRef: 72057594037928014 + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928037 + mTarget: + objectRef: 72057594037928034 + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928046 + mTarget: + objectRef: 72057594037928043 + mOwnerInstanceId: 0 +--- !u!114 &-6515073885961461753 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -171,56 +163,121 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_4571D1A3 + m_Name: DFr_63715C29 m_EditorClassIdentifier: - id: 72057594037928049 - technicalName: DFr_4571D1A3 - parentId: 72057594037927979 + id: 72057594037928089 + technicalName: DFr_63715C29 + parentId: 72057594037927991 childrenIds: - mMenuText: + mMenuText: Very Long Text mStageDirections: mSpeaker: - objectRef: 0 + objectRef: 72057594037927971 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>It seems the dialogue will progress now!</align> + mText: <align=left>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin + vehicula euismod magna eu fringilla. Aliquam erat volutpat. In hac habitasse + platea dictumst. Cras ornare sagittis euismod. Praesent bibendum, arcu id maximus + bibendum, diam augue tempor est, vitae feugiat lacus magna id diam. Praesent + mollis nisl fringilla nisl efficitur, ac aliquam libero pharetra. Morbi interdum, + turpis ut cursus dictum, erat purus bibendum nisl, ut ullamcorper nibh est in + massa. Praesent at volutpat erat. Sed in magna nec ante hendrerit pellentesque + a sit amet diam. Aliquam quis dui mattis, vulputate est id, feugiat sem. Nam + egestas tortor sit amet libero consectetur ultrices. Donec auctor vulputate erat, + vel blandit tortor bibendum in. Suspendisse eget diam aliquet, convallis turpis + vitae, vehicula nunc. </align> mExternalId: - mPosition: {x: 1305, y: 438} - mZIndex: 14 + mPosition: {x: 825, y: 75} + mZIndex: 1 mSize: {x: 225, y: 200} - mShortId: 1165087139 + mShortId: 1668373545 mInputPins: value: - - id: 72057594037928052 + - id: 72057594037928092 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928049 + mOwner: 72057594037928089 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928053 + - id: 72057594037928093 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928049 + mOwner: 72057594037928089 mConnections: + value: [] + mOwnerInstanceId: 0 +--- !u!114 &-6259340720367854113 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb9db56664043274faaedc1ca183be51, type: 3} + m_Name: Test_Dialogue_1 + m_EditorClassIdentifier: + id: 72057594037927991 + technicalName: Test_Dialogue_1 + parentId: 216172783251375095 + childrenIds: 93000000000000019900000000000001a100000000000001 + mAttachments: + listIds: + mDisplayName: Test Dialogue 1 + mPreviewImage: + mViewBoxX: 0 + mViewBoxY: 0 + mViewBoxWidth: 0 + mViewBoxHeight: 0 + mMode: 0 + mAsset: + objectRef: 0 + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mText: + mExternalId: Test_Dialogue_1 + mPosition: {x: 142, y: -125} + mZIndex: 2 + mSize: {x: 291, y: 200} + mShortId: 4039136308 + mInputPins: + value: + - id: 72057594037927994 + mText: value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037927983 - mTarget: - objectRef: 72057594037927979 + handlerId: 0 + ownerId: 0 + ownerInstanceId: 0 + mRawScript: + mOwner: 72057594037927991 + mConnections: + value: [] mOwnerInstanceId: 0 ---- !u!114 &-5629561470709052251 + mOutputPins: + value: + - id: 72057594037927995 + mText: + value: + handlerId: 0 + ownerId: 0 + ownerInstanceId: 0 + mRawScript: + mOwner: 72057594037927991 + mConnections: + value: [] + mOwnerInstanceId: 0 +--- !u!114 &-5929369741636471934 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -230,56 +287,51 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_8AF42064 + m_Name: DFr_64FEE19A m_EditorClassIdentifier: - id: 72057594037928062 - technicalName: DFr_8AF42064 - parentId: 72057594037927985 + id: 72057594037928097 + technicalName: DFr_64FEE19A + parentId: 72057594037927991 childrenIds: - mMenuText: + mMenuText: Articy Text Size mStageDirections: mSpeaker: - objectRef: 72057594037927967 + objectRef: 72057594037927971 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>It looks like it worked, we're in another Dialogue now!</align> + mText: <align=left><size=48>BIG TEXT</size></align> mExternalId: - mPosition: {x: 250, y: 250} - mZIndex: 0 + mPosition: {x: 825, y: 300} + mZIndex: 3 mSize: {x: 225, y: 200} - mShortId: 2331254884 + mShortId: 1694425498 mInputPins: value: - - id: 72057594037928065 + - id: 72057594037928100 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928062 + mOwner: 72057594037928097 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928066 + - id: 72057594037928101 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928062 + mOwner: 72057594037928097 mConnections: - value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928072 - mTarget: - objectRef: 72057594037928069 + value: [] mOwnerInstanceId: 0 ---- !u!114 &-4383463745616434708 +--- !u!114 &-5541628335310337015 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -288,63 +340,57 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8ce712e14bc19a3499e0a3bf6d62505e, type: 3} - m_Name: Hub_B7DF6639 + m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} + m_Name: DFr_3EA4BB16 m_EditorClassIdentifier: - id: 72057594037928008 - technicalName: Hub_B7DF6639 + id: 72057594037928019 + technicalName: DFr_3EA4BB16 parentId: 72057594037927979 childrenIds: - mDisplayName: Question + mMenuText: + mStageDirections: + mSpeaker: + objectRef: 72057594037927967 + mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: + mText: <align=left>Doesn't seem like this will help me much.</align> mExternalId: - mPosition: {x: 780, y: 288} - mZIndex: 1 - mSize: {x: 175, y: 50} - mShortId: 3084871225 + mPosition: {x: 1305, y: -12} + mZIndex: 4 + mSize: {x: 225, y: 200} + mShortId: 1050983190 mInputPins: value: - - id: 72057594037928010 + - id: 72057594037928022 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928008 + mOwner: 72057594037928019 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928011 + - id: 72057594037928023 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037928008 - mConnections: - value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928017 - mTarget: - objectRef: 72057594037928014 - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928037 - mTarget: - objectRef: 72057594037928034 + mRawScript: + mOwner: 72057594037928019 + mConnections: + value: - mLabel: mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928046 + mTargetPin: 72057594037928031 mTarget: - objectRef: 72057594037928043 + objectRef: 72057594037928028 mOwnerInstanceId: 0 ---- !u!114 &-3953964669691512456 +--- !u!114 &-2148130611092147602 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -354,11 +400,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_3EA4BB16 + m_Name: DFr_8AF42064 m_EditorClassIdentifier: - id: 72057594037928019 - technicalName: DFr_3EA4BB16 - parentId: 72057594037927979 + id: 72057594037928062 + technicalName: DFr_8AF42064 + parentId: 72057594037927985 childrenIds: mMenuText: mStageDirections: @@ -366,44 +412,44 @@ MonoBehaviour: objectRef: 72057594037927967 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>Doesn't seem like this will help me much.</align> + mText: <align=left>It looks like it worked, we're in another Dialogue now!</align> mExternalId: - mPosition: {x: 1305, y: -12} - mZIndex: 4 + mPosition: {x: 250, y: 250} + mZIndex: 0 mSize: {x: 225, y: 200} - mShortId: 1050983190 + mShortId: 2331254884 mInputPins: value: - - id: 72057594037928022 + - id: 72057594037928065 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928019 + mOwner: 72057594037928062 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928023 + - id: 72057594037928066 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928019 + mOwner: 72057594037928062 mConnections: value: - mLabel: mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928031 + mTargetPin: 72057594037928072 mTarget: - objectRef: 72057594037928028 + objectRef: 72057594037928069 mOwnerInstanceId: 0 ---- !u!114 &-3114189771664413848 +--- !u!114 &-885294191974141179 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -412,16 +458,22 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb9db56664043274faaedc1ca183be51, type: 3} - m_Name: Test_Dialogue_2B + m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} + m_Name: Player m_EditorClassIdentifier: - id: 72057594037927985 - technicalName: Test_Dialogue_2B - parentId: 216172783251375095 - childrenIds: 7e0000000000000185000000000000018c00000000000001 + id: 72057594037927967 + technicalName: Player + parentId: 216172785005863603 + childrenIds: mAttachments: listIds: - mDisplayName: Test Dialogue 2B + mDisplayName: Player + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mText: + mExternalId: Player + mPosition: {x: 0, y: 0} + mZIndex: 0 + mSize: {x: 256, y: 196} mPreviewImage: mViewBoxX: 0 mViewBoxY: 0 @@ -430,45 +482,108 @@ MonoBehaviour: mMode: 0 mAsset: objectRef: 0 + mShortId: 175041976 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1919818469, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} + m_Name: Export package + m_EditorClassIdentifier: + mPackagePath: Assets/ArticyImporter/Content/Generated/Resources/Export package.asset + mResourceKey: Export package + mObjects: + - {fileID: 5467178082492303595} + - {fileID: 8821181649832289490} + - {fileID: -6259340720367854113} + - {fileID: 5102987013987721400} + - {fileID: 7759647580587107025} + - {fileID: 8712918096250232734} + - {fileID: 9099626386819701350} + - {fileID: 6148875378096264054} + - {fileID: -5541628335310337015} + - {fileID: -2148130611092147602} + - {fileID: 7662234743112829318} + - {fileID: -9040021552149171303} + - {fileID: 3103133801661906815} + - {fileID: -6515073885961461753} + - {fileID: -5929369741636471934} + - {fileID: -7283410416943534047} + - {fileID: 6772007591463273585} + - {fileID: -885294191974141179} + - {fileID: -9211456787262620123} + - {fileID: 8124090866306921086} + - {fileID: 4661344065307302726} +--- !u!114 &3103133801661906815 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} + m_Name: DFr_873D91B3 + m_EditorClassIdentifier: + id: 72057594037928083 + technicalName: DFr_873D91B3 + parentId: 72057594037927991 + childrenIds: + mMenuText: + mStageDirections: + mSpeaker: + objectRef: 72057594037927967 + mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: - mExternalId: Test_Dialogue_2B - mPosition: {x: 492, y: 125} - mZIndex: 1 - mSize: {x: 291, y: 200} - mShortId: 2853363502 + mText: <align=left>Let's see what I can do here.</align> + mExternalId: + mPosition: {x: 500, y: 175} + mZIndex: 0 + mSize: {x: 225, y: 200} + mShortId: 2268959155 mInputPins: value: - - id: 72057594037927988 + - id: 72057594037928086 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037927985 + mOwner: 72057594037928083 mConnections: - value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928065 - mTarget: - objectRef: 72057594037928062 + value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037927989 + - id: 72057594037928087 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037927985 + mOwner: 72057594037928083 mConnections: - value: [] + value: + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928092 + mTarget: + objectRef: 72057594037928089 + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928100 + mTarget: + objectRef: 72057594037928097 mOwnerInstanceId: 0 ---- !u!114 &-1407058162593544110 +--- !u!114 &4661344065307302726 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -478,20 +593,20 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} - m_Name: A + m_Name: C m_EditorClassIdentifier: - id: 72057594037927971 - technicalName: A + id: 72057594037928004 + technicalName: C parentId: 216172785005863603 childrenIds: mAttachments: listIds: - mDisplayName: A + mDisplayName: C mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} mText: - mExternalId: A - mPosition: {x: 20, y: 20} - mZIndex: 1 + mExternalId: C + mPosition: {x: 60, y: 60} + mZIndex: 3 mSize: {x: 256, y: 196} mPreviewImage: mViewBoxX: 0 @@ -501,8 +616,8 @@ MonoBehaviour: mMode: 0 mAsset: objectRef: 0 - mShortId: 2716827231 ---- !u!114 &-1363841360700020824 + mShortId: 2652349448 +--- !u!114 &5102987013987721400 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -512,97 +627,58 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_63715C29 + m_Name: DFr_97DB3541 m_EditorClassIdentifier: - id: 72057594037928089 - technicalName: DFr_63715C29 - parentId: 72057594037927991 + id: 72057594037927998 + technicalName: DFr_97DB3541 + parentId: 72057594037927979 childrenIds: - mMenuText: Very Long Text + mMenuText: mStageDirections: mSpeaker: - objectRef: 72057594037927971 + objectRef: 72057594037927967 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin - vehicula euismod magna eu fringilla. Aliquam erat volutpat. In hac habitasse - platea dictumst. Cras ornare sagittis euismod. Praesent bibendum, arcu id maximus - bibendum, diam augue tempor est, vitae feugiat lacus magna id diam. Praesent - mollis nisl fringilla nisl efficitur, ac aliquam libero pharetra. Morbi interdum, - turpis ut cursus dictum, erat purus bibendum nisl, ut ullamcorper nibh est in - massa. Praesent at volutpat erat. Sed in magna nec ante hendrerit pellentesque - a sit amet diam. Aliquam quis dui mattis, vulputate est id, feugiat sem. Nam - egestas tortor sit amet libero consectetur ultrices. Donec auctor vulputate erat, - vel blandit tortor bibendum in. Suspendisse eget diam aliquet, convallis turpis - vitae, vehicula nunc. </align> + mText: '<align=left>Who should I talk to next?</align> + + <align=left></align>' mExternalId: - mPosition: {x: 825, y: 75} - mZIndex: 1 + mPosition: {x: 505, y: 213} + mZIndex: 0 mSize: {x: 225, y: 200} - mShortId: 1668373545 + mShortId: 2547725633 mInputPins: value: - - id: 72057594037928092 + - id: 72057594037928001 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928089 + mOwner: 72057594037927998 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928093 + - id: 72057594037928002 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928089 + mOwner: 72057594037927998 mConnections: - value: [] + value: + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928010 + mTarget: + objectRef: 72057594037928008 mOwnerInstanceId: 0 ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1919818469, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} - m_Name: Export package - m_EditorClassIdentifier: - mPackagePath: Assets/ArticyImporter/Content/Generated/Resources/Export package.asset - mResourceKey: Export package - mObjects: - - {fileID: 818456735064926546} - - {fileID: -3114189771664413848} - - {fileID: 7645369798938058327} - - {fileID: 6114087834507308343} - - {fileID: 6024911366825835934} - - {fileID: 6599617053359543113} - - {fileID: -6379587372251393562} - - {fileID: 4269438869683065384} - - {fileID: -3953964669691512456} - - {fileID: -5629561470709052251} - - {fileID: -7806537544110019237} - - {fileID: 8882108068160863296} - - {fileID: 4839268166673173920} - - {fileID: -1363841360700020824} - - {fileID: 6823856074164693532} - - {fileID: -4383463745616434708} - - {fileID: 7657973058742682766} - - {fileID: -7895705735676228707} - - {fileID: -1407058162593544110} - - {fileID: -8408071451133169006} - - {fileID: -6429902785242276685} ---- !u!114 &818456735064926546 +--- !u!114 &5467178082492303595 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -672,7 +748,7 @@ MonoBehaviour: mTarget: objectRef: 72057594037927985 mOwnerInstanceId: 0 ---- !u!114 &4269438869683065384 +--- !u!114 &6148875378096264054 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -733,7 +809,48 @@ MonoBehaviour: mTarget: objectRef: 72057594037928019 mOwnerInstanceId: 0 ---- !u!114 &4839268166673173920 +--- !u!114 &6772007591463273585 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3ad395af99773ad499c59793fea5e554, type: 3} + m_Name: Jmp_070767CE + m_EditorClassIdentifier: + id: 72057594037928028 + technicalName: Jmp_070767CE + parentId: 72057594037927979 + childrenIds: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mText: + mExternalId: + mPosition: {x: 1580, y: 13} + mZIndex: 7 + mSize: {x: 175, y: 150} + mShortId: 117925838 + mTarget: + objectRef: 72057594037928008 + mTargetPin: 72057594037928010 + mInputPins: + value: + - id: 72057594037928031 + mText: + value: + handlerId: 0 + ownerId: 0 + ownerInstanceId: 0 + mRawScript: + mOwner: 72057594037928028 + mConnections: + value: [] + mOwnerInstanceId: 0 + mOutputPins: + value: [] +--- !u!114 &7662234743112829318 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -743,61 +860,56 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_873D91B3 + m_Name: DFr_CBE66EE6 m_EditorClassIdentifier: - id: 72057594037928083 - technicalName: DFr_873D91B3 - parentId: 72057594037927991 + id: 72057594037928069 + technicalName: DFr_CBE66EE6 + parentId: 72057594037927985 childrenIds: mMenuText: mStageDirections: mSpeaker: - objectRef: 72057594037927967 + objectRef: 72057594037928004 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>Let's see what I can do here.</align> + mText: <align=left>Glad to be of service!</align> mExternalId: - mPosition: {x: 500, y: 175} - mZIndex: 0 + mPosition: {x: 550, y: 250} + mZIndex: 2 mSize: {x: 225, y: 200} - mShortId: 2268959155 + mShortId: 3420876518 mInputPins: value: - - id: 72057594037928086 + - id: 72057594037928072 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928083 + mOwner: 72057594037928069 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928087 + - id: 72057594037928073 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928083 + mOwner: 72057594037928069 mConnections: value: - mLabel: mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928092 - mTarget: - objectRef: 72057594037928089 - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928100 + mTargetPin: 72057594037928079 mTarget: - objectRef: 72057594037928097 + objectRef: 72057594037928076 mOwnerInstanceId: 0 ---- !u!114 &6024911366825835934 +--- !u!114 &7759647580587107025 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -856,7 +968,7 @@ MonoBehaviour: mTarget: objectRef: 72057594037928019 mOwnerInstanceId: 0 ---- !u!114 &6114087834507308343 +--- !u!114 &8124090866306921086 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -865,59 +977,32 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_97DB3541 + m_Script: {fileID: 11500000, guid: 8a8027f3a47590445baf238930633bbd, type: 3} + m_Name: B m_EditorClassIdentifier: - id: 72057594037927998 - technicalName: DFr_97DB3541 - parentId: 72057594037927979 + id: 72057594037927975 + technicalName: B + parentId: 216172785005863603 childrenIds: - mMenuText: - mStageDirections: - mSpeaker: - objectRef: 72057594037927967 - mSplitHeight: 64 + mAttachments: + listIds: + mDisplayName: B mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: '<align=left>Who should I talk to next?</align> - - <align=left></align>' - mExternalId: - mPosition: {x: 505, y: 213} - mZIndex: 0 - mSize: {x: 225, y: 200} - mShortId: 2547725633 - mInputPins: - value: - - id: 72057594037928001 - mText: - value: - handlerId: 0 - ownerId: 0 - ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037927998 - mConnections: - value: [] - mOwnerInstanceId: 0 - mOutputPins: - value: - - id: 72057594037928002 - mText: - value: - handlerId: 0 - ownerId: 0 - ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037927998 - mConnections: - value: - - mLabel: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mTargetPin: 72057594037928010 - mTarget: - objectRef: 72057594037928008 - mOwnerInstanceId: 0 ---- !u!114 &6599617053359543113 + mText: + mExternalId: B + mPosition: {x: 40, y: 40} + mZIndex: 2 + mSize: {x: 256, y: 196} + mPreviewImage: + mViewBoxX: 0 + mViewBoxY: 0 + mViewBoxWidth: 0 + mViewBoxHeight: 0 + mMode: 0 + mAsset: + objectRef: 0 + mShortId: 3013704420 +--- !u!114 &8712918096250232734 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -976,61 +1061,7 @@ MonoBehaviour: mTarget: objectRef: 72057594037928049 mOwnerInstanceId: 0 ---- !u!114 &6823856074164693532 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_64FEE19A - m_EditorClassIdentifier: - id: 72057594037928097 - technicalName: DFr_64FEE19A - parentId: 72057594037927991 - childrenIds: - mMenuText: Articy Text Size - mStageDirections: - mSpeaker: - objectRef: 72057594037927971 - mSplitHeight: 64 - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left><size=48>BIG TEXT</size></align> - mExternalId: - mPosition: {x: 825, y: 300} - mZIndex: 3 - mSize: {x: 225, y: 200} - mShortId: 1694425498 - mInputPins: - value: - - id: 72057594037928100 - mText: - value: - handlerId: 0 - ownerId: 0 - ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037928097 - mConnections: - value: [] - mOwnerInstanceId: 0 - mOutputPins: - value: - - id: 72057594037928101 - mText: - value: - handlerId: 0 - ownerId: 0 - ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037928097 - mConnections: - value: [] - mOwnerInstanceId: 0 ---- !u!114 &7645369798938058327 +--- !u!114 &8821181649832289490 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -1040,15 +1071,15 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fb9db56664043274faaedc1ca183be51, type: 3} - m_Name: Test_Dialogue_1 + m_Name: Test_Dialogue_2B m_EditorClassIdentifier: - id: 72057594037927991 - technicalName: Test_Dialogue_1 + id: 72057594037927985 + technicalName: Test_Dialogue_2B parentId: 216172783251375095 - childrenIds: 93000000000000019900000000000001a100000000000001 + childrenIds: 7e0000000000000185000000000000018c00000000000001 mAttachments: listIds: - mDisplayName: Test Dialogue 1 + mDisplayName: Test Dialogue 2B mPreviewImage: mViewBoxX: 0 mViewBoxY: 0 @@ -1059,79 +1090,43 @@ MonoBehaviour: objectRef: 0 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} mText: - mExternalId: Test_Dialogue_1 - mPosition: {x: 142, y: -125} - mZIndex: 2 + mExternalId: Test_Dialogue_2B + mPosition: {x: 492, y: 125} + mZIndex: 1 mSize: {x: 291, y: 200} - mShortId: 4039136308 + mShortId: 2853363502 mInputPins: value: - - id: 72057594037927994 + - id: 72057594037927988 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037927991 + mOwner: 72057594037927985 mConnections: - value: [] - mOwnerInstanceId: 0 - mOutputPins: - value: - - id: 72057594037927995 - mText: value: - handlerId: 0 - ownerId: 0 - ownerInstanceId: 0 - mRawScript: - mOwner: 72057594037927991 - mConnections: - value: [] + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037928065 + mTarget: + objectRef: 72057594037928062 mOwnerInstanceId: 0 ---- !u!114 &7657973058742682766 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3ad395af99773ad499c59793fea5e554, type: 3} - m_Name: Jmp_070767CE - m_EditorClassIdentifier: - id: 72057594037928028 - technicalName: Jmp_070767CE - parentId: 72057594037927979 - childrenIds: - mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: - mExternalId: - mPosition: {x: 1580, y: 13} - mZIndex: 7 - mSize: {x: 175, y: 150} - mShortId: 117925838 - mTarget: - objectRef: 72057594037928008 - mTargetPin: 72057594037928010 - mInputPins: + mOutputPins: value: - - id: 72057594037928031 + - id: 72057594037927989 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928028 + mOwner: 72057594037927985 mConnections: value: [] mOwnerInstanceId: 0 - mOutputPins: - value: [] ---- !u!114 &8882108068160863296 +--- !u!114 &9099626386819701350 MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -1141,11 +1136,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 27e360f8b3a184843aa850517cb6618d, type: 3} - m_Name: DFr_A4971ED0 + m_Name: DFr_4571D1A3 m_EditorClassIdentifier: - id: 72057594037928076 - technicalName: DFr_A4971ED0 - parentId: 72057594037927985 + id: 72057594037928049 + technicalName: DFr_4571D1A3 + parentId: 72057594037927979 childrenIds: mMenuText: mStageDirections: @@ -1153,35 +1148,40 @@ MonoBehaviour: objectRef: 0 mSplitHeight: 64 mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} - mText: <align=left>End of Dialogue 2B.</align> + mText: <align=left>It seems the dialogue will progress now!</align> mExternalId: - mPosition: {x: 825, y: 250} - mZIndex: 4 + mPosition: {x: 1305, y: 438} + mZIndex: 14 mSize: {x: 225, y: 200} - mShortId: 2761367248 + mShortId: 1165087139 mInputPins: value: - - id: 72057594037928079 + - id: 72057594037928052 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928076 + mOwner: 72057594037928049 mConnections: value: [] mOwnerInstanceId: 0 mOutputPins: value: - - id: 72057594037928080 + - id: 72057594037928053 mText: value: handlerId: 0 ownerId: 0 ownerInstanceId: 0 mRawScript: - mOwner: 72057594037928076 + mOwner: 72057594037928049 mConnections: - value: [] + value: + - mLabel: + mColor: {r: 0.57758045, g: 0.7605245, b: 0.7991027, a: 1} + mTargetPin: 72057594037927983 + mTarget: + objectRef: 72057594037927979 mOwnerInstanceId: 0 diff --git a/Assets/DialogSystem/Assets/Fonts.meta b/Assets/DialogSystem/Assets/Fonts.meta new file mode 100644 index 0000000..1f718ed --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0b8273a2bc7dfa947bc94b4f864eb14a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt b/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt new file mode 100644 index 0000000..a6fa62b --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt @@ -0,0 +1,93 @@ +Copyright 2014-2017 Indian Type Foundry (info@indiantypefoundry.com). Copyright 2019 Google LLC. + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION & CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt.meta b/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt.meta new file mode 100644 index 0000000..a8abf84 --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans - OFL.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: dffb35dc580335e4ba8f3cdf44e5ddcd +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf b/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf new file mode 100644 index 0000000..2207249 --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:39c64b26086204fddc45edfdec317727d61b84d45be85bb4486b5ac4fc731fd1 +size 63964 diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf.meta b/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf.meta new file mode 100644 index 0000000..42d9a60 --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: 13b9c7832bc13194cbf6816446bab4c8 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - DM Sans + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf b/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf new file mode 100644 index 0000000..7e6145c --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f374aac78ddfc08cd7118511289fc78fd1092a82f6ca023ad4a7af01a7407c2a +size 63880 diff --git a/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf.meta b/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf.meta new file mode 100644 index 0000000..279212e --- /dev/null +++ b/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: a6da1212db0088c439f22fdd5d5f34f3 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - DM Sans Medium + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/DialogSystem/DialogueBox.uss b/Assets/DialogSystem/DialogueBox.uss index cf06f9e..f75729c 100644 --- a/Assets/DialogSystem/DialogueBox.uss +++ b/Assets/DialogSystem/DialogueBox.uss @@ -1,72 +1,79 @@ .outerShell { background-image: url("/Assets/DialogSystem/Assets/outer.png"); - width: 1350px; - height: 1350px; - overflow: hidden; + width: auto; + height: auto; } .innerShell { background-image: url("/Assets/DialogSystem/Assets/inner.png"); - width: 1300px; - height: 1300px; - - margin-top: 25px; - margin-bottom: 25px; - margin-left: 25px; - margin-right: 25px; + width: auto; + height: auto; - overflow: hidden; + margin: 20px; + align-self: center; } Label { - -unity-font-style:bold; + -unity-font-definition: url("/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf"); color: rgb(255, 255, 255); - margin-top: 50px; - margin-left: 25px; + background-color: rgba(0,0,0,0.075); + + width: 1150px; + margin-top: 70px; + margin-left: 90px; + margin-right: 90px; + margin-bottom: 20px; } TextElement { - -unity-font-style:normal; + -unity-font-definition: url("/Assets/DialogSystem/Assets/Fonts/DMSans-Medium.ttf"); + font-size: 70px; color: rgb(255,255,255); - width: 1200px; - height: 350px; + background-color: rgba(0,0,0,0.075); + + width: 1150px; + height: auto; overflow: hidden; text-overflow: ellipsis; + white-space: normal; - - padding-left: 10px; - padding-right: 10px; - padding-bottom: 50px; + flex-direction: column; + + margin-left: 90px; + margin-right: 90px; } Button { - font-size: 45px; - -unity-font-style: bold; + font-size: 55px; + -unity-font-definition: url("/Assets/DialogSystem/Assets/Fonts/DMSans-Bold.ttf"); -unity-text-align: middle-center; color: rgb(255,255,255); - - background-color: rgba(100,100,100,0.8); overflow: hidden; text-overflow: ellipsis; - width: 500px; + background-color: rgba(100,100,100,0.8); + + flex-direction: column; + + width: 1150px; height: 125px; - margin-top: 5px; + min-height: 125px; + margin-bottom: 15px; margin-left: 15px; margin-right: 15px; padding-top: 15px; align-self: center; } -.row{ - flex-direction: row; - padding-top: 20px; - margin-left: 15px; - margin-bottom: 150px; +.container { + min-height: 125px; + height: auto; + margin-top: 25px; + margin-bottom: 75px; } \ No newline at end of file diff --git a/Assets/DialogSystem/DialogueBox.uxml b/Assets/DialogSystem/DialogueBox.uxml index 9f90463..6f8c159 100644 --- a/Assets/DialogSystem/DialogueBox.uxml +++ b/Assets/DialogSystem/DialogueBox.uxml @@ -1,11 +1,9 @@ <UXML xmlns="UnityEngine.UIElements"> <VisualElement class="outerShell"> <VisualElement class="innerShell"> - <Label name="Actor"/> - <VisualElement class="row"> - <TextElement name="Dialogue"/> - </VisualElement> - <VisualElement class="container"> + <Label name="Actor"/> + <TextElement name="Dialogue"/> + <VisualElement class="container" name="buttonContainer"> <Button name="Button1"/> <Button name="Button2"/> <Button name="Button3"/> diff --git a/Assets/DialogSystem/DynamicFontResize.cs b/Assets/DialogSystem/DynamicFontResize.cs index 430160d..56947de 100644 --- a/Assets/DialogSystem/DynamicFontResize.cs +++ b/Assets/DialogSystem/DynamicFontResize.cs @@ -4,45 +4,55 @@ using UnityEngine.UIElements; using UnityEngine.EventSystems; -// idea: remove buttons & change font size if distance > than a certain amount - public class DynamicFontResize : MonoBehaviour { private UIDocument uiDocument; - [SerializeField] Katas.Experimental.WorldSpaceUIDocument worldSpaceUIDocument; + private Katas.Experimental.WorldSpaceUIDocument worldSpaceUIDocument; + private WorldSpaceDialogueBox dialogueBox; private Camera _camera; private VisualElement root; - public float currentdistance; - - public float tiny = 50; - public float big = 65; + private float currentdistance; + private bool once; - public float mindistance = 2; - public float maxdistance = 5; + public float nearActorSize = 90; + public float farActorSize = 120; + public float nearTextSize = 70; + public float farTextSize = 100; + public float mindistance = 1; private Button[] buttons; public void Start() { _camera = Camera.main; + worldSpaceUIDocument = GetComponent<Katas.Experimental.WorldSpaceUIDocument>(); worldSpaceUIDocument.onUIDocumentReady.AddListener(setUIDocument); - } - - public void Update() { + dialogueBox = GetComponent<WorldSpaceDialogueBox>(); currentdistance = DistanceToCamera(this.gameObject.transform.position); + if (currentdistance > mindistance) { - root.Q<Label>("Actor").style.fontSize = big; - root.Q<TextElement>("Dialogue").style.fontSize = big; - root.Q<VisualElement>("Container").style.visibility = Visibility.Visible; - worldSpaceUIDocument.RefreshPanelSize(); + once = true; } else { - root.Q<Label>("Actor").style.fontSize = tiny; - root.Q<TextElement>("Dialogue").style.fontSize = tiny; - root.Q<VisualElement>("Container").style.visibility = Visibility.Hidden; - worldSpaceUIDocument.RefreshPanelSize(); + once = false; } } + public void Update() { + currentdistance = DistanceToCamera(this.gameObject.transform.position); + + if (currentdistance > mindistance && once) { + once = false; + dialogueBox.SetActorFontSize(farActorSize); + dialogueBox.SetTextFontSize(farTextSize); + } + + if (currentdistance < mindistance && once == false) { + once = true; + dialogueBox.SetActorFontSize(nearActorSize); + dialogueBox.SetTextFontSize(nearTextSize); + } + } + private void setUIDocument() { uiDocument = GetComponent<UIDocument>(); root = uiDocument.rootVisualElement; diff --git a/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab index 2b3a8d9..7c24672 100644 --- a/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab +++ b/Assets/DialogSystem/Prefabs/WorldSpaceDialogueBox.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &5313695097596267024 +--- !u!1 &8170552307152042535 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,13 +8,14 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5313695097596267050} - - component: {fileID: 5313695097596267051} - - component: {fileID: 5313695097596267028} - - component: {fileID: 5313695097596267029} - - component: {fileID: 5313695097596267030} - - component: {fileID: 5313695097596267049} - - component: {fileID: 5313695097596267048} + - component: {fileID: 8170552307152042525} + - component: {fileID: 8170552307152042524} + - component: {fileID: 8170552307152042531} + - component: {fileID: 8170552307152042530} + - component: {fileID: 8170552307152042529} + - component: {fileID: 8170552307152042526} + - component: {fileID: 8170552307152042527} + - component: {fileID: 8170552307152042520} m_Layer: 0 m_Name: WorldSpaceDialogueBox m_TagString: Untagged @@ -22,35 +23,35 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5313695097596267050 +--- !u!4 &8170552307152042525 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.17, y: 1.35, z: -9.08} + m_LocalPosition: {x: 0.17, y: 0.995, z: -8.908} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5313695097596267051 +--- !u!114 &8170552307152042524 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fbbce919b93a804449b8e74c7b1eec1b, type: 3} m_Name: m_EditorClassIdentifier: _panelWidth: 1350 - _panelHeight: 1350 + _panelHeight: 2750 _panelScale: 1 _pixelsPerUnit: 1350 _visualTreeAsset: {fileID: 0} @@ -60,13 +61,13 @@ MonoBehaviour: onUIDocumentReady: m_PersistentCalls: m_Calls: [] ---- !u!114 &5313695097596267028 +--- !u!114 &8170552307152042531 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f6a8876d339d1ce4dbb83ea0158084f2, type: 3} @@ -74,15 +75,15 @@ MonoBehaviour: m_EditorClassIdentifier: visualTree: {fileID: 9197481963319205126, guid: 603e8ecda2bc66148be7bc0929e2f25b, type: 3} styleSheet: {fileID: 7433441132597879392, guid: 78ec576a11766354b9c6c1e555acf5e4, type: 3} - worldSpaceUIDocument: {fileID: 5313695097596267051} + worldSpaceUIDocument: {fileID: 8170552307152042524} defaultButtonText: Continue ---- !u!114 &5313695097596267029 +--- !u!114 &8170552307152042530 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6df61a9a13528fd4f9365c233cb23bfb, type: 3} @@ -94,13 +95,13 @@ MonoBehaviour: m_Bits: 4294967295 m_MaxRayIntersections: 10 m_EventCamera: {fileID: 0} ---- !u!114 &5313695097596267030 +--- !u!114 &8170552307152042529 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 149237616, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} @@ -113,31 +114,31 @@ MonoBehaviour: startOn: instanceId: 0 referencingMode: 0 - lowId: 0 - highId: 0 + lowId: 62 + highId: 16777216 pauseOn: 7 ignoreInvalidBranches: 1 continuouslyRecalculateBranches: 0 continouslyRecalculateInterval: 1 ---- !u!114 &5313695097596267049 +--- !u!114 &8170552307152042526 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 2a59cd820c99c234fa950e2b034e9fa0, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &5313695097596267048 +--- !u!114 &8170552307152042527 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5313695097596267024} + m_GameObject: {fileID: 8170552307152042535} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 04f433ebeda01b14092e4f7f84512a40, type: 3} @@ -146,10 +147,27 @@ MonoBehaviour: aPress: instanceId: 0 referencingMode: 0 - lowId: 62 + lowId: 153 highId: 16777216 bPress: instanceId: 0 referencingMode: 0 - lowId: 43 + lowId: 62 highId: 16777216 +--- !u!114 &8170552307152042520 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8170552307152042535} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5a332296198675d44bbd20ea9410e0c7, type: 3} + m_Name: + m_EditorClassIdentifier: + nearActorSize: 90 + farActorSize: 150 + nearTextSize: 70 + farTextSize: 110 + mindistance: 2 diff --git a/Assets/DialogSystem/WorldSpaceDialogueBox.cs b/Assets/DialogSystem/WorldSpaceDialogueBox.cs index e7684aa..8720be0 100644 --- a/Assets/DialogSystem/WorldSpaceDialogueBox.cs +++ b/Assets/DialogSystem/WorldSpaceDialogueBox.cs @@ -25,6 +25,16 @@ public void Awake() { worldSpaceUIDocument.onUIDocumentReady.AddListener(setUIDocument); } + public void Update() { + + if (Input.GetKeyDown("space") && root != null) + { + Debug.Log(root.Q<Label>("Actor").style.fontSize); + Debug.Log(root.Q<TextElement>("Dialogue").style.fontSize); + } + + } + private void setUIDocument() { uiDocument = GetComponent<UIDocument>(); root = uiDocument.rootVisualElement; @@ -44,23 +54,31 @@ public void ClearUI() { SetActor(string.Empty); SetText(string.Empty); for (var i = 0; i < buttons.Length; i++) - buttons[i].visible = false; + buttons[i].style.display = DisplayStyle.None; } public void SetActor(string actor) { root.Q<Label>("Actor").text = actor; } + public void SetActorFontSize(float size) { + root.Q<Label>("Actor").style.fontSize = size; + } + public void SetText(string text) { root.Q<TextElement>("Dialogue").text = text; } + public void SetTextFontSize(float size) { + root.Q<TextElement>("Dialogue").style.fontSize = size; + } + public void SetTransitions(IList<Branch> branches) { for (var i = 0; i < buttons.Length; i++) { buttons[i].text = string.Empty; if (i < branches.Count) { - buttons[i].visible = true; + buttons[i].style.display = DisplayStyle.Flex; var menuText = branches[i].Target as IObjectWithMenuText; if (menuText != null && menuText.MenuText != string.Empty) { @@ -71,7 +89,7 @@ public void SetTransitions(IList<Branch> branches) { } } else { - buttons[i].visible = false; + buttons[i].style.display = DisplayStyle.None; } } } diff --git a/Assets/Scenes/ArticyTestScene.unity b/Assets/Scenes/ArticyTestScene.unity index 2da5698..7e713e5 100644 --- a/Assets/Scenes/ArticyTestScene.unity +++ b/Assets/Scenes/ArticyTestScene.unity @@ -207,159 +207,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1621041051 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1621041057} - - component: {fileID: 1621041056} - - component: {fileID: 1621041055} - - component: {fileID: 1621041054} - - component: {fileID: 1621041053} - - component: {fileID: 1621041058} - - component: {fileID: 1621041059} - m_Layer: 0 - m_Name: WorldSpaceDialogueBox - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1621041053 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 149237616, guid: df2ec02f61e861546b9427c26ccacb8d, type: 3} - m_Name: - m_EditorClassIdentifier: - useDefaultGlobalVariables: 1 - globalVariables: {fileID: 0} - overwriteMethodProvider: 0 - overwrittenMethodProvider: {fileID: 0} - startOn: - instanceId: 0 - referencingMode: 0 - lowId: 62 - highId: 16777216 - pauseOn: 7 - ignoreInvalidBranches: 1 - continuouslyRecalculateBranches: 0 - continouslyRecalculateInterval: 1 ---- !u!114 &1621041054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 6df61a9a13528fd4f9365c233cb23bfb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RaycastTriggerInteraction: 1 - m_EventMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_MaxRayIntersections: 10 - m_EventCamera: {fileID: 0} ---- !u!114 &1621041055 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f6a8876d339d1ce4dbb83ea0158084f2, type: 3} - m_Name: - m_EditorClassIdentifier: - visualTree: {fileID: 9197481963319205126, guid: 603e8ecda2bc66148be7bc0929e2f25b, type: 3} - styleSheet: {fileID: 7433441132597879392, guid: 78ec576a11766354b9c6c1e555acf5e4, type: 3} - worldSpaceUIDocument: {fileID: 1621041056} - defaultButtonText: Continue ---- !u!114 &1621041056 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fbbce919b93a804449b8e74c7b1eec1b, type: 3} - m_Name: - m_EditorClassIdentifier: - _panelWidth: 1280 - _panelHeight: 720 - _panelScale: 1 - _pixelsPerUnit: 1280 - _visualTreeAsset: {fileID: 0} - _panelSettingsPrefab: {fileID: 11400000, guid: fd07337020fac9f4d817f2d168694173, type: 2} - _renderTexturePrefab: {fileID: 8400000, guid: 17662cfbd375e554d91b75bf67594f93, type: 2} - UseDragEventFix: 0 - onUIDocumentReady: - m_PersistentCalls: - m_Calls: [] ---- !u!4 &1621041057 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.17, y: 1.35, z: -9.08} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1621041058 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 2a59cd820c99c234fa950e2b034e9fa0, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &1621041059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1621041051} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04f433ebeda01b14092e4f7f84512a40, type: 3} - m_Name: - m_EditorClassIdentifier: - aPress: - instanceId: 0 - referencingMode: 0 - lowId: 62 - highId: 16777216 - bPress: - instanceId: 0 - referencingMode: 0 - lowId: 43 - highId: 16777216 --- !u!1 &1933320861 GameObject: m_ObjectHideFlags: 0 @@ -448,7 +295,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1933320861} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: 23.51, y: 3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -475,3 +322,60 @@ MonoBehaviour: m_ShadowLayerMask: 1 m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} +--- !u!1001 &8170552307681109436 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalPosition.x + value: 0.17 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.995 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalPosition.z + value: -8.908 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042525, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8170552307152042535, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} + propertyPath: m_Name + value: WorldSpaceDialogueBox + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8cfe3f32eae0d304285287fececf058b, type: 3} -- GitLab