diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity index a3ba40c7519f8035aea99488e0099fdc70af470f..0a618a52a70933f8baaee2d2a8900d6cc9a0921a 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, g: 0, b: 0, a: 1} + m_IndirectSpecularColor: {r: 0.46169513, g: 0.5124164, b: 0.58993304, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -146,13 +146,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 296110128} serializedVersion: 2 - m_LocalRotation: {x: 0.08715578, y: 0, z: 0, w: 0.9961947} - m_LocalPosition: {x: 0, y: 3, z: -8} + m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483} + m_LocalPosition: {x: 0.22, y: 1, z: -2.96} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1993262143} - m_LocalEulerAnglesHint: {x: 10, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0} --- !u!114 &296110130 MonoBehaviour: m_ObjectHideFlags: 0 @@ -167,6 +167,7 @@ MonoBehaviour: m_EditorClassIdentifier: target: {fileID: 1501595418} followingTime: 0.1 + offset: {x: 0, y: 0, z: 0} mouseSensitivity: 2 --- !u!81 &296110131 AudioListener: @@ -257,6 +258,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: difficulty: 1 + events: [] + currencyData: + balance: 0 + transactions: [] + positionData: + level: 1 + point: {x: 0, y: 0, z: 0} + storyData: + events: [] + progress: + statisticsData: + enemiesKilled: 0 --- !u!4 &354420149 Transform: m_ObjectHideFlags: 0 @@ -407,6 +420,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 464623400} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 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!1 &580745003 GameObject: m_ObjectHideFlags: 0 @@ -592,14 +666,12 @@ 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 @@ -703,58 +775,47 @@ 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} @@ -808,6 +869,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c051aae39aef0264ba144bc30cbe301e, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1008289185 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + 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!1001 &1070178883 PrefabInstance: m_ObjectHideFlags: 0 @@ -816,63 +934,51 @@ 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} @@ -883,8 +989,7 @@ 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 @@ -895,73 +1000,58 @@ 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: [] @@ -1063,58 +1153,47 @@ 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} @@ -1279,8 +1358,7 @@ 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 @@ -1376,153 +1454,6 @@ 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 @@ -1531,3 +1462,4 @@ SceneRoots: - {fileID: 354420149} - {fileID: 1899092101} - {fileID: 575555229} + - {fileID: 1008289185} diff --git a/Assets/Scenes/Level0.unity b/Assets/Scenes/Level0.unity index 8e98e3bdeb2473d43c6c08c2a44d9a879269c63c..fa4abc065d0be2f5c1993d5596c356a654d0dda3 100644 --- a/Assets/Scenes/Level0.unity +++ b/Assets/Scenes/Level0.unity @@ -206,7 +206,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: player: {fileID: 0} - data: {fileID: 0} --- !u!4 &272310726 Transform: m_ObjectHideFlags: 0 @@ -552,7 +551,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.99 objectReference: {fileID: 0} - target: {fileID: 1838854055268103909, guid: 71b1260932d07054caf2d52890e46704, type: 3} propertyPath: m_LocalPosition.z @@ -919,12 +918,11 @@ MonoBehaviour: maxHealth: 10 health: 10 damagedDelay: 1 + baseDamage: 0 weaponList: - {fileID: 1829954854} - baseDamage: 0 - weaponLocation: {x: 0, y: 0, z: 0} companionList: [] - activeCompanions: + companionActive: --- !u!54 &1652156427 Rigidbody: m_ObjectHideFlags: 0 @@ -1151,6 +1149,18 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: difficulty: 1 + events: [] + currencyData: + balance: 0 + transactions: [] + positionData: + level: 1 + point: {x: 0, y: 0, z: 0} + storyData: + events: [] + progress: + statisticsData: + enemiesKilled: 0 --- !u!4 &1919968790 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/_Scripts/Config/CameraConfig.cs b/Assets/_Scripts/Config/CameraConfig.cs index af1f52fbedc34edbca2a7fa7c3865b12c0dcfaa3..45b4e92ff1971af2e5116c5c3e11de8dbdcbf8dc 100644 --- a/Assets/_Scripts/Config/CameraConfig.cs +++ b/Assets/_Scripts/Config/CameraConfig.cs @@ -8,4 +8,6 @@ public static class CameraConfig public const float DEFAULT_FOLLOWING_SPEED = 0.1f; // Offset for follow camera public static readonly Vector3 DEFAULT_CAMERA_OFFSET = new(0f, 0.2f, -2f); + + public static readonly float MAX_AIM_ANGLE = 50.0f; } \ No newline at end of file diff --git a/Assets/_Scripts/Core/Game/Data/GameInput.cs b/Assets/_Scripts/Core/Game/Data/GameInput.cs index 65a7829d3d3dcc0aa76d1571e433f6b6e392dba0..bca2ffabec7bf72d861ade5ab7ed51dc4d4d0ec8 100644 --- a/Assets/_Scripts/Core/Game/Data/GameInput.cs +++ b/Assets/_Scripts/Core/Game/Data/GameInput.cs @@ -13,6 +13,7 @@ public class GameInput : MonoBehaviour [NonSerialized] public KeyCode interactButton = KeyCode.Q; [NonSerialized] public KeyCode sprintButton = KeyCode.LeftShift; [NonSerialized] public KeyCode inputToggleButton = KeyCode.LeftControl; + [NonSerialized] public KeyCode aimToggleButton = KeyCode.E; // Constructor protected void Awake() diff --git a/Assets/_Scripts/Core/Game/GameCameraController.cs b/Assets/_Scripts/Core/Game/GameCameraController.cs index 96398725b8f8c9afa86a356c2d48c6f4399748d9..149056abad908650fb4cdc7516bf3b5c650ddfb9 100644 --- a/Assets/_Scripts/Core/Game/GameCameraController.cs +++ b/Assets/_Scripts/Core/Game/GameCameraController.cs @@ -5,9 +5,9 @@ using UnityEngine; public class GameCameraController { // Attributes - private Camera activeCamera; - private CameraBehaviour behaviour; - private CameraBehaviourType behaviourType; + public Camera activeCamera; + public CameraBehaviour behaviour; + public CameraBehaviourType behaviourType; // Set-Getters public Transform Orientation => activeCamera.transform; @@ -17,6 +17,7 @@ public class GameCameraController { activeCamera = camera; activeCamera.enabled = true; + behaviour = camera.GetComponent<CameraBehaviour>(); } // Functions diff --git a/Assets/_Scripts/Core/Player/PlayerInputController.cs b/Assets/_Scripts/Core/Player/PlayerInputController.cs index 036e8773836c79b3bacf8fc21c9d471690d8270c..5a859cadc25f5967e104ffdcb6d27f5993a599cd 100644 --- a/Assets/_Scripts/Core/Player/PlayerInputController.cs +++ b/Assets/_Scripts/Core/Player/PlayerInputController.cs @@ -13,6 +13,8 @@ public class PlayerInputController // Events public event Action<float, float> OnMovementEvent; public event Action OnJumpEvent; + public event Action<bool> OnAimEvent; + private bool aim = false; // Constructor public PlayerInputController(Player player) @@ -37,6 +39,12 @@ public class PlayerInputController OnJumpEvent?.Invoke(); } + if (Input.GetKeyDown(GameInput.Instance.aimToggleButton)) + { + aim = !aim; + OnAimEvent?.Invoke(aim); + } + bool Toggled = Input.GetKey(GameInput.Instance.inputToggleButton); if (Toggled) { diff --git a/Assets/_Scripts/Core/Player/PlayerMovementController.cs b/Assets/_Scripts/Core/Player/PlayerMovementController.cs index 65193950d7cc38e279f1d190f77e3ddc42b75ede..cb9672943e3c9f7a180f5e9cf33e7fe7f9d9e958 100644 --- a/Assets/_Scripts/Core/Player/PlayerMovementController.cs +++ b/Assets/_Scripts/Core/Player/PlayerMovementController.cs @@ -7,12 +7,14 @@ public class PlayerMovementController private readonly Player player; private Vector3 axisX; private Vector3 axisZ; + private bool aim = false; // Constructor public PlayerMovementController(Player player) { this.player = player; player.inputController.OnJumpEvent += HandleJump; + player.inputController.OnAimEvent += OnAim; axisX = new(GameController.Instance.mainCamera.Orientation.right.x, 0, GameController.Instance.mainCamera.Orientation.right.z); axisZ = new(GameController.Instance.mainCamera.Orientation.forward.x, 0, GameController.Instance.mainCamera.Orientation.forward.z); } @@ -42,7 +44,6 @@ public class PlayerMovementController 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; @@ -51,7 +52,14 @@ public class PlayerMovementController if(movementVector != Vector3.zero) { HandleRotation(movementVector); - } + } + + if (aim) + { + Vector3 cameraForward = GameController.Instance.mainCamera.Orientation.forward; + Vector3 vec = new Vector3(cameraForward.x, Mathf.Clamp(cameraForward.y, -CameraConfig.MAX_AIM_ANGLE+50f, CameraConfig.MAX_AIM_ANGLE+50f), cameraForward.z); + player.transform.forward = vec; + } } public void HandleJump() @@ -59,4 +67,24 @@ public class PlayerMovementController Vector3 force = new(0, player.JumpForce, 0); player.Rigidbody.AddForce(force, ForceMode.Impulse); } + + public void OnAim(bool aim) + { + // Make the camera zoom in and zoom out based on the aim toggle + this.aim = aim; + if (GameController.Instance.mainCamera.behaviour is CameraFollowObject) + { + if (aim) + { + (GameController.Instance.mainCamera.behaviour as CameraFollowObject).offset.z += 2.2f; + (GameController.Instance.mainCamera.behaviour as CameraFollowObject).offset.x += 0.3f; + } + else + { + (GameController.Instance.mainCamera.behaviour as CameraFollowObject).offset.z -= 2.2f; + (GameController.Instance.mainCamera.behaviour as CameraFollowObject).offset.x -= 0.3f; + } + } + + } } diff --git a/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs b/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs index f63ce5b27c81bd0299752a303a794158fa23fa78..73690e2f59854b5cdf04439e00a0b4f7b48278c4 100644 --- a/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs +++ b/Assets/_Scripts/Core/UI/Camera/CameraFollowObject.cs @@ -5,7 +5,7 @@ public class CameraFollowObject : CameraBehaviour // Attributes public Transform target; public float followingTime = CameraConfig.DEFAULT_FOLLOWING_SPEED; - protected Vector3 offset; + public Vector3 offset; protected Vector3 velocity; // Constructor