diff --git a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta
index 8d136d6..8e150b7 100644
--- a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta
+++ b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock01.fbx.meta
@@ -1,7 +1,11 @@
fileFormatVersion: 2
guid: 8f059788f09129548819124918076d2e
ModelImporter:
+<<<<<<< HEAD
serializedVersion: 23
+=======
+ serializedVersion: 22
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@@ -40,10 +44,16 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
+<<<<<<< HEAD
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
+=======
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@@ -61,16 +71,22 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
+<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
+<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@@ -85,6 +101,10 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
+<<<<<<< HEAD
+=======
+ rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
diff --git a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta
index 971dd96..18fef5c 100644
--- a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta
+++ b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestBlock02.fbx.meta
@@ -1,7 +1,11 @@
fileFormatVersion: 2
guid: 481b9e0107aab3041b49f72c38151e69
ModelImporter:
+<<<<<<< HEAD
serializedVersion: 23
+=======
+ serializedVersion: 22
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@@ -40,10 +44,16 @@ ModelImporter:
isReadable: 1
meshes:
lODScreenPercentages: []
+<<<<<<< HEAD
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
+=======
+ globalScale: 1
+ meshCompression: 0
+ addColliders: 0
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@@ -61,16 +71,22 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
+<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
+<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@@ -85,6 +101,10 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
+<<<<<<< HEAD
+=======
+ rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
diff --git a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta
index b709d38..4650051 100644
--- a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta
+++ b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround01.fbx.meta
@@ -1,7 +1,11 @@
fileFormatVersion: 2
guid: f9fc7ec022f09a6418b1b6f97f0c887b
ModelImporter:
+<<<<<<< HEAD
serializedVersion: 23
+=======
+ serializedVersion: 22
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@@ -43,7 +47,10 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
+<<<<<<< HEAD
useSRGBMaterialColor: 1
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@@ -61,16 +68,22 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
+<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
+<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@@ -85,6 +98,10 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
+<<<<<<< HEAD
+=======
+ rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
diff --git a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta
index 6614b55..eb267b0 100644
--- a/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta
+++ b/Assets/AurynSky/ArenaPacks/Forest Pack/Models/ForestGround02.fbx.meta
@@ -1,7 +1,11 @@
fileFormatVersion: 2
guid: caca2dfcd7da619408439605ff0667a4
ModelImporter:
+<<<<<<< HEAD
serializedVersion: 23
+=======
+ serializedVersion: 22
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
@@ -43,7 +47,10 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
+<<<<<<< HEAD
useSRGBMaterialColor: 1
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importVisibility: 1
importBlendShapes: 1
importCameras: 1
@@ -61,16 +68,22 @@ ModelImporter:
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
+<<<<<<< HEAD
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
+<<<<<<< HEAD
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
+=======
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
importAnimation: 1
copyAvatar: 0
humanDescription:
@@ -85,6 +98,10 @@ ModelImporter:
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
+<<<<<<< HEAD
+=======
+ rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+>>>>>>> 8d80f0bb3295bbde9d72a4f81e2d8e803cbe8f2e
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
diff --git a/Assets/MainMenuBackground.jpg.meta b/Assets/MainMenuBackground.jpg.meta
index 3921891..e287147 100644
--- a/Assets/MainMenuBackground.jpg.meta
+++ b/Assets/MainMenuBackground.jpg.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 9
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: -1
- wrapV: -1
+ wrapU: 1
+ wrapV: 1
wrapW: -1
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@@ -69,6 +69,61 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Windows Store Apps
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
diff --git a/Assets/Prefabs/UI/Block Menu.prefab b/Assets/Prefabs/UI/Block Menu.prefab
index e257dae..a848130 100644
--- a/Assets/Prefabs/UI/Block Menu.prefab
+++ b/Assets/Prefabs/UI/Block Menu.prefab
@@ -370,7 +370,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6379596650414839114}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -7}
+ m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6379596650071129988}
diff --git a/Assets/Scenes/TuteLevelFive.unity b/Assets/Scenes/TuteLevelFive.unity
index f3b7f43..235e512 100644
--- a/Assets/Scenes/TuteLevelFive.unity
+++ b/Assets/Scenes/TuteLevelFive.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {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
--- !u!157 &3
LightmapSettings:
@@ -162,17 +162,21 @@ PrefabInstance:
propertyPath: m_Name
value: ForestTreeAppleShort
objectReference: {fileID: 0}
+ - target: {fileID: 1296487970245184, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_LocalPosition.x
- value: 0
+ value: 0.445
objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_LocalPosition.y
- value: -0.5
+ value: -0.54
objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_LocalPosition.z
- value: -1.172
+ value: -0.821
objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_LocalRotation.x
@@ -192,7 +196,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_RootOrder
- value: 64
+ value: 63
objectReference: {fileID: 0}
- target: {fileID: 4958913941910646, guid: f4f82206765cef54ca8f19ce34136e8a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -836,7 +840,7 @@ PrefabInstance:
- target: {fileID: 5195354182462625300, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 5195354182462625304, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
@@ -986,12 +990,12 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.00006866455
+ value: 0.000011227485
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_SizeDelta.y
- value: -101.69998
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
@@ -1696,7 +1700,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_RootOrder
- value: 48
+ value: 47
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1997,11 +2001,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a,
- type: 3}
- propertyPath: m_Enabled
- value: 1
- objectReference: {fileID: 0}
- target: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: nextScene
@@ -2034,6 +2033,11 @@ PrefabInstance:
value:
objectReference: {fileID: 11400000, guid: 57948efb1cd9603419511d2dd2eabc3d,
type: 2}
+ - target: {fileID: 2631002120179805110, guid: c176f4ae8f7b4074db99b27b2e015a2a,
+ type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: blockReader.LogicChain.Array.size
@@ -2044,6 +2048,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
+ type: 3}
+ propertyPath: waitTime
+ value: 0.5
+ objectReference: {fileID: 0}
- target: {fileID: 1116712125457233699, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
propertyPath: m_Materials.Array.data[0]
@@ -3111,81 +3120,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3}
---- !u!1001 &781490226
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 821954416}
- m_Modifications:
- - target: {fileID: 1641819918252310, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_Name
- value: ForestGroundDirt
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalPosition.x
- value: -1
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalPosition.y
- value: -1
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalPosition.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalRotation.x
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalRotation.y
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalRotation.z
- value: -0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_RootOrder
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalScale.x
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalScale.y
- value: 0.5
- objectReference: {fileID: 0}
- - target: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
- propertyPath: m_LocalScale.z
- value: 0.5
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: 13f1670c2e187874784d0f667f9057f5, type: 3}
---- !u!4 &781490227 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 4838866880481952, guid: 13f1670c2e187874784d0f667f9057f5,
- type: 3}
- m_PrefabInstance: {fileID: 781490226}
- m_PrefabAsset: {fileID: 0}
--- !u!1001 &803111960
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3375,7 +3309,6 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1632707217}
- - {fileID: 781490227}
- {fileID: 532960376}
- {fileID: 231436929}
- {fileID: 879007887}
@@ -3391,7 +3324,6 @@ Transform:
- {fileID: 1109703293}
- {fileID: 1876398928}
- {fileID: 693809537}
- - {fileID: 703910628}
- {fileID: 860231175}
- {fileID: 861263973}
- {fileID: 853978170}
@@ -3405,6 +3337,7 @@ Transform:
- {fileID: 1761352397}
- {fileID: 1345966486}
- {fileID: 531347386}
+ - {fileID: 703910628}
- {fileID: 1694299}
- {fileID: 1231722610}
- {fileID: 1749089644}
@@ -3416,16 +3349,16 @@ Transform:
- {fileID: 371645816}
- {fileID: 1486714795}
- {fileID: 2053586745}
- - {fileID: 1917117044}
- {fileID: 1448554373}
- {fileID: 1132672705}
+ - {fileID: 1917117044}
- {fileID: 1903567338}
- {fileID: 574177568}
- {fileID: 1478305553}
- {fileID: 417311776}
- {fileID: 1993257728}
- - {fileID: 900568607}
- {fileID: 145025246}
+ - {fileID: 900568607}
- {fileID: 202511529}
- {fileID: 164333534}
- {fileID: 265791555}
@@ -4224,7 +4157,7 @@ PrefabInstance:
- target: {fileID: 7103365430685043221, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 7103365430685043225, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
@@ -4341,11 +4274,6 @@ PrefabInstance:
propertyPath: m_RenderMode
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c,
- type: 3}
- propertyPath: m_AnchoredPosition.y
- value: -16
- objectReference: {fileID: 0}
- target: {fileID: 7103365429638758419, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -4356,13 +4284,6 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: OnPlayClick
objectReference: {fileID: 0}
- - target: {fileID: 7103365429884932622, guid: 80a26ed87f729434abe07a722ef15e7c,
- type: 3}
- propertyPath: m_Text
- value: 'Welcome To Tutorial
-
- Level Five'
- objectReference: {fileID: 0}
- target: {fileID: 7103365430021195166, guid: 80a26ed87f729434abe07a722ef15e7c,
type: 3}
propertyPath: m_Text
@@ -4371,6 +4292,18 @@ PrefabInstance:
and drop the move block to the tray and click play to watch the character
move"
objectReference: {fileID: 0}
+ - target: {fileID: 7103365430021195167, guid: 80a26ed87f729434abe07a722ef15e7c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -16
+ objectReference: {fileID: 0}
+ - target: {fileID: 7103365429884932622, guid: 80a26ed87f729434abe07a722ef15e7c,
+ type: 3}
+ propertyPath: m_Text
+ value: 'Welcome To Tutorial
+
+ Level Five'
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 80a26ed87f729434abe07a722ef15e7c, type: 3}
--- !u!1 &1117427231 stripped
@@ -4468,17 +4401,21 @@ PrefabInstance:
propertyPath: m_Name
value: ForestGrass01
objectReference: {fileID: 0}
+ - target: {fileID: 1685531937540468, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.x
value: -1.071
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -0.377
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.z
- value: -1.494
+ value: -1.1429999
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalRotation.x
@@ -4498,7 +4435,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_RootOrder
- value: 65
+ value: 64
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -4816,7 +4753,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3}
propertyPath: m_RootOrder
- value: 17
+ value: 16
objectReference: {fileID: 0}
- target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6083,7 +6020,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3}
propertyPath: m_RootOrder
- value: 43
+ value: 42
objectReference: {fileID: 0}
- target: {fileID: 4310614304489658, guid: 5cbae0602ce9acf41a98fda3a353569a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6211,7 +6148,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_RootOrder
- value: 42
+ value: 41
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6482,7 +6419,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_RootOrder
- value: 50
+ value: 49
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -6665,7 +6602,7 @@ PrefabInstance:
- target: {fileID: 6379596649083080720, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6379596649083080716, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,
type: 3}
@@ -7291,17 +7228,21 @@ PrefabInstance:
propertyPath: m_Name
value: ForestGrass01 (1)
objectReference: {fileID: 0}
+ - target: {fileID: 1685531937540468, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.x
value: -0.738
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -0.377
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalPosition.z
- value: -1.066
+ value: -0.7149999
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalRotation.x
@@ -7321,7 +7262,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_RootOrder
- value: 66
+ value: 65
objectReference: {fileID: 0}
- target: {fileID: 4259080689594872, guid: 6c919ec1c1e88a94c95afc28b198b9f8, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -7478,7 +7419,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_RootOrder
- value: 51
+ value: 50
objectReference: {fileID: 0}
- target: {fileID: 4482437886289408, guid: 1d9cc67243350f643b8c562ed0503c49, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
diff --git a/Assets/Scenes/TuteLevelOne.unity b/Assets/Scenes/TuteLevelOne.unity
index d7e452d..140bb3b 100644
--- a/Assets/Scenes/TuteLevelOne.unity
+++ b/Assets/Scenes/TuteLevelOne.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {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
--- !u!157 &3
LightmapSettings:
@@ -958,7 +958,7 @@ PrefabInstance:
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -0.000025968364
+ value: 0.000011720804
objectReference: {fileID: 0}
- target: {fileID: 5195354181806561359, guid: 3fbc9b76d5c4f7348b60a029bc2ba63f,
type: 3}
@@ -1914,6 +1914,11 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6815585465521158857, guid: c176f4ae8f7b4074db99b27b2e015a2a,
+ type: 3}
+ propertyPath: waitTime
+ value: 1.5
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3}
--- !u!114 &1271739762 stripped
diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs
index f4f4a4a..cb4adf3 100644
--- a/Assets/Scripts/Character.cs
+++ b/Assets/Scripts/Character.cs
@@ -45,13 +45,29 @@ public class Character : MonoBehaviour
#region Class Implementation
+
+ IEnumerator MoveCoRoutine(Block Target, Transform Current, float time)
+ {
+ float elapsedTime = 0;
+ Vector3 startPosition = Current.position;
+ time *= 0.8f;
+ while (elapsedTime < time)
+ {
+ transform.position = Vector3.Lerp(startPosition, Target.VisualPosition, (elapsedTime / time));
+ yield return new WaitForEndOfFrame();
+ elapsedTime += Time.deltaTime;
+ }
+ transform.position = Target.VisualPosition;
+ }
+
+
///
/// Moves one block in specefied direction, Can walk off obstacles
///
/// direction to walk
/// Technically is same as JumpLong(1) but kept seperate to avoid confusion
- public void Move(Direction direction)
- {
+ public void Move(Direction direction, float speed)
+ {
//setting up variables
Vector3 position = CurrentBlock.position + direction.ToVector(transform); // position wanted
Block hit; //output of block detection
@@ -71,15 +87,18 @@ public class Character : MonoBehaviour
//set current block && move
CurrentBlock = moveTo;
- transform.position = CurrentBlock.VisualPosition;
+ StartCoroutine(MoveCoRoutine(CurrentBlock, transform, speed));
+ //transform.position = CurrentBlock.VisualPosition;
}
- ///
- /// Upon collision with a floating block, collect its
- /// Upon collision with the end portal, end of level
- ///
- /// name of collided object
- void OnTriggerEnter(Collider other)
+
+
+ ///
+ /// Upon collision with a floating block, collect its
+ /// Upon collision with the end portal, end of level
+ ///
+ /// name of collided object
+ void OnTriggerEnter(Collider other)
{
Collectable collectable = other.GetComponentInChildren();
diff --git a/Assets/Scripts/KeyboardInput.cs b/Assets/Scripts/KeyboardInput.cs
index 15f8ccd..b172a1d 100644
--- a/Assets/Scripts/KeyboardInput.cs
+++ b/Assets/Scripts/KeyboardInput.cs
@@ -12,6 +12,8 @@ public class KeyboardInput : MonoBehaviour
[SerializeField]
[Tooltip("Character to move")]
private Character character;
+
+ public float characterSpeed;
#endregion Unity Functions
#region Unity Functions
@@ -31,7 +33,7 @@ public class KeyboardInput : MonoBehaviour
}
if (Input.GetKeyDown(KeyCode.UpArrow))
{
- character.Move(Direction.Forward);
+ character.Move(Direction.Forward, characterSpeed);
}
if (Input.GetKeyDown(KeyCode.Space))
{
diff --git a/Assets/start_notification.jpg.meta b/Assets/start_notification.jpg.meta
index 45f8c49..14779db 100644
--- a/Assets/start_notification.jpg.meta
+++ b/Assets/start_notification.jpg.meta
@@ -6,7 +6,7 @@ TextureImporter:
serializedVersion: 9
mipmaps:
mipMapMode: 0
- enableMipMap: 1
+ enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
@@ -34,13 +34,13 @@ TextureImporter:
filterMode: -1
aniso: -1
mipBias: -100
- wrapU: -1
- wrapV: -1
+ wrapU: 1
+ wrapV: 1
wrapW: -1
- nPOTScale: 1
+ nPOTScale: 0
lightmap: 0
compressionQuality: 50
- spriteMode: 0
+ spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
@@ -49,9 +49,9 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
- alphaIsTransparency: 0
+ alphaIsTransparency: 1
spriteTessellationDetail: -1
- textureType: 0
+ textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
@@ -69,6 +69,61 @@ TextureImporter:
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Standalone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: iPhone
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Android
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: Windows Store Apps
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
+ - serializedVersion: 2
+ buildTarget: WebGL
+ maxTextureSize: 2048
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []