From 234ea1c0aa7f8f152d408949bb12b01f7f6d1d78 Mon Sep 17 00:00:00 2001
From: Alice Morris <olivermorris91@gmail.com>
Date: Tue, 9 Apr 2019 17:07:28 +0100
Subject: [PATCH] Scene Changes
Changes to the scene to go with cutscene and camera movement changes
---
TTCS_Prot/Assets/Scenes/SampleScene.unity | 101 ++++++++++++++++------
1 file changed, 75 insertions(+), 26 deletions(-)
diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity
index 969ef64..4ac4479 100644
--- a/TTCS_Prot/Assets/Scenes/SampleScene.unity
+++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.43667588, g: 0.48427194, b: 0.564524, a: 1}
+ m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427135, b: 0.5645232, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -449,6 +449,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 738989159}
--- !u!114 &51112066
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -882,8 +883,8 @@ RectTransform:
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: -148, y: -13.600003}
- m_SizeDelta: {x: 95.7, y: 127.2}
+ m_AnchoredPosition: {x: -133.7, y: -13.600003}
+ m_SizeDelta: {x: 129.6, y: 127.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &117671464
MonoBehaviour:
@@ -948,7 +949,7 @@ Light:
serializedVersion: 8
m_Type: 1
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
- m_Intensity: 0.45
+ m_Intensity: 0.6
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
@@ -1023,7 +1024,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 4, y: -0.0000076293945}
+ m_AnchoredPosition: {x: 4, y: 0.0000076293945}
m_SizeDelta: {x: -8, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &193758842
@@ -1539,7 +1540,6 @@ RectTransform:
- {fileID: 939894410}
- {fileID: 1092270384}
- {fileID: 1861087637}
- - {fileID: 650182741}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1702,7 +1702,7 @@ RectTransform:
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_AnchoredPosition: {x: 143, y: -124}
m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &293264978
@@ -1776,6 +1776,10 @@ PrefabInstance:
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 76c61509641ff478ab02a7b257c56610, type: 2}
+ - target: {fileID: 400000, guid: f758c800fb7e44b5e8cd9bdcdb7ee41f, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.07
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f758c800fb7e44b5e8cd9bdcdb7ee41f, type: 3}
--- !u!4 &293264979 stripped
@@ -2566,6 +2570,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 1749549237}
--- !u!114 &361594288
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2892,6 +2897,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 0}
--- !u!114 &441017465
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -3844,6 +3850,7 @@ GameObject:
- component: {fileID: 534669904}
- component: {fileID: 534669903}
- component: {fileID: 534669906}
+ - component: {fileID: 534669907}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
@@ -3931,6 +3938,18 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
+--- !u!114 &534669907
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 534669902}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 0dd89afbef87148d197467665f18c6d3, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &553963902
GameObject:
m_ObjectHideFlags: 0
@@ -4056,7 +4075,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 8
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4101,7 +4120,9 @@ MonoBehaviour:
showBeginning: 0
showEnding: 1
selectionBox: {fileID: 1651543189}
+ stopFlashing: {fileID: 208997529}
detectiveCheck: {fileID: 734794670}
+ moving: 0
--- !u!114 &565321723
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4126,6 +4147,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 0}
+ stopFlashing: {fileID: 0}
notebookCheck: {fileID: 576700780}
--- !u!114 &565321724
MonoBehaviour:
@@ -4150,6 +4172,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 0}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321725
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4174,6 +4197,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 0
selectionBox: {fileID: 617727770}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321726
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4196,6 +4220,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 441017462}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321727
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4219,6 +4244,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 0
selectionBox: {fileID: 1816442109}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321728
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4240,6 +4266,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 585411774}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321729
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4259,6 +4286,7 @@ MonoBehaviour:
showBeginning: 0
showEnding: 0
selectionBox: {fileID: 0}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321730
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4282,6 +4310,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 1589979076}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321731
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4303,6 +4332,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 1
selectionBox: {fileID: 51112063}
+ stopFlashing: {fileID: 738989159}
notebookCheck: {fileID: 576700780}
--- !u!114 &565321732
MonoBehaviour:
@@ -4326,6 +4356,7 @@ MonoBehaviour:
showBeginning: 0
showEnding: 0
selectionBox: {fileID: 0}
+ stopFlashing: {fileID: 0}
--- !u!114 &565321733
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4348,6 +4379,7 @@ MonoBehaviour:
showBeginning: 1
showEnding: 0
selectionBox: {fileID: 361594285}
+ stopFlashing: {fileID: 1749549237}
selection: {fileID: 1753735557}
--- !u!114 &565321734
MonoBehaviour:
@@ -4370,6 +4402,7 @@ MonoBehaviour:
showBeginning: 0
showEnding: 1
selectionBox: {fileID: 0}
+ stopFlashing: {fileID: 0}
notebookCheck: {fileID: 576700780}
--- !u!114 &565321735
MonoBehaviour:
@@ -4392,6 +4425,7 @@ MonoBehaviour:
showBeginning: 0
showEnding: 0
selectionBox: {fileID: 1816442109}
+ stopFlashing: {fileID: 0}
--- !u!1 &576700776
GameObject:
m_ObjectHideFlags: 0
@@ -4556,6 +4590,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 0}
--- !u!114 &585411777
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4720,6 +4755,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 0}
--- !u!114 &617727773
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -4860,7 +4896,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 635001260}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 2.23, y: 0, z: -1.06}
+ m_LocalPosition: {x: 0.73, y: 0, z: -0.99}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1475512049}
@@ -4928,9 +4964,9 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 650182740}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ 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_LocalScale: {x: 0.55, y: 0.55, z: 0.55}
m_Children:
- {fileID: 361594286}
- {fileID: 1651543190}
@@ -4940,12 +4976,12 @@ RectTransform:
- {fileID: 441017463}
- {fileID: 1816442110}
- {fileID: 617727771}
- m_Father: {fileID: 250005343}
- m_RootOrder: 10
+ m_Father: {fileID: 0}
+ m_RootOrder: 6
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_AnchoredPosition: {x: 400, y: 225.45456}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &734794666 stripped
@@ -5193,7 +5229,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 738989159}
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
- m_LocalPosition: {x: 2.49, y: 0.27, z: -1.33}
+ m_LocalPosition: {x: 2.49, y: 0, z: -1.33}
m_LocalScale: {x: 0.7, y: 0.9376819, z: 0.7}
m_Children: []
m_Father: {fileID: 1426055746}
@@ -6120,6 +6156,10 @@ MonoBehaviour:
movementEvent: {fileID: 848200921}
dialogueEvent: {fileID: 848200920}
cameraEvent: {fileID: 848200919}
+ ShutoffUIElements:
+ - {fileID: 426045721}
+ - {fileID: 576700776}
+ - {fileID: 939894409}
--- !u!4 &848200923
Transform:
m_ObjectHideFlags: 0
@@ -6132,7 +6172,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 6
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &863962176
GameObject:
@@ -7056,7 +7096,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1056005974}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -1.888, y: 0, z: -1.61}
+ m_LocalPosition: {x: -2.08, y: 0, z: -1.57}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 375393479}
@@ -7126,7 +7166,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 7
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1063011815
MonoBehaviour:
@@ -9770,7 +9810,7 @@ Transform:
m_Children:
- {fileID: 738989165}
m_Father: {fileID: 0}
- m_RootOrder: 9
+ m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1432361389
PrefabInstance:
@@ -10659,6 +10699,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 0}
--- !u!114 &1589979079
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -10987,7 +11028,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1625353410}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -1.07, y: 0, z: 0.74}
+ m_LocalPosition: {x: -0.27, y: 0, z: 1.29}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1182071513}
@@ -11112,6 +11153,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 208997529}
--- !u!114 &1651543192
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -11601,7 +11643,7 @@ Transform:
- {fileID: 1866254414}
- {fileID: 1453469227}
m_Father: {fileID: 0}
- m_RootOrder: 10
+ m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1748031998
GameObject:
@@ -11684,6 +11726,12 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1748031998}
m_CullTransparentMesh: 0
+--- !u!1 &1749549237 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 3761742375179795615, guid: f4ad175d0facffa459f806cdddc12632,
+ type: 3}
+ m_PrefabInstance: {fileID: 1191658971}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1753735553
GameObject:
m_ObjectHideFlags: 0
@@ -11872,7 +11920,7 @@ RectTransform:
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: -34.99, y: 0.7}
+ m_AnchoredPosition: {x: -50.1, y: 0.7}
m_SizeDelta: {x: 15.06, y: 72.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1757282215
@@ -11944,8 +11992,8 @@ RectTransform:
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: 7.94, y: 3.3}
- m_SizeDelta: {x: 345.19, y: 81.6}
+ m_AnchoredPosition: {x: 8.689902, y: 3.3}
+ m_SizeDelta: {x: 518.72, y: 81.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1763025427
MonoBehaviour:
@@ -12477,6 +12525,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f6901038bfa3949668095ff5cf72f526, type: 3}
m_Name:
m_EditorClassIdentifier:
+ attachedObject: {fileID: 0}
--- !u!114 &1816442112
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -12617,7 +12666,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1821123882}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 1.64, y: 0, z: 0.02}
+ m_LocalPosition: {x: 1.6, y: 0, z: -0.02}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 442836974}
@@ -13150,7 +13199,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 2bcac4a8fa937465792326476e296c88, type: 3}
propertyPath: m_LocalPosition.y
- value: 0.45
+ value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 400000, guid: 2bcac4a8fa937465792326476e296c88, type: 3}
propertyPath: m_LocalPosition.z
--
GitLab