Browse Source

fonoshed Fixed tutorial pickup

Josh_Dev_branch
JoshuaReason 5 years ago
parent
commit
0e1cb55652
19 changed files with 218 additions and 192 deletions
  1. +0
    -8
      Assets/Logic Blocks.meta
  2. +0
    -3
      Assets/Logic Blocks/ForLoop.asset
  3. +0
    -8
      Assets/Logic Blocks/ForLoop.asset.meta
  4. +0
    -3
      Assets/Logic Blocks/Jump.asset
  5. +0
    -8
      Assets/Logic Blocks/Jump.asset.meta
  6. +0
    -3
      Assets/Logic Blocks/Move x2.asset
  7. +0
    -8
      Assets/Logic Blocks/Move x2.asset.meta
  8. +0
    -3
      Assets/Logic Blocks/Move.asset
  9. +0
    -8
      Assets/Logic Blocks/Move.asset.meta
  10. +0
    -3
      Assets/Logic Blocks/Rotate Left.asset
  11. +0
    -8
      Assets/Logic Blocks/Rotate Left.asset.meta
  12. +0
    -3
      Assets/Logic Blocks/Rotate Right.asset
  13. +0
    -8
      Assets/Logic Blocks/Rotate Right.asset.meta
  14. +15
    -0
      Assets/Prefabs/UI/Single_Player Canvas.prefab
  15. +35
    -18
      Assets/Scenes/TuteLevelFive.unity
  16. +46
    -29
      Assets/Scenes/TuteLevelFour.unity
  17. +20
    -3
      Assets/Scenes/TuteLevelOne.unity
  18. +48
    -31
      Assets/Scenes/TuteLevelThree.unity
  19. +54
    -37
      Assets/Scenes/TuteLevelTwo.unity

+ 0
- 8
Assets/Logic Blocks.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4a735889677105942be7b151afec44b8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/ForLoop.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:815e838d40fc858ba3fca1d9f6ac75c76fdd5b6e1859a7145c142a7f636d3a5f
size 616

+ 0
- 8
Assets/Logic Blocks/ForLoop.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 02fe4498942f4dc4793eac71fb71f798
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/Jump.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4b1a4c27ea4794695f72f8d3f5d345c28103a2b6cc53e67b8f24f0757617b5e7
size 449

+ 0
- 8
Assets/Logic Blocks/Jump.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: dcf80d6bc49692f4d849f5afb0d05911
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/Move x2.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:6cd2eb3de9510a6319b174a92b11d1966b6f1bf6258b95c60b88af35c2666499
size 437

+ 0
- 8
Assets/Logic Blocks/Move x2.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4fb70ab7e566937488ae0147ee196462
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/Move.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8f30f384f120eeb69292d9ff04a9e267e536ef80a35c6a7820a032e88257d9e8
size 434

+ 0
- 8
Assets/Logic Blocks/Move.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 25644a0d74897374aa41f8ef383c2ae0
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/Rotate Left.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:323f3c70cf40755730cb81a31da6a58931177674b836d0b5bbc8b9f88af4b447
size 456

+ 0
- 8
Assets/Logic Blocks/Rotate Left.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 4f23e55aecdb22443a7451e7a72c879d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 0
- 3
Assets/Logic Blocks/Rotate Right.asset View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:a6886b6e048617b3ecd1de69b35f0e598467d7d2444a59a26f58fcb16a988960
size 457

+ 0
- 8
Assets/Logic Blocks/Rotate Right.asset.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 51fdbaf21c006cb4d8ff078522b03fec
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

+ 15
- 0
Assets/Prefabs/UI/Single_Player Canvas.prefab View File

@ -813,6 +813,7 @@ GameObject:
- component: {fileID: 5365616971329014537} - component: {fileID: 5365616971329014537}
- component: {fileID: 1769291156453427640} - component: {fileID: 1769291156453427640}
- component: {fileID: 1774819982393099990} - component: {fileID: 1774819982393099990}
- component: {fileID: 6048124330666411029}
m_Layer: 5 m_Layer: 5
m_Name: Single_Player Canvas m_Name: Single_Player Canvas
m_TagString: Untagged m_TagString: Untagged
@ -918,6 +919,20 @@ MonoBehaviour:
AnimationSpeed: 0.7 AnimationSpeed: 0.7
TrayUI: {fileID: 1324620581} TrayUI: {fileID: 1324620581}
characterInput: {fileID: 0} characterInput: {fileID: 0}
--- !u!114 &6048124330666411029
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5195354181466942482}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 86a38bceffea2e34fbdc1a7a8a535207, type: 3}
m_Name:
m_EditorClassIdentifier:
character: {fileID: 0}
inventoryUI: {fileID: 1804173232}
--- !u!1 &6977535679819254998 --- !u!1 &6977535679819254998
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 35
- 18
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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -1283,6 +1283,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
value:
objectReference: {fileID: 421711685}
- target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: characterInput propertyPath: characterInput
@ -1403,21 +1408,6 @@ PrefabInstance:
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 222433593} objectReference: {fileID: 222433593}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5147304212338809448, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:
objectReference: {fileID: 11400000, guid: 57948efb1cd9603419511d2dd2eabc3d,
type: 2}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_AspectRatio propertyPath: m_AspectRatio
@ -1439,12 +1429,27 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -0.000055370114
value: 0.000066908186
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000061035156
value: 0.00006069811
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5147304212338809448, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1804173232, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: inventory
value:
objectReference: {fileID: 11400000, guid: 57948efb1cd9603419511d2dd2eabc3d,
type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &194190227 --- !u!1001 &194190227
@ -3075,6 +3080,18 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3} m_SourcePrefab: {fileID: 100100000, guid: c176f4ae8f7b4074db99b27b2e015a2a, type: 3}
--- !u!114 &421711685 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
m_PrefabInstance: {fileID: 421711684}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73c2eff8a9a01a44bb9b2c007539fc60, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &426450898 stripped --- !u!114 &426450898 stripped
MonoBehaviour: MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9, m_CorrespondingSourceObject: {fileID: 6541614960388078180, guid: 12c252cb33f8c9d41be9fc3a9adb9bb9,

+ 46
- 29
Assets/Scenes/TuteLevelFour.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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -2357,6 +2357,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
value:
objectReference: {fileID: 415070689}
- target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: characterInput propertyPath: characterInput
@ -2477,6 +2482,33 @@ PrefabInstance:
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 1147783794} objectReference: {fileID: 1147783794}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 8.548343
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000015547326
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00001250009
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -2510,33 +2542,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 8.548343
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.00008392334
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00001250009
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &378945308 --- !u!1001 &378945308
@ -3319,6 +3324,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3} m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &415070689 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
m_PrefabInstance: {fileID: 415070687}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73c2eff8a9a01a44bb9b2c007539fc60, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &426411664 --- !u!1001 &426411664
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -9686,7 +9703,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Collectable: Collectable:
element: {fileID: 11400000, guid: 02fe4498942f4dc4793eac71fb71f798, type: 2}
element: {fileID: 11400000, guid: 194f051bd7d3e7d4fb5b96a8e1d5b162, type: 2}
Count: 2 Count: 2
isInfinit: 0 isInfinit: 0
BlockMenu: {fileID: 1724137008} BlockMenu: {fileID: 1724137008}

+ 20
- 3
Assets/Scenes/TuteLevelOne.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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -119,6 +119,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
value:
objectReference: {fileID: 1271739763}
- target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: characterInput propertyPath: characterInput
@ -256,7 +261,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000038146973
value: -0.0000873702
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y propertyPath: m_SizeDelta.y
@ -264,7 +269,7 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} - target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -0.00004675294
value: 0.0000003050884
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
@ -2732,6 +2737,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3} m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &1271739763 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
m_PrefabInstance: {fileID: 1271739761}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73c2eff8a9a01a44bb9b2c007539fc60, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1327355053 --- !u!1001 &1327355053
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

+ 48
- 31
Assets/Scenes/TuteLevelThree.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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0.44657868, g: 0.49641263, b: 0.57481706, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -1927,6 +1927,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3} m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &429586643 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
m_PrefabInstance: {fileID: 429586641}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73c2eff8a9a01a44bb9b2c007539fc60, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &464360060 stripped --- !u!4 &464360060 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291, m_CorrespondingSourceObject: {fileID: 4490970058520500, guid: d7698c69246c64044ab2a94628bf0291,
@ -3979,6 +3991,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
value:
objectReference: {fileID: 429586643}
- target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: characterInput propertyPath: characterInput
@ -4099,6 +4116,33 @@ PrefabInstance:
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 343624471} objectReference: {fileID: 343624471}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 10.91417
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000080553225
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000048803337
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -4114,11 +4158,6 @@ PrefabInstance:
value: value:
objectReference: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d, objectReference: {fileID: 11400000, guid: 26baa66216f4923448239677997ac13d,
type: 2} type: 2}
- target: {fileID: 5195354181466942484, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -16.199997
objectReference: {fileID: 0}
- target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 7379606009448777834, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_havePropertiesChanged propertyPath: m_havePropertiesChanged
@ -4137,32 +4176,10 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 10.91417
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
- target: {fileID: 5195354181466942484, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_isInputParsingRequired
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -0.000027639435
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.00002681424
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
value: -16.199997
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
@ -5041,7 +5058,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Collectable: Collectable:
element: {fileID: 11400000, guid: 51fdbaf21c006cb4d8ff078522b03fec, type: 2}
element: {fileID: 11400000, guid: 41f4cb946475b2849a802a8297d81e25, type: 2}
Count: 0 Count: 0
isInfinit: 0 isInfinit: 0
BlockMenu: {fileID: 2081762624} BlockMenu: {fileID: 2081762624}

+ 54
- 37
Assets/Scenes/TuteLevelTwo.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.4465785, g: 0.49641222, b: 0.57481694, a: 1}
m_IndirectSpecularColor: {r: 0, g: 0, b: 0, 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
@ -347,7 +347,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
Collectable: Collectable:
element: {fileID: 11400000, guid: 4f23e55aecdb22443a7451e7a72c879d, type: 2}
element: {fileID: 11400000, guid: aa238796cf1886244951ec8c2fed1855, type: 2}
Count: 0 Count: 0
isInfinit: 1 isInfinit: 1
BlockMenu: {fileID: 632167809} BlockMenu: {fileID: 632167809}
@ -359,6 +359,11 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 6048124330666411029, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: character
value:
objectReference: {fileID: 1994890848}
- target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 1774819982393099990, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: characterInput propertyPath: characterInput
@ -407,7 +412,7 @@ PrefabInstance:
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11
value: 5
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 6538870453604659611, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
@ -479,6 +484,33 @@ PrefabInstance:
propertyPath: m_Camera propertyPath: m_Camera
value: value:
objectReference: {fileID: 1433387488} objectReference: {fileID: 1433387488}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 25.485533
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: -0.000110871035
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00004033575
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6, - target: {fileID: 4191952066486177214, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -512,33 +544,6 @@ PrefabInstance:
propertyPath: m_isInputParsingRequired propertyPath: m_isInputParsingRequired
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 657187142472636553, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_AspectRatio
value: 8.460127
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_havePropertiesChanged
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1253843531491885080, guid: 47297317c21fe8a4c91caa79d00cc9a6,
type: 3}
propertyPath: m_isInputParsingRequired
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0.000016578942
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.00003976453
objectReference: {fileID: 0}
- target: {fileID: 1704581577, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 47297317c21fe8a4c91caa79d00cc9a6, type: 3}
--- !u!1001 &296269539 --- !u!1001 &296269539
@ -1010,7 +1015,7 @@ Transform:
- {fileID: 1305996678} - {fileID: 1305996678}
- {fileID: 1493739281} - {fileID: 1493739281}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &553131473 --- !u!1001 &553131473
PrefabInstance: PrefabInstance:
@ -1680,7 +1685,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 7
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &836756938 --- !u!1001 &836756938
PrefabInstance: PrefabInstance:
@ -1972,7 +1977,7 @@ Transform:
- {fileID: 1498861116} - {fileID: 1498861116}
- {fileID: 1053670740} - {fileID: 1053670740}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &966241131 stripped --- !u!4 &966241131 stripped
Transform: Transform:
@ -2320,7 +2325,7 @@ Transform:
m_LocalScale: {x: 10, y: 10, z: 10} m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1132370407 --- !u!1001 &1132370407
PrefabInstance: PrefabInstance:
@ -3173,7 +3178,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 46.647003, y: -60.303, z: -3.959} m_LocalEulerAnglesHint: {x: 46.647003, y: -60.303, z: -3.959}
--- !u!114 &1433387490 --- !u!114 &1433387490
MonoBehaviour: MonoBehaviour:
@ -4271,7 +4276,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1864286456 stripped --- !u!4 &1864286456 stripped
Transform: Transform:
@ -4483,6 +4488,18 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3} m_Script: {fileID: 11500000, guid: c0bbbf19cb68b2742bd80855243b64e3, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!114 &1994890848 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2862111851184665482, guid: c176f4ae8f7b4074db99b27b2e015a2a,
type: 3}
m_PrefabInstance: {fileID: 1994890846}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 73c2eff8a9a01a44bb9b2c007539fc60, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2048428768 --- !u!1001 &2048428768
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

Loading…
Cancel
Save