Conjure/EscapeTheRoom
6
0
Fork 0
mirror of https://github.com/ConjureETS/EscapeTheRoom.git synced 2026-03-24 09:10:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ETSConjure/EscapeTheRoom

Browse Source
This commit is contained in:
max89max 2015-11-08 18:08:42 +01:00
commit 5d14886ea2
5 changed files with 6 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Assets/Scenes/PatScene.unity
View File

@ -466,7 +466,7 @@ Prefab:
m_Modifications: m_Modifications:
- target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2} - target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -.185000002 value: -.114
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2} - target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
@ -474,7 +474,7 @@ Prefab:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2} - target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2} - target: {fileID: 419770, guid: 69061867cac74f14badaa57b01070f97, type: 2}
propertyPath: m_LocalRotation.x propertyPath: m_LocalRotation.x
@ -1282,7 +1282,7 @@ Transform:
m_PrefabParentObject: {fileID: 400056, guid: 4fed9d0bf3595254ba35890c3fd49728, type: 3} m_PrefabParentObject: {fileID: 400056, guid: 4fed9d0bf3595254ba35890c3fd49728, type: 3}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1416680805} m_GameObject: {fileID: 1416680805}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: .469086319, z: 0, w: .883152306}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children: m_Children:
@ -2202,8 +2202,8 @@ Transform:
m_PrefabParentObject: {fileID: 0} m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1925818716} m_GameObject: {fileID: 1925818716}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 1, z: 0, w: -1.62920685e-07}
m_LocalPosition: {x: .75999999, y: -.709999979, z: 1.08000004} m_LocalPosition: {x: .75999999, y: -.800000012, z: 1.08000004}
m_LocalScale: {x: .349999994, y: .5, z: .100000001} m_LocalScale: {x: .349999994, y: .5, z: .100000001}
m_Children: m_Children:
- {fileID: 2142871351} - {fileID: 2142871351}

2
Assets/Scripts/FlickeringLight.cs
View File

@ -13,8 +13,6 @@ public class FlickeringLight : MonoBehaviour
float range = MaxIntensity - MinIntensity; float range = MaxIntensity - MinIntensity;
float AverageIntensity = MinIntensity + range / 2; float AverageIntensity = MinIntensity + range / 2;
Debug.Log(Mathf.Sin(Time.timeSinceLevelLoad));
PointLight.intensity = Random.Range(MinIntensity, MaxIntensity); PointLight.intensity = Random.Range(MinIntensity, MaxIntensity);
} }
} }

9
Assets/Sound.meta
View File

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: e2839cc8e19d8dc4098d710783dbac88
folderAsset: yes
timeCreated: 1446922484
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

7
Assets/Standard Assets/Characters/PhysicsMaterials.meta
View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: ea2a5216ffb8d4b319d09e8d7782120c
folderAsset: yes
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

2
ProjectSettings/ProjectVersion.txt
View File

@ -1,2 +1,2 @@
m_EditorVersion: 5.2.0f3 m_EditorVersion: 5.2.2f1
m_StandardAssetsVersion: 0 m_StandardAssetsVersion: 0