diff --git a/AssetBundles/conversation b/AssetBundles/conversation index 82b24b44..021667e3 100644 Binary files a/AssetBundles/conversation and b/AssetBundles/conversation differ diff --git a/AssetBundles/conversation.manifest b/AssetBundles/conversation.manifest index 2b1d96ca..7e7bef1b 100644 --- a/AssetBundles/conversation.manifest +++ b/AssetBundles/conversation.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 257686626 +CRC: 3320435706 Hashes: AssetFileHash: serializedVersion: 2 - Hash: b5ac4b30628daf591d68835ebe7eeff0 + Hash: 3df7152b225d5dd66f0a326cb9ec0cef TypeTreeHash: serializedVersion: 2 - Hash: c8bdde0b3a6c63068e0e0c532e8ccb6e + Hash: 50a27bfc3e679077929938a6fa57f4db HashAppended: 0 ClassTypes: - Class: 1 @@ -25,12 +25,12 @@ ClassTypes: 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: 213 + Script: {instanceID: 0} - Class: 222 Script: {instanceID: 0} - Class: 223 @@ -40,4 +40,5 @@ ClassTypes: SerializeReferenceClassIdentifiers: [] Assets: - Assets/DialogueBubble.prefab +- Assets/GameAssets/Texture2D/UI_DialogueBox_d.png Dependencies: [] diff --git a/UnityProject/Assets/DialogueBubble.prefab b/UnityProject/Assets/DialogueBubble.prefab index d4d446a4..613fc059 100644 --- a/UnityProject/Assets/DialogueBubble.prefab +++ b/UnityProject/Assets/DialogueBubble.prefab @@ -12,7 +12,6 @@ GameObject: - component: {fileID: 130575080623899817} - component: {fileID: 916729221779553788} - component: {fileID: 4465360732322480311} - - component: {fileID: 4575345477166195318} - component: {fileID: 2271490637008274700} - component: {fileID: 6454923117947624182} m_Layer: 0 @@ -114,21 +113,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !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 @@ -164,7 +148,7 @@ MonoBehaviour: m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 2 + m_DynamicPixelsPerUnit: 5 --- !u!1 &8766783471207652418 GameObject: m_ObjectHideFlags: 0 @@ -200,8 +184,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -5, y: -5} - m_SizeDelta: {x: 10, y: 10} + m_AnchoredPosition: {x: -20, y: -20.000008} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 0} --- !u!222 &2884875585792430400 CanvasRenderer: @@ -224,14 +208,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 0.50980395} + m_Color: {r: 0, g: 0, b: 0, a: 0.72156864} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5e9aeeea80dcad34ea121719721a5a45, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4