diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity
index a11d7bee307b706de5e80afd193d30a32b85a472..a3ba40c7519f8035aea99488e0099fdc70af470f 100644
--- a/Assets/Scenes/DevRoom.unity
+++ b/Assets/Scenes/DevRoom.unity
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
- m_IndirectSpecularColor: {r: 0.46169513, g: 0.5124164, b: 0.58993304, a: 1}
+ m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -592,12 +592,14 @@ MeshFilter:
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!4 &805393610 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ m_CorrespondingSourceObject: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
m_PrefabInstance: {fileID: 1070178883}
m_PrefabAsset: {fileID: 0}
--- !u!4 &842586477 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ m_CorrespondingSourceObject: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
m_PrefabInstance: {fileID: 893604959}
m_PrefabAsset: {fileID: 0}
--- !u!1 &889368180
@@ -701,47 +703,58 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 954295820}
m_Modifications:
- - target: {fileID: 5383203518885919015, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5383203518885919015, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_Name
value: TestCollectible
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalPosition.x
value: -1.597
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalPosition.y
value: 0.843
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc, type: 3}
+ - target: {fileID: 5801067718172810331, guid: c21e0108f08f0d74b92e3576ec7a7ecc,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
@@ -803,51 +816,63 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1835324898}
m_Modifications:
- - target: {fileID: 1629977785691913864, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 1629977785691913864, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalPosition.x
value: -1.59
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalPosition.z
value: 1.93
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 8491347043216026353, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
+ - target: {fileID: 8491347043216026353, guid: 7e312250336c0244193b4b75151d4fe3,
+ type: 3}
propertyPath: m_Name
value: Dummy
objectReference: {fileID: 0}
@@ -858,7 +883,8 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
--- !u!4 &1134916567 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ m_CorrespondingSourceObject: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
m_PrefabInstance: {fileID: 1546353266}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1198138126
@@ -869,58 +895,73 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 580745004}
m_Modifications:
- - target: {fileID: 4603107572195619152, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 4603107572195619152, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_Material
value:
- objectReference: {fileID: 13400000, guid: 6b36fb2e3a8a80643988a623d515cbcc, type: 2}
- - target: {fileID: 6541102688641435260, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ objectReference: {fileID: 13400000, guid: 6b36fb2e3a8a80643988a623d515cbcc,
+ type: 2}
+ - target: {fileID: 6541102688641435260, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_Name
value: TestInteractable
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalPosition.x
value: 3
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 8869483112752652203, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ - target: {fileID: 8869483112752652203, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
propertyPath: m_Material
value:
- objectReference: {fileID: 13400000, guid: 6b36fb2e3a8a80643988a623d515cbcc, type: 2}
+ objectReference: {fileID: 13400000, guid: 6b36fb2e3a8a80643988a623d515cbcc,
+ type: 2}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -1022,47 +1063,58 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 1501595418}
m_Modifications:
- - target: {fileID: 125248941348886635, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 125248941348886635, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_Name
value: Model
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalPosition.y
value: 0.75
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
+ - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
@@ -1227,7 +1279,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
--- !u!4 &1865863196 stripped
Transform:
- m_CorrespondingSourceObject: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
+ m_CorrespondingSourceObject: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a,
+ type: 3}
m_PrefabInstance: {fileID: 1198138126}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1899092099
@@ -1323,6 +1376,153 @@ Transform:
- {fileID: 954295820}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &575555229
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 0}
+ m_Modifications:
+ - target: {fileID: 1310652413205708510, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_Size.y
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 6.6223555
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 3.14
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.46245968
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 4521062537676429355, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5071667469683539556, guid: ec549132bf117594e81e95cc4ae15b07,
+ type: 3}
+ propertyPath: m_Name
+ value: TestInteractableModel
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: ec549132bf117594e81e95cc4ae15b07, type: 3}
+--- !u!1001 &1008289185
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 117855957}
+ m_Modifications:
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0.258
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0.889
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0.375
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 5240801910879785525, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ propertyPath: m_Name
+ value: TestWeapon
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
+--- !u!4 &2062000579 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502,
+ type: 3}
+ m_PrefabInstance: {fileID: 1008289185}
+ m_PrefabAsset: {fileID: 0}
--- !u!1660057539 &9223372036854775807
SceneRoots:
m_ObjectHideFlags: 0
@@ -1330,3 +1530,4 @@ SceneRoots:
- {fileID: 1993262143}
- {fileID: 354420149}
- {fileID: 1899092101}
+ - {fileID: 575555229}
diff --git a/Assets/Scenes/Level0.unity b/Assets/Scenes/Level0.unity
index da9ac3760feaa862e15d5ea37c5d0639054c8fc3..8e98e3bdeb2473d43c6c08c2a44d9a879269c63c 100644
--- a/Assets/Scenes/Level0.unity
+++ b/Assets/Scenes/Level0.unity
@@ -133,7 +133,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
propertyPath: m_LocalPosition.y
- value: 0.75
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
propertyPath: m_LocalPosition.z
@@ -205,7 +205,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 354f6ba1c1428a04da1f256d1da9f51e, type: 3}
m_Name:
m_EditorClassIdentifier:
- player: {fileID: 1652156426}
+ player: {fileID: 0}
+ data: {fileID: 0}
--- !u!4 &272310726
Transform:
m_ObjectHideFlags: 0
@@ -215,7 +216,7 @@ Transform:
m_GameObject: {fileID: 272310724}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0.75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -310,6 +311,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 374115585}
+ - {fileID: 754309252}
- {fileID: 666869943}
- {fileID: 1902219903}
m_Father: {fileID: 272310726}
@@ -424,6 +426,114 @@ Transform:
m_Children: []
m_Father: {fileID: 531325656}
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
+--- !u!1 &754309248
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 754309252}
+ - component: {fileID: 754309251}
+ - component: {fileID: 754309250}
+ - component: {fileID: 754309249}
+ m_Layer: 0
+ m_Name: Quad
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!64 &754309249
+MeshCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 754309248}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 5
+ m_Convex: 0
+ m_CookingOptions: 30
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &754309250
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 754309248}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_StaticShadowCaster: 0
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RayTraceProcedural: 0
+ m_RayTracingAccelStructBuildFlagsOverride: 0
+ m_RayTracingAccelStructBuildFlags: 1
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+ m_AdditionalVertexStreams: {fileID: 0}
+--- !u!33 &754309251
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 754309248}
+ m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!4 &754309252
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 754309248}
+ serializedVersion: 2
+ m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
+ m_LocalPosition: {x: 0, y: -0.75, z: 0}
+ m_LocalScale: {x: 100, y: 100, z: 1}
+ m_ConstrainProportionsScale: 0
+ m_Children: []
+ m_Father: {fileID: 531325656}
+ m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!1001 &791030441
PrefabInstance:
m_ObjectHideFlags: 0
@@ -442,7 +552,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
propertyPath: m_LocalPosition.y
- value: 0.75
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3}
propertyPath: m_LocalPosition.z
@@ -497,7 +607,7 @@ GameObject:
- component: {fileID: 862419725}
- component: {fileID: 862419726}
m_Layer: 0
- m_Name: GameControls
+ m_Name: GameInput
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -544,7 +654,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -0.75
objectReference: {fileID: 0}
- target: {fileID: 6141342063799955615, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
propertyPath: m_LocalPosition.z
@@ -582,14 +692,6 @@ PrefabInstance:
propertyPath: m_Name
value: Dummy
objectReference: {fileID: 0}
- - target: {fileID: 8734659159874979979, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
- propertyPath: id
- value:
- objectReference: {fileID: 0}
- - target: {fileID: 8734659159874979979, guid: 7e312250336c0244193b4b75151d4fe3, type: 3}
- propertyPath: weaponList.Array.size
- value: 1
- objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@@ -613,7 +715,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
propertyPath: m_LocalPosition.y
- value: 0
+ value: -0.75
objectReference: {fileID: 0}
- target: {fileID: 7065619579114910469, guid: c98b222ded23bb24690e674886e5741a, type: 3}
propertyPath: m_LocalPosition.z
@@ -739,7 +841,7 @@ Transform:
m_GameObject: {fileID: 1487068465}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 1.64, z: -3.32}
+ m_LocalPosition: {x: 0, y: 0.25, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -807,10 +909,10 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bbd12f0cc12b22743998413b3f14b197, type: 3}
m_Name:
m_EditorClassIdentifier:
- id:
+ id: 1
knockbackResistance: 2
baseSpeed: 10
- jumpForce: 5
+ jumpForce: 10
groundLayers:
serializedVersion: 2
m_Bits: 0
@@ -818,8 +920,9 @@ MonoBehaviour:
health: 10
damagedDelay: 1
weaponList:
- - {fileID: 2798277747015640978, guid: 967e1612f343be242bd63968a7374248, type: 3}
+ - {fileID: 1829954854}
baseDamage: 0
+ weaponLocation: {x: 0, y: 0, z: 0}
companionList: []
activeCompanions:
--- !u!54 &1652156427
@@ -831,8 +934,8 @@ Rigidbody:
m_GameObject: {fileID: 1652156424}
serializedVersion: 4
m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
+ m_Drag: Infinity
+ m_AngularDrag: Infinity
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
@@ -847,13 +950,24 @@ Rigidbody:
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
- m_Constraints: 80
+ m_Constraints: 0
m_CollisionDetection: 0
--- !u!4 &1829954853 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1050311400148833009, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
m_PrefabInstance: {fileID: 84371474}
m_PrefabAsset: {fileID: 0}
+--- !u!114 &1829954854 stripped
+MonoBehaviour:
+ m_CorrespondingSourceObject: {fileID: 5029868015402955001, guid: 1a7698227caac3d429dceb8aa5056502, type: 3}
+ m_PrefabInstance: {fileID: 84371474}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 0}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 68705b8ed948aae4d98ef6e87b6f6961, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1847257072
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs b/Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs
index d6764b24fdabb4e0036267d65916889d8103d9e8..09b5ee4db6eaed98474b982e87af989b3895eb0c 100644
--- a/Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs
+++ b/Assets/_Scripts/Core/Game/Data/Currency/CurrencyData.cs
@@ -5,7 +5,7 @@ using UnityEngine;
namespace _Scripts.Core.Game.Data.Currency
{
[Serializable]
- public class CurrencyData: DataClass
+ public class CurrencyData
{
[Serializable]
public class Transaction
@@ -22,7 +22,7 @@ namespace _Scripts.Core.Game.Data.Currency
transactions.Add(new Transaction { amount = amount, description = description });
balance += amount;
}
- public override void Load(string json)
+ public void Load(string json)
{
CurrencyData data = JsonUtility.FromJson<CurrencyData>(json);
if (data != null)
@@ -39,7 +39,7 @@ namespace _Scripts.Core.Game.Data.Currency
}
}
- public override string SaveToJson()
+ public string SaveToJson()
{
return JsonUtility.ToJson(this);
}
diff --git a/Assets/_Scripts/Core/Game/Data/GameSaveData.cs b/Assets/_Scripts/Core/Game/Data/GameSaveData.cs
index 0b2c50f0b6082e0ac362528ef2a2a1e672b396ff..28ec75396bde44b5313b14f31a712aadcbb5577b 100644
--- a/Assets/_Scripts/Core/Game/Data/GameSaveData.cs
+++ b/Assets/_Scripts/Core/Game/Data/GameSaveData.cs
@@ -9,14 +9,14 @@ using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.Serialization;
-public class GameSaveData : MonoBehaviour
+public class GameSaveData : MonoBehaviour
{
// Static Instance
public static GameSaveData Instance;
// Attributes
public DifficultyType difficulty = DifficultyType.NORMAL;
- public List<String> events = new();
+ public List<string> events = new();
// Save the currency of the player
public CurrencyData currencyData = new();
// Save the position and the level of the player
diff --git a/Assets/_Scripts/Core/Game/Data/Position/PositionData.cs b/Assets/_Scripts/Core/Game/Data/Position/PositionData.cs
index a5ee83617505a41214510a838c6d27b29dca7ffa..a4818494346da186799466720aafbd4480d4f6e2 100644
--- a/Assets/_Scripts/Core/Game/Data/Position/PositionData.cs
+++ b/Assets/_Scripts/Core/Game/Data/Position/PositionData.cs
@@ -4,13 +4,13 @@ using UnityEngine;
namespace _Scripts.Core.Game.Data.Position
{
[Serializable]
- public class PositionData: DataClass
+ public class PositionData
{
public int level = 1;
public Vector3 point = new(0, 0, 0);
- public override void Load(string json)
+ public void Load(string json)
{
PositionData data = JsonUtility.FromJson<PositionData>(json);
if (data != null)
@@ -21,7 +21,7 @@ namespace _Scripts.Core.Game.Data.Position
}
- public override string SaveToJson()
+ public string SaveToJson()
{
return JsonUtility.ToJson(this);
}
diff --git a/Assets/_Scripts/Core/Game/Data/Statistics/StatisticsData.cs b/Assets/_Scripts/Core/Game/Data/Statistics/StatisticsData.cs
index e09753159794073814e644aba76ab363e400dad3..5fb9cbe1e08da675aaba4e3dc623d21a814fcdc2 100644
--- a/Assets/_Scripts/Core/Game/Data/Statistics/StatisticsData.cs
+++ b/Assets/_Scripts/Core/Game/Data/Statistics/StatisticsData.cs
@@ -4,10 +4,10 @@ using UnityEngine;
namespace _Scripts.Core.Game.Data.Statistics
{
[Serializable]
- public class StatisticsData: DataClass
+ public class StatisticsData
{
public int enemiesKilled = 0;
- public override void Load(string json)
+ public void Load(string json)
{
StatisticsData data = JsonUtility.FromJson<StatisticsData>(json);
if (data != null)
@@ -16,7 +16,7 @@ namespace _Scripts.Core.Game.Data.Statistics
}
}
- public override string SaveToJson()
+ public string SaveToJson()
{
return JsonUtility.ToJson(this);
}
diff --git a/Assets/_Scripts/Core/Game/Data/Story/StoryData.cs b/Assets/_Scripts/Core/Game/Data/Story/StoryData.cs
index d70226c0561183159ad7a21959300ec2ad8c7913..4ce45eeb83e8af678d12087a6f8c4540a04697ce 100644
--- a/Assets/_Scripts/Core/Game/Data/Story/StoryData.cs
+++ b/Assets/_Scripts/Core/Game/Data/Story/StoryData.cs
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
-using UnityEditor.PackageManager;
using UnityEngine;
namespace _Scripts.Core.Game.Data.Story
diff --git a/Assets/_Scripts/Core/Player/PlayerMovementController.cs b/Assets/_Scripts/Core/Player/PlayerMovementController.cs
index ed11c59eeb2f5823e0cf75c2b032f1b617cd4191..65193950d7cc38e279f1d190f77e3ddc42b75ede 100644
--- a/Assets/_Scripts/Core/Player/PlayerMovementController.cs
+++ b/Assets/_Scripts/Core/Player/PlayerMovementController.cs
@@ -41,6 +41,8 @@ public class PlayerMovementController
Vector3 dampVelocity = Vector3.zero;
Vector3 movementVector = inputX * axisX.normalized + inputZ * axisZ.normalized;
+
+ Debug.Log(player.stats);
Vector3 modifierVector = movementVector.normalized * player.stats.MaxSpeed;
velocity.x = modifierVector.x;
velocity.z = modifierVector.z;