Merge pull request Studio-Reachh#36 from Studio-Reachh/Add_hidden_Room

Added hidden room
wvanderdeijl · Oct 5, 2020 · 52cddab · 52cddab
2 parents 44ec0dc + 0be740f
commit 52cddab
Show file tree

Hide file tree

Showing 19 changed files with 1,531 additions and 128 deletions.
diff --git a/Reach/Assets/Cutscenes/RowingCutscene_GreenVignette.mp4 b/Reach/Assets/Cutscenes/RowingCutscene_GreenVignette.mp4
diff --git a/Reach/Assets/Cutscenes/RowingScene_1.mp4 b/Reach/Assets/Cutscenes/RowingScene_1.mp4
diff --git a/...nes/RowingCutscene_GreenVignette.mp4.meta → ...h/Assets/Cutscenes/RowingScene_1.mp4.meta b/...nes/RowingCutscene_GreenVignette.mp4.meta → ...h/Assets/Cutscenes/RowingScene_1.mp4.meta
diff --git a/Reach/Assets/Resources/ScriptableObjects/Key.asset b/Reach/Assets/Resources/ScriptableObjects/Key.asset
@@ -12,5 +12,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 02b6ea22f9b791d4da3a1c53e2fa16bc, type: 3}
   m_Name: Key
   m_EditorClassIdentifier: 
-  Image: {fileID: 21300000, guid: cc1c63ff9e23bda4db5ab348ea77f745, type: 3}
+  Image: {fileID: 21300000, guid: b6c38b7cb25735d4d9c129059f322f0c, type: 3}
   DestroyOnSuccessfulUse: 1
diff --git a/Reach/Assets/Scenes/Island 1/Room02.unity b/Reach/Assets/Scenes/Island 1/Room02.unity
@@ -6563,11 +6563,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
       propertyPath: m_LocalPosition.x
-      value: 0.44378817
+      value: 0.331
       objectReference: {fileID: 0}
     - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.63
+      value: -0.901
       objectReference: {fileID: 0}
     - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
       propertyPath: m_LocalPosition.z
@@ -6607,11 +6607,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
       propertyPath: m_LocalScale.x
-      value: 0.6
+      value: 0.5396778
       objectReference: {fileID: 0}
     - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
       propertyPath: m_LocalScale.y
-      value: 0.6
+      value: 0.5396778
+      objectReference: {fileID: 0}
+    - target: {fileID: 6929481858191439099, guid: 851284c57957c5041943a682efe54c2b, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.89946294
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 851284c57957c5041943a682efe54c2b, type: 3}

diff --git a/Reach/Assets/Scenes/Island 1/Room03.unity b/Reach/Assets/Scenes/Island 1/Room03.unity
@@ -146,6 +146,10 @@ PrefabInstance:
       propertyPath: VideoplayerCanvas
       value: 
       objectReference: {fileID: 151041304}
+    - target: {fileID: 788764406767137193, guid: 75093d6471b75514ab85b6285261833a, type: 3}
+      propertyPath: transitionTime
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 3085736429949442946, guid: 75093d6471b75514ab85b6285261833a, type: 3}
       propertyPath: m_LocalPosition.x
       value: -4.563352
@@ -1801,7 +1805,7 @@ MonoBehaviour:
   changeSprite: 1
   sprite: {fileID: 21300000, guid: c27b60761ede84c48a0c1da5365e9ee9, type: 3}
   LevelName: Room04
-  IsDoorLocked: 1
+  IsDoorLocked: 0
   KeyGameobject: Boat
   KeyProperty: HasOar
   PlayCutscene: 1
@@ -2050,7 +2054,7 @@ VideoPlayer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1569246741}
   m_Enabled: 1
-  m_VideoClip: {fileID: 32900000, guid: 56694af116a64b24cba81957709aa795, type: 3}
+  m_VideoClip: {fileID: 32900000, guid: 06c868d6fd7211e49970e9512bbaa75a, type: 3}
   m_TargetCameraAlpha: 1
   m_TargetCamera3DLayout: 0
   m_TargetCamera: {fileID: 0}
@@ -2073,7 +2077,7 @@ VideoPlayer:
   m_ControlledAudioTrackCount: 1
   m_PlayOnAwake: 0
   m_SkipOnDrop: 1
-  m_Looping: 1
+  m_Looping: 0
   m_WaitForFirstFrame: 1
   m_FrameReadyEventEnabled: 0
   m_VideoShaders: []

diff --git a/Reach/Assets/Scenes/Island 2/Room04.unity b/Reach/Assets/Scenes/Island 2/Room04.unity
@@ -2117,6 +2117,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   GameobjectToReceive: {fileID: 2077521016}
   DistanceForCollision: 1
+  Popup: {fileID: 1919400774}
 --- !u!1 &1727590568
 GameObject:
   m_ObjectHideFlags: 0
@@ -2492,7 +2493,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1919400774
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/Reach/Assets/Scenes/Island 2/Room06.unity b/Reach/Assets/Scenes/Island 2/Room06.unity
@@ -903,6 +903,63 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &597334005
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 597334006}
+  - component: {fileID: 597334007}
+  m_Layer: 8
+  m_Name: SceneObstacleRight
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &597334006
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 597334005}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 7.69, y: -2.83, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1047856216}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &597334007
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 597334005}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.007102728, y: 0.09943843}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.0142055, y: 2.8467164}
+  m_EdgeRadius: 0
 --- !u!1 &603377160
 GameObject:
   m_ObjectHideFlags: 0
@@ -1712,6 +1769,8 @@ Transform:
   - {fileID: 1886246610}
   - {fileID: 902826327}
   - {fileID: 2146321002}
+  - {fileID: 597334006}
+  - {fileID: 2056574712}
   m_Father: {fileID: 990577108}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2946,6 +3005,63 @@ SpriteRenderer:
   m_WasSpriteAssigned: 1
   m_MaskInteraction: 0
   m_SpriteSortPoint: 0
+--- !u!1 &2056574711
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2056574712}
+  - component: {fileID: 2056574713}
+  m_Layer: 8
+  m_Name: SceneObstacleLeft
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2056574712
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2056574711}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -8.57, y: -2.83, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 1047856216}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!61 &2056574713
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2056574711}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: -0.007102728, y: 0.09943843}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1.0142055, y: 2.8467164}
+  m_EdgeRadius: 0
 --- !u!1 &2088156907
 GameObject:
   m_ObjectHideFlags: 0

diff --git a/Reach/Assets/Scenes/Island 2/Room09.unity b/Reach/Assets/Scenes/Island 2/Room09.unity
@@ -3597,7 +3597,7 @@ MonoBehaviour:
   ItemNeeded: {fileID: 11400000, guid: ccbc2e322c6ae254ba8a753ed9c90a8e, type: 2}
   changeSprite: 1
   sprite: {fileID: 21300000, guid: 00921bb8cb1b9ae4bb437c660cb2e907, type: 3}
-  LevelName: Room01
+  LevelName: Room04
   IsDoorLocked: 1
   KeyGameobject: door
   KeyProperty: HasKey