diff --git a/AssetBundles/conversation b/AssetBundles/conversation
index b1cd41e8..95696198 100644
Binary files a/AssetBundles/conversation and b/AssetBundles/conversation differ
diff --git a/AssetBundles/conversation.manifest b/AssetBundles/conversation.manifest
index 2759cf64..ba00c015 100644
--- a/AssetBundles/conversation.manifest
+++ b/AssetBundles/conversation.manifest
@@ -1,26 +1,36 @@
ManifestFileVersion: 0
-CRC: 1518538429
+CRC: 700340465
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: cda9c91e090f27b94734bfca3a7cb9e2
+ Hash: 1caed2d847c3ffeb21d8775530ffa2f1
TypeTreeHash:
serializedVersion: 2
- Hash: 90db08ff16f71e0f4005d38a4650eff2
+ Hash: c8bdde0b3a6c63068e0e0c532e8ccb6e
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
+- Class: 21
+ Script: {instanceID: 0}
+- Class: 28
+ Script: {instanceID: 0}
+- Class: 48
+ Script: {instanceID: 0}
- Class: 114
- Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+ Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+- Class: 114
+ Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
- Class: 114
Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
- Class: 115
Script: {instanceID: 0}
+- Class: 128
+ Script: {instanceID: 0}
- Class: 222
Script: {instanceID: 0}
- Class: 223
diff --git a/AssetBundles/debug.manifest b/AssetBundles/debug.manifest
index 3c7b4d6c..494f867b 100644
--- a/AssetBundles/debug.manifest
+++ b/AssetBundles/debug.manifest
@@ -3,7 +3,7 @@ CRC: 3095198160
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: aeeeeba83ed0a32973e863d3787067c0
+ Hash: 44badca86c2222e5cc39a8497439be0c
TypeTreeHash:
serializedVersion: 2
Hash: b2ece8ae09df261ff59d764d08696641
diff --git a/AssetBundles/network.manifest b/AssetBundles/network.manifest
index 2780f677..a4d9d43c 100644
--- a/AssetBundles/network.manifest
+++ b/AssetBundles/network.manifest
@@ -3,7 +3,7 @@ CRC: 1991351671
Hashes:
AssetFileHash:
serializedVersion: 2
- Hash: 494875ba5d9a67b7d87421e95e386357
+ Hash: e0f93ad04981fd266a4300b0be721792
TypeTreeHash:
serializedVersion: 2
Hash: 6968c5d2bbef57a79632abd61ea01bb3
diff --git a/UnityProject/Assets/DialogueBubble.prefab b/UnityProject/Assets/DialogueBubble.prefab
index 262bc2fa..5f5234a8 100644
--- a/UnityProject/Assets/DialogueBubble.prefab
+++ b/UnityProject/Assets/DialogueBubble.prefab
@@ -1,47 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
---- !u!1001 &100100000
-Prefab:
- m_ObjectHideFlags: 1
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 0}
- m_Modifications: []
- m_RemovedComponents: []
- m_ParentPrefab: {fileID: 0}
- m_RootGameObject: {fileID: 1531056750600734}
- m_IsPrefabParent: 1
---- !u!1 &1143829915878388
+--- !u!1 &679228622185909741
GameObject:
m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
m_Component:
- - component: {fileID: 224902966460615240}
- - component: {fileID: 222785523450871998}
- - component: {fileID: 114075889546086968}
- - component: {fileID: 223100826173633414}
- m_Layer: 0
- m_Name: Background
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!1 &1531056750600734
-GameObject:
- m_ObjectHideFlags: 0
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- serializedVersion: 5
- m_Component:
- - component: {fileID: 224161822944405660}
- - component: {fileID: 222075293424074192}
- - component: {fileID: 114008001535486946}
- - component: {fileID: 223470330008512890}
- - component: {fileID: 114167403308441852}
- - component: {fileID: 114670735829080676}
+ - component: {fileID: 5510779269599846461}
+ - component: {fileID: 130575080623899817}
+ - component: {fileID: 916729221779553788}
+ - component: {fileID: 4465360732322480311}
+ - component: {fileID: 4575345477166195318}
+ - component: {fileID: 2271490637008274700}
+ - component: {fileID: 6454923117947624182}
m_Layer: 0
m_Name: DialogueBubble
m_TagString: Untagged
@@ -49,131 +22,84 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
---- !u!114 &114008001535486946
+--- !u!224 &5510779269599846461
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
+ m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalScale: {x: 0.00206, y: 0.00206, z: 1}
+ m_Children:
+ - {fileID: 1910662446065868499}
+ m_Father: {fileID: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+ m_AnchorMin: {x: 0.5, y: 0.5}
+ m_AnchorMax: {x: 0.5, y: 0.5}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 1300, y: 0}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &130575080623899817
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
+ m_CullTransparentMesh: 0
+--- !u!114 &916729221779553788
MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
m_Enabled: 1
m_EditorHideFlags: 0
- m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+ m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
- m_Material: {fileID: 2100000, guid: 08e1a88dddd41604db20b0dcb92d17d8, type: 2}
- m_Color: {r: 1, g: 0.68275857, b: 0, a: 1}
+ m_Material: {fileID: 2100000, guid: a561d4a8b0d22c744a16a573d5efe615, type: 2}
+ m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 0
+ m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
- m_Font: {fileID: 12800000, guid: 67f35d66c98319540bc681e5a18105d2, type: 2}
- m_FontSize: 1
+ m_Font: {fileID: 12800000, guid: 19a1b91dbf7856445a66d7c242a73641, type: 3}
+ m_FontSize: 48
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
- m_MaxSize: 150
+ m_MaxSize: 300
m_Alignment: 4
- m_AlignByGeometry: 1
+ m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
- m_Text:
---- !u!114 &114075889546086968
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1143829915878388}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Material: {fileID: 0}
- m_Color: {r: 0, g: 0, b: 0, a: 0.50980395}
- m_RaycastTarget: 1
- m_OnCullStateChanged:
- m_PersistentCalls:
- m_Calls: []
- m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
- Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
- m_Sprite: {fileID: 0}
- m_Type: 0
- m_PreserveAspect: 0
- m_FillCenter: 1
- m_FillMethod: 4
- m_FillAmount: 1
- m_FillClockwise: 1
- m_FillOrigin: 0
---- !u!114 &114167403308441852
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 1741964061, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_HorizontalFit: 0
- m_VerticalFit: 2
---- !u!114 &114670735829080676
-MonoBehaviour:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: -900027084, guid: f70555f144d8491a825f0804e09c671c, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
- m_EffectDistance: {x: -0.04, y: -0.04}
- m_UseGraphicAlpha: 1
---- !u!222 &222075293424074192
-CanvasRenderer:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
---- !u!222 &222785523450871998
-CanvasRenderer:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1143829915878388}
---- !u!223 &223100826173633414
+ m_Text: 'OOPSIE WOOPSIE!!
+
+ This isn''t meant to appear.
+
+
+ what did i do wrong...
+
+ Submit an error to the QSB Github with
+ the reproduction steps please!
+
+ - Your humble servant, _nebula'
+--- !u!223 &4465360732322480311
Canvas:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1143829915878388}
- m_Enabled: 1
- serializedVersion: 3
- m_RenderMode: 2
- m_Camera: {fileID: 0}
- m_PlaneDistance: 100
- m_PixelPerfect: 0
- m_ReceivesEvents: 1
- m_OverrideSorting: 1
- m_OverridePixelPerfect: 1
- m_SortingBucketNormalizedSize: 0
- m_AdditionalShaderChannelsFlag: 0
- m_SortingLayerID: 0
- m_SortingOrder: -9999
- m_TargetDisplay: 0
---- !u!223 &223470330008512890
-Canvas:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
@@ -188,40 +114,150 @@ Canvas:
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
---- !u!224 &224161822944405660
+--- !u!114 &4575345477166195318
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+ m_EffectDistance: {x: 1.5, y: 1.5}
+ m_UseGraphicAlpha: 1
+--- !u!114 &2271490637008274700
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalFit: 0
+ m_VerticalFit: 2
+--- !u!114 &6454923117947624182
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 679228622185909741}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_UiScaleMode: 0
+ m_ReferencePixelsPerUnit: 100
+ m_ScaleFactor: 1
+ m_ReferenceResolution: {x: 800, y: 600}
+ m_ScreenMatchMode: 0
+ m_MatchWidthOrHeight: 0
+ m_PhysicalUnit: 3
+ m_FallbackScreenDPI: 96
+ m_DefaultSpriteDPI: 96
+ m_DynamicPixelsPerUnit: 2
+--- !u!1 &8766783471207652418
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1910662446065868499}
+ - component: {fileID: 2884875585792430400}
+ - component: {fileID: 4192568564237117109}
+ - component: {fileID: 4513423881476039006}
+ m_Layer: 0
+ m_Name: Background
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &1910662446065868499
RectTransform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1531056750600734}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
- m_LocalScale: {x: 0.1, y: 0.1, z: 1}
- m_Children:
- - {fileID: 224902966460615240}
- m_Father: {fileID: 0}
- m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0.5, y: 0.5}
- m_AnchorMax: {x: 0.5, y: 0.5}
- m_AnchoredPosition: {x: 0, y: 0}
- m_SizeDelta: {x: 25, y: 0}
- m_Pivot: {x: 0.5, y: 0.5}
---- !u!224 &224902966460615240
-RectTransform:
- m_ObjectHideFlags: 1
- m_PrefabParentObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1143829915878388}
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8766783471207652418}
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: 224161822944405660}
+ m_Father: {fileID: 5510779269599846461}
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: -1, y: -1}
- m_SizeDelta: {x: 2, y: 2}
+ m_AnchoredPosition: {x: -5, y: -5}
+ m_SizeDelta: {x: 10, y: 10}
m_Pivot: {x: 0, y: 0}
+--- !u!222 &2884875585792430400
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8766783471207652418}
+ m_CullTransparentMesh: 0
+--- !u!114 &4192568564237117109
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8766783471207652418}
+ 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: 0, g: 0, b: 0, a: 0.50980395}
+ m_RaycastTarget: 1
+ m_Maskable: 1
+ m_OnCullStateChanged:
+ m_PersistentCalls:
+ m_Calls: []
+ m_Sprite: {fileID: 0}
+ 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!223 &4513423881476039006
+Canvas:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8766783471207652418}
+ m_Enabled: 1
+ serializedVersion: 3
+ m_RenderMode: 2
+ m_Camera: {fileID: 0}
+ m_PlaneDistance: 100
+ m_PixelPerfect: 0
+ m_ReceivesEvents: 1
+ m_OverrideSorting: 1
+ m_OverridePixelPerfect: 1
+ m_SortingBucketNormalizedSize: 0
+ m_AdditionalShaderChannelsFlag: 0
+ m_SortingLayerID: 0
+ m_SortingOrder: -9999
+ m_TargetDisplay: 0
diff --git a/UnityProject/Assets/DialogueBubble.prefab.meta b/UnityProject/Assets/DialogueBubble.prefab.meta
index c8819887..20d50770 100644
--- a/UnityProject/Assets/DialogueBubble.prefab.meta
+++ b/UnityProject/Assets/DialogueBubble.prefab.meta
@@ -1,8 +1,7 @@
fileFormatVersion: 2
guid: 8a96f886e4fad144f8fb9a5e3c2712df
-NativeFormatImporter:
+PrefabImporter:
externalObjects: {}
- mainObjectFileID: 100100000
userData:
assetBundleName: conversation
assetBundleVariant:
diff --git a/UnityProject/Assets/GameAssets.meta b/UnityProject/Assets/GameAssets.meta
new file mode 100644
index 00000000..fe676201
--- /dev/null
+++ b/UnityProject/Assets/GameAssets.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e2241e4bc9f9e994c9d743879f2f5fb2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant: