Conjure/OuijaMTLGJ2016
6
0
Fork 0
mirror of https://github.com/ConjureETS/OuijaMTLGJ2016.git synced 2026-03-24 02:01:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

dammit merge undid my tweaks

Browse Source
This commit is contained in:
Dmitri Kolytchev 2016-01-31 13:51:49 -05:00
parent 1328c75351
commit 1ad03a8d4b
1 changed files with 49 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
Assets/scenes/GameplayScene.unity
View File

@ -8,25 +8,25 @@ SceneSettings:
m_PVSPortalsArray: []
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
smallestHole: .25
backfaceThreshold: 100
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogColor: {r: .5, g: .5, b: .5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_FogDensity: .00999999978
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientSkyColor: {r: .211999997, g: .226999998, b: .259000003, a: 1}
m_AmbientEquatorColor: {r: .114, g: .125, b: .133000001, a: 1}
m_AmbientGroundColor: {r: .0469999984, g: .0430000015, b: .0350000001, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 3
m_SkyboxMaterial: {fileID: 0}
m_HaloStrength: 0.5
m_HaloStrength: .5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
@ -40,7 +40,7 @@ RenderSettings:
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 5
m_GIWorkflowMode: 1
m_LightmapsMode: 1
m_GISettings:
@ -65,8 +65,7 @@ LightmapSettings:
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherRayCount: 1024
m_ReflectionCompression: 2
m_LightingDataAsset: {fileID: 0}
m_LightmapSnapshot: {fileID: 0}
m_RuntimeCPUUsage: 25
--- !u!196 &4
NavMeshSettings:
@ -74,17 +73,20 @@ NavMeshSettings:
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentRadius: 0.5
agentRadius: .5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
agentClimb: .400000006
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
accuratePlacement: 0
minRegionArea: 2
cellSize: 0.16666667
cellSize: .166666672
manualCellSize: 0
m_NavMeshData: {fileID: 0}
--- !u!127 &5
LevelGameManager:
m_ObjectHideFlags: 0
--- !u!1 &16934334
GameObject:
m_ObjectHideFlags: 0
@ -107,8 +109,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 16934334}
m_LocalRotation: {x: 0.6126533, y: 0.073924825, z: 0.057699904, w: 0.7847687}
m_LocalPosition: {x: 9.189259, y: 3.0768213, z: 4.390993}
m_LocalRotation: {x: .612653315, y: .0739248246, z: .0576999038, w: .784768701}
m_LocalPosition: {x: 9.18925858, y: 3.07682133, z: 4.39099312}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1944057160}
@ -122,8 +124,8 @@ Light:
m_Enabled: 1
serializedVersion: 6
m_Type: 1
m_Color: {r: 0.43777904, g: 0.40900737, b: 0.6544118, a: 1}
m_Intensity: 0.16
m_Color: {r: .437779039, g: .40900737, b: .654411793, a: 1}
m_Intensity: .159999996
m_Range: 10
m_SpotAngle: 30
m_CookieSize: 10
@ -131,9 +133,8 @@ Light:
m_Type: 0
m_Resolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_Bias: .0500000007
m_NormalBias: .400000006
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
@ -181,8 +182,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 201485588}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 11.56, y: 1.4620001, z: 9.34}
m_LocalScale: {x: 0.2, y: 6, z: 16}
m_LocalPosition: {x: 11.5600004, y: 1.46200013, z: 9.34000015}
m_LocalScale: {x: .200000003, y: 6, z: 16}
m_Children: []
m_Father: {fileID: 1944057160}
m_RootOrder: 6
@ -320,9 +321,9 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 335385616}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071067}
m_LocalPosition: {x: 4.66, y: 1.4620001, z: 13.29}
m_LocalScale: {x: 0.2, y: 6, z: 18}
m_LocalRotation: {x: 0, y: .707106829, z: 0, w: .707106709}
m_LocalPosition: {x: 4.65999985, y: 1.46200013, z: 13.29}
m_LocalScale: {x: .200000003, y: 6, z: 18}
m_Children: []
m_Father: {fileID: 1944057160}
m_RootOrder: 5
@ -501,7 +502,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 867116874}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.3, z: 0}
m_LocalPosition: {x: 0, y: -.300000012, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -567,14 +568,14 @@ Camera:
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844}
m_BackGroundColor: {r: .192156866, g: .301960796, b: .474509805, a: .0196078438}
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
near clip plane: .300000012
far clip plane: 1000
field of view: 60
orthographic: 0
@ -586,11 +587,10 @@ Camera:
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &1008797119
Transform:
@ -598,8 +598,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1008797114}
m_LocalRotation: {x: 0.3607295, y: 0.00000007615856, z: 0.00000007615856, w: 0.9326705}
m_LocalPosition: {x: 0.45, y: 15.18, z: -3.75}
m_LocalRotation: {x: .360729486, y: 7.61585568e-08, z: 7.61585568e-08, w: .932670474}
m_LocalPosition: {x: .449999988, y: 15.1800003, z: -3.75}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -655,7 +655,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1018231122}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.66663116, y: 0.14544322, z: 0}
m_LocalPosition: {x: .666631162, y: .145443216, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
@ -699,6 +699,10 @@ Prefab:
propertyPath: m_RootOrder
value: 9
objectReference: {fileID: 0}
- target: {fileID: 11451600, guid: 10be2fb46e4285942b2957ae293fd714, type: 2}
propertyPath: offset
value: 70
objectReference: {fileID: 0}
m_RemovedComponents: []
m_ParentPrefab: {fileID: 100100000, guid: 10be2fb46e4285942b2957ae293fd714, type: 2}
m_IsPrefabParent: 0
@ -723,8 +727,8 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1058309221}
m_LocalRotation: {x: 0, y: 0.4984878, z: 0, w: 0.86689675}
m_LocalPosition: {x: 0.4980679, y: 1.08, z: 11.70253}
m_LocalRotation: {x: 0, y: .4984878, z: 0, w: .866896749}
m_LocalPosition: {x: .498067886, y: 1.08000004, z: 11.7025299}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1296647346}
@ -760,14 +764,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0659941834f628445b182d075f37a958, type: 3}
m_Name:
m_EditorClassIdentifier:
xScale: 2.8
yScale: 2.8
xScale: 2.79999995
yScale: 2.79999995
colSpacing: 0
rowSpacing: 0
dimension: 1
hexagon: {fileID: 118646, guid: 950731e814d3ade4c91c128681c35ce2, type: 2}
PlayerColors:
- {r: 0.44827592, g: 1, b: 0, a: 1}
- {r: .448275924, g: 1, b: 0, a: 1}
- {r: 1, g: 0, b: 0, a: 1}
- {r: 0, g: 0, b: 0, a: 1}
--- !u!4 &1173224168
@ -776,7 +780,7 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1173224166}
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071067}
m_LocalRotation: {x: .707106829, y: 0, z: 0, w: .707106709}
m_LocalPosition: {x: -23, y: -0, z: 10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
@ -1284,9 +1288,9 @@ Transform:
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1374790521}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071067}
m_LocalPosition: {x: 4.66, y: 1.4620001, z: 2.7}
m_LocalScale: {x: 0.2, y: 6, z: 18}
m_LocalRotation: {x: 0, y: .707106829, z: 0, w: .707106709}
m_LocalPosition: {x: 4.65999985, y: 1.46200013, z: 2.70000005}
m_LocalScale: {x: .200000003, y: 6, z: 18}
m_Children: []
m_Father: {fileID: 1944057160}
m_RootOrder: 4
@ -1801,8 +1805,8 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1727379601}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.94, y: 1.4620001, z: 9.34}
m_LocalScale: {x: 0.2, y: 6, z: 16}
m_LocalPosition: {x: -1.94000006, y: 1.46200013, z: 9.34000015}
m_LocalScale: {x: .200000003, y: 6, z: 16}
m_Children: []
m_Father: {fileID: 1944057160}
m_RootOrder: 7
@ -2334,7 +2338,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1944057159}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -23.3, y: 8.49, z: -22.1}
m_LocalPosition: {x: -23.2999992, y: 8.48999977, z: -22.1000004}
m_LocalScale: {x: 5, y: 5, z: 5}
m_Children:
- {fileID: 16934335}