Browse Source

Changes during meeting @ rmit

Josh_Dev_branch
Claire Peta 5 years ago
parent
commit
84ef031f23
11 changed files with 3690 additions and 1562 deletions
  1. +7
    -6
      Assets/Scenes/ChickenRunOne.unity
  2. +2
    -2
      Assets/Scenes/ChickenRunTwo.unity
  3. +742
    -459
      Assets/Scenes/ColourCollideOne.unity
  4. +5
    -5
      Assets/Scenes/MainMenu.unity
  5. +2
    -2
      Assets/Scenes/ReCompileRaceOne.unity
  6. +2
    -2
      Assets/Scenes/TuteLevelFive.unity
  7. +162
    -862
      Assets/Scenes/TuteLevelFour.unity
  8. +1799
    -165
      Assets/Scenes/TuteLevelOne.unity
  9. +967
    -57
      Assets/Scenes/TuteLevelTwo.unity
  10. +1
    -1
      Assets/Scripts/ColourCollide.cs
  11. +1
    -1
      Assets/Third Party Assets/KUBIKOS - World/Materials/GroundWGrass_Mat.mat

+ 7
- 6
Assets/Scenes/ChickenRunOne.unity View File

@ -38,13 +38,13 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657683, g: 0.49641192, b: 0.5748182, a: 1}
m_IndirectSpecularColor: {r: 0.44657642, g: 0.49641156, b: 0.5748181, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 11 serializedVersion: 11
m_GIWorkflowMode: 0
m_GIWorkflowMode: 1
m_GISettings: m_GISettings:
serializedVersion: 2 serializedVersion: 2
m_BounceScale: 1 m_BounceScale: 1
@ -88,7 +88,8 @@ LightmapSettings:
m_PVRFilteringAtrousPositionSigmaIndirect: 2 m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1 m_PVRFilteringAtrousPositionSigmaAO: 1
m_ShowResolutionOverlay: 1 m_ShowResolutionOverlay: 1
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: c4c08eceab048774b8d2885f7bf01283,
type: 2}
m_UseShadowmask: 1 m_UseShadowmask: 1
--- !u!196 &4 --- !u!196 &4
NavMeshSettings: NavMeshSettings:
@ -9101,7 +9102,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &1624432373 --- !u!114 &1624432373
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11584,8 +11585,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -10, y: -10}
m_SizeDelta: {x: -20, y: 20}
m_AnchoredPosition: {x: -11, y: -12}
m_SizeDelta: {x: -22, y: 20}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2033429592 --- !u!114 &2033429592
MonoBehaviour: MonoBehaviour:

+ 2
- 2
Assets/Scenes/ChickenRunTwo.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -11674,7 +11674,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &1203910560 --- !u!4 &1203910560
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 742
- 459
Assets/Scenes/ColourCollideOne.unity
File diff suppressed because it is too large
View File


+ 5
- 5
Assets/Scenes/MainMenu.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 170076734} m_Sun: {fileID: 170076734}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -410,7 +410,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &143955581 --- !u!4 &143955581
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1562,7 +1562,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &532262370 --- !u!114 &532262370
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1989,7 +1989,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &641750520 --- !u!4 &641750520
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -5696,7 +5696,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!114 &2128700972 --- !u!114 &2128700972
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 2
- 2
Assets/Scenes/ReCompileRaceOne.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -5751,7 +5751,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!114 &1271337200 --- !u!114 &1271337200
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 2
- 2
Assets/Scenes/TuteLevelFive.unity View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -5274,7 +5274,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295 m_StaticEditorFlags: 4294967295
m_IsActive: 1
m_IsActive: 0
--- !u!23 &1556019606 --- !u!23 &1556019606
MeshRenderer: MeshRenderer:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 162
- 862
Assets/Scenes/TuteLevelFour.unity
File diff suppressed because it is too large
View File


+ 1799
- 165
Assets/Scenes/TuteLevelOne.unity
File diff suppressed because it is too large
View File


+ 967
- 57
Assets/Scenes/TuteLevelTwo.unity
File diff suppressed because it is too large
View File


+ 1
- 1
Assets/Scripts/ColourCollide.cs View File

@ -19,7 +19,7 @@ public class ColourCollide : MonoBehaviour
abc = CurrentBlock.GetComponent<Renderer>(); abc = CurrentBlock.GetComponent<Renderer>();
if(abc.material != newTexture){ if(abc.material != newTexture){
abc.material.SetTexture("_MainTex", newTexture);
abc.material.SetTexture("_Albedo", newTexture);
} }
} }
} }

+ 1
- 1
Assets/Third Party Assets/KUBIKOS - World/Materials/GroundWGrass_Mat.mat View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: GroundWGrass_Mat m_Name: GroundWGrass_Mat
m_Shader: {fileID: 4800000, guid: db493d1f180f23c43a06dc37f91998a7, type: 3}
m_Shader: {fileID: 4800000, guid: 4578e9fc29f326b43af42d43ea0a245e, type: 3}
m_ShaderKeywords: _NORMALMAP _SPECGLOSSMAP m_ShaderKeywords: _NORMALMAP _SPECGLOSSMAP
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0

Loading…
Cancel
Save