Skip to content

Commit e03289b

Browse files
committed
Updated test scene and narrative log prefab
1 parent 5cad400 commit e03289b

File tree

2 files changed

+19
-37
lines changed

2 files changed

+19
-37
lines changed

Assets/Fungus/Resources/Prefabs/NarrativeLog.prefab

Lines changed: 17 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ MonoBehaviour:
6060
m_Material: {fileID: 0}
6161
m_Color: {r: 0.2783019, g: 0.50158674, b: 1, a: 1}
6262
m_RaycastTarget: 1
63+
m_Maskable: 1
6364
m_OnCullStateChanged:
6465
m_PersistentCalls:
6566
m_Calls: []
@@ -132,6 +133,7 @@ MonoBehaviour:
132133
m_Material: {fileID: 0}
133134
m_Color: {r: 0.2783019, g: 0.50158674, b: 1, a: 1}
134135
m_RaycastTarget: 1
136+
m_Maskable: 1
135137
m_OnCullStateChanged:
136138
m_PersistentCalls:
137139
m_Calls: []
@@ -198,6 +200,7 @@ GameObject:
198200
- component: {fileID: 3892339028774243845}
199201
- component: {fileID: 3892339028774243846}
200202
- component: {fileID: 3892339028774243864}
203+
- component: {fileID: 3892339027484338105}
201204
m_Layer: 5
202205
m_Name: NarrativeLog
203206
m_TagString: Untagged
@@ -312,6 +315,18 @@ MonoBehaviour:
312315
entryDisplayPrefab: {fileID: 2879084013005042991, guid: 243a94cf6d8dda84f8351f4289587571,
313316
type: 3}
314317
entryHolder: {fileID: 3892339028022738723}
318+
--- !u!114 &3892339027484338105
319+
MonoBehaviour:
320+
m_ObjectHideFlags: 0
321+
m_CorrespondingSourceObject: {fileID: 0}
322+
m_PrefabInstance: {fileID: 0}
323+
m_PrefabAsset: {fileID: 0}
324+
m_GameObject: {fileID: 3892339028774243865}
325+
m_Enabled: 1
326+
m_EditorHideFlags: 0
327+
m_Script: {fileID: 11500000, guid: 4aa64b6f80019a149ab2b31d70dba1a4, type: 3}
328+
m_Name:
329+
m_EditorClassIdentifier:
315330
--- !u!1 &3892339028978780124
316331
GameObject:
317332
m_ObjectHideFlags: 0
@@ -350,7 +365,7 @@ RectTransform:
350365
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
351366
m_AnchorMin: {x: 0.5, y: 0.5}
352367
m_AnchorMax: {x: 0.5, y: 0.5}
353-
m_AnchoredPosition: {x: 0, y: 108.70001}
368+
m_AnchoredPosition: {x: 0, y: 86}
354369
m_SizeDelta: {x: 600, y: 300}
355370
m_Pivot: {x: 0.5, y: 0.5}
356371
--- !u!222 &3892339028978780103
@@ -376,6 +391,7 @@ MonoBehaviour:
376391
m_Material: {fileID: 0}
377392
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
378393
m_RaycastTarget: 1
394+
m_Maskable: 1
379395
m_OnCullStateChanged:
380396
m_PersistentCalls:
381397
m_Calls: []

Assets/FungusExamples/Conversation/NarrativeEntryLogTest.unity

Lines changed: 2 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -5093,7 +5093,7 @@ MonoBehaviour:
50935093
type: 3}
50945094
m_PrefabInstance: {fileID: 3892339027484338103}
50955095
m_PrefabAsset: {fileID: 0}
5096-
m_GameObject: {fileID: 3892339027484338104}
5096+
m_GameObject: {fileID: 0}
50975097
m_Enabled: 1
50985098
m_EditorHideFlags: 0
50995099
m_Script: {fileID: 11500000, guid: fde579c9edfbe7e469349e39e2a87a48, type: 3}
@@ -5670,11 +5670,6 @@ PrefabInstance:
56705670
m_Modification:
56715671
m_TransformParent: {fileID: 0}
56725672
m_Modifications:
5673-
- target: {fileID: 3892339028022738721, guid: bffd475e4bfb82f49810ceafe8d17b78,
5674-
type: 3}
5675-
propertyPath: m_ChildControlHeight
5676-
value: 1
5677-
objectReference: {fileID: 0}
56785673
- target: {fileID: 3892339028022738723, guid: bffd475e4bfb82f49810ceafe8d17b78,
56795674
type: 3}
56805675
propertyPath: m_SizeDelta.y
@@ -5790,34 +5785,5 @@ PrefabInstance:
57905785
propertyPath: m_Name
57915786
value: NarrativeLog
57925787
objectReference: {fileID: 0}
5793-
- target: {fileID: 3892339028774243865, guid: bffd475e4bfb82f49810ceafe8d17b78,
5794-
type: 3}
5795-
propertyPath: m_IsActive
5796-
value: 1
5797-
objectReference: {fileID: 0}
5798-
- target: {fileID: 3892339028978780123, guid: bffd475e4bfb82f49810ceafe8d17b78,
5799-
type: 3}
5800-
propertyPath: m_AnchoredPosition.y
5801-
value: 86
5802-
objectReference: {fileID: 0}
5803-
m_RemovedComponents:
5804-
- {fileID: 3892339028774243847, guid: bffd475e4bfb82f49810ceafe8d17b78, type: 3}
5788+
m_RemovedComponents: []
58055789
m_SourcePrefab: {fileID: 100100000, guid: bffd475e4bfb82f49810ceafe8d17b78, type: 3}
5806-
--- !u!1 &3892339027484338104 stripped
5807-
GameObject:
5808-
m_CorrespondingSourceObject: {fileID: 3892339028774243865, guid: bffd475e4bfb82f49810ceafe8d17b78,
5809-
type: 3}
5810-
m_PrefabInstance: {fileID: 3892339027484338103}
5811-
m_PrefabAsset: {fileID: 0}
5812-
--- !u!114 &3892339027484338105
5813-
MonoBehaviour:
5814-
m_ObjectHideFlags: 0
5815-
m_CorrespondingSourceObject: {fileID: 0}
5816-
m_PrefabInstance: {fileID: 0}
5817-
m_PrefabAsset: {fileID: 0}
5818-
m_GameObject: {fileID: 3892339027484338104}
5819-
m_Enabled: 1
5820-
m_EditorHideFlags: 0
5821-
m_Script: {fileID: 11500000, guid: 4aa64b6f80019a149ab2b31d70dba1a4, type: 3}
5822-
m_Name:
5823-
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)