diff --git a/Assets/Prefabs/Audio.meta b/Assets/Prefabs/Audio.meta new file mode 100644 index 00000000..7daf8bcb --- /dev/null +++ b/Assets/Prefabs/Audio.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8d8df64e37b8eab49ab555d9e9ad5df6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Audio/AudioSystem.prefab b/Assets/Prefabs/Audio/AudioSystem.prefab new file mode 100644 index 00000000..6f54b7b6 --- /dev/null +++ b/Assets/Prefabs/Audio/AudioSystem.prefab @@ -0,0 +1,603 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1211217622142648303 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6457937484802605410} + - component: {fileID: 3103518932711347852} + m_Layer: 0 + m_Name: Audio Source (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6457937484802605410 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211217622142648303} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.0586112, y: -4.86389, z: -0.008982189} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4614028837852897620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &3103518932711347852 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1211217622142648303} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cda1ffd81462d9a47b8e6667966113d5, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0 + MaxDistance: 1.6 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0112648 + inSlope: -2.6677332 + outSlope: -2.6677332 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.29031947 + value: 0.6651559 + inSlope: -0.069172904 + outSlope: -0.069172904 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33921987 + - serializedVersion: 3 + time: 0.6224365 + value: 0.32354736 + inSlope: -0.6669333 + outSlope: -0.6669333 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.37515014 + outSlope: -0.37515014 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &1285174080596428173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4654702069532622263} + - component: {fileID: 7131046422268997646} + m_Layer: 0 + m_Name: Audio Source (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4654702069532622263 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285174080596428173} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.23, y: 6.13, z: -0.008982189} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4614028837852897620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &7131046422268997646 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1285174080596428173} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cda1ffd81462d9a47b8e6667966113d5, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0.5 + MaxDistance: 3 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0112648 + inSlope: -2.6677332 + outSlope: -2.6677332 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.29031947 + value: 0.6651559 + inSlope: -0.069172904 + outSlope: -0.069172904 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33921987 + - serializedVersion: 3 + time: 0.6224365 + value: 0.32354736 + inSlope: -0.6669333 + outSlope: -0.6669333 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.37515014 + outSlope: -0.37515014 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &5069731267938261062 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5096416819510345306} + - component: {fileID: 8545536563826887174} + m_Layer: 0 + m_Name: Audio Source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5096416819510345306 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5069731267938261062} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.0786111, y: 0.0061092377, z: -0.008982189} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4614028837852897620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &8545536563826887174 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5069731267938261062} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cda1ffd81462d9a47b8e6667966113d5, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1.5 + MaxDistance: 4 + Pan2D: 0 + rolloffMode: 2 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.0112648 + inSlope: -2.6677332 + outSlope: -2.6677332 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.29031947 + value: 0.6651559 + inSlope: -0.069172904 + outSlope: -0.069172904 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33921987 + - serializedVersion: 3 + time: 0.6224365 + value: 0.32354736 + inSlope: -0.6669333 + outSlope: -0.6669333 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.37515014 + outSlope: -0.37515014 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &6216933040412363413 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4614028837852897620} + m_Layer: 0 + m_Name: AudioSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4614028837852897620 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6216933040412363413} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0013888478, y: 11.18389, z: -0.061541684} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5096416819510345306} + - {fileID: 6457937484802605410} + - {fileID: 4654702069532622263} + - {fileID: 4814703418278638315} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7647623953782288449 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4814703418278638315} + - component: {fileID: 402418913411133717} + m_Layer: 0 + m_Name: theme + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4814703418278638315 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647623953782288449} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.0013888478, y: -11.18389, z: 0.061541684} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4614028837852897620} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &402418913411133717 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7647623953782288449} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 2aefff97cbda45f498b58b44e35b28d1, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.053 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/Audio/AudioSystem.prefab.meta b/Assets/Prefabs/Audio/AudioSystem.prefab.meta new file mode 100644 index 00000000..606b623e --- /dev/null +++ b/Assets/Prefabs/Audio/AudioSystem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 54b026c1885f3d74db04c3f665e2932f +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Main Camera.prefab b/Assets/Prefabs/Main Camera.prefab index 626664e2..edcedeb6 100644 --- a/Assets/Prefabs/Main Camera.prefab +++ b/Assets/Prefabs/Main Camera.prefab @@ -894,7 +894,6 @@ GameObject: m_Component: - component: {fileID: 588703733079249260} - component: {fileID: 7693705571979151744} - - component: {fileID: 4273087511613948295} - component: {fileID: 8154041069363273802} - component: {fileID: 6680414142456925996} m_Layer: 0 @@ -971,14 +970,6 @@ Camera: m_OcclusionCulling: 0 m_StereoConvergence: 10 m_StereoSeparation: 0.022 ---- !u!81 &4273087511613948295 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4190906850344886629} - m_Enabled: 1 --- !u!114 &8154041069363273802 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav b/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav new file mode 100644 index 00000000..e35cff99 Binary files /dev/null and b/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav differ diff --git a/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav.meta b/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav.meta new file mode 100644 index 00000000..c8dad588 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/Crossbow_Sound.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 3bcc2be36c6eac74abf03a14b42fd055 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab.meta b/Assets/Prefabs/Traps/Crossbow/OldPrefab.meta new file mode 100644 index 00000000..d4e00c99 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9f2ba3beecc725342a1d58f9fa8e785b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab new file mode 100644 index 00000000..42a71abf --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab @@ -0,0 +1,241 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2412708188970492490 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 281168768424784037} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &281168768424784037 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2412708188970492490} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.4, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5658978381433336244} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6097000079642511365 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5658978381433336244} + - component: {fileID: 5437987886768700064} + - component: {fileID: 5795171091198292367} + - component: {fileID: -203823895052494} + - component: {fileID: 35751912918643136} + - component: {fileID: 7871202529601744935} + m_Layer: 0 + m_Name: crossbow_down_prefab + m_TagString: trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5658978381433336244 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.51, y: 6.49, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 281168768424784037} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &5437987886768700064 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1234118259 + m_SortingLayer: 2 + m_SortingOrder: 5 + m_Sprite: {fileID: -728380027, guid: 04fe96b787686274aa3d988bd7946966, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5795171091198292367 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 608516261a2f95948a35a80ae10fd459, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1839735485 &-203823895052494 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!114 &35751912918643136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} + firePoint: {fileID: 281168768424784037} + arrowDirection: {x: 0, y: -1, z: 0} +--- !u!61 &7871202529601744935 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6097000079642511365} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.02706647, y: 0.046013117} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.8484273, y: 0.90797377} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab.meta new file mode 100644 index 00000000..7f572233 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_down_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 127c53d14a0062f41a16963a87a85dc5 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab new file mode 100644 index 00000000..f3bb5459 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab @@ -0,0 +1,278 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1105690563437684247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3203241062154977645} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3203241062154977645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105690563437684247} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.4, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6280293326049797856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7646078152559978388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6280293326049797856} + - component: {fileID: 8681870965349933560} + - component: {fileID: 7847072694451724048} + - component: {fileID: 676389503062817133} + - component: {fileID: 5286258800020939821} + - component: {fileID: 8832289385422847377} + - component: {fileID: 6359678448919576393} + m_Layer: 0 + m_Name: crossbow_side_left_prefab + m_TagString: trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6280293326049797856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.8, y: 3.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3203241062154977645} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8681870965349933560 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1234118259 + m_SortingLayer: 2 + m_SortingOrder: 5 + m_Sprite: {fileID: 1650551347, guid: a5ddb88c10b74184698a1a37b439e614, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7847072694451724048 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: be908c9b47b57934081cfa09f4858c03, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1839735485 &676389503062817133 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &5286258800020939821 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!114 &8832289385422847377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} + firePoint: {fileID: 3203241062154977645} + arrowDirection: {x: -1, y: 0, z: 0} +--- !u!61 &6359678448919576393 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0053215027, y: 0.023946047} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.9255028, y: 0.9521079} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab.meta new file mode 100644 index 00000000..5b5659e5 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_left_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96efbcbb8de02c04e8828f4c44b0af95 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab new file mode 100644 index 00000000..8481bcfc --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab @@ -0,0 +1,278 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1105690563437684247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3203241062154977645} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3203241062154977645 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1105690563437684247} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.4, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6280293326049797856} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7646078152559978388 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6280293326049797856} + - component: {fileID: 8681870965349933560} + - component: {fileID: 7847072694451724048} + - component: {fileID: 676389503062817133} + - component: {fileID: 5286258800020939821} + - component: {fileID: 8832289385422847377} + - component: {fileID: 6359678448919576393} + m_Layer: 0 + m_Name: crossbow_side_right_prefab + m_TagString: trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6280293326049797856 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 3.8, y: 2.33, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3203241062154977645} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8681870965349933560 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1234118259 + m_SortingLayer: 2 + m_SortingOrder: 5 + m_Sprite: {fileID: 1650551347, guid: a5ddb88c10b74184698a1a37b439e614, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &7847072694451724048 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: be908c9b47b57934081cfa09f4858c03, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 1 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1839735485 &676389503062817133 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &5286258800020939821 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!114 &8832289385422847377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} + firePoint: {fileID: 3203241062154977645} + arrowDirection: {x: 1, y: 0, z: 0} +--- !u!61 &6359678448919576393 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7646078152559978388} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0053215027, y: 0.023946047} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.9255028, y: 0.9521079} + m_EdgeRadius: 0 diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab.meta new file mode 100644 index 00000000..797353cb --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_side_right_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6bd44dba7be27674aae083b13ec033b3 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab new file mode 100644 index 00000000..a3a66093 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab @@ -0,0 +1,241 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &411694592779797494 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 766473672656733782} + - component: {fileID: 4391778320082753030} + - component: {fileID: 2163828844866000190} + - component: {fileID: 2159540822915494960} + - component: {fileID: 7944659884425736257} + - component: {fileID: 6633395310449678054} + m_Layer: 0 + m_Name: crossbow_up_prefab + m_TagString: trap + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &766473672656733782 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.9, y: 1.5, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2249165937404378854} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4391778320082753030 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + 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: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1791178601 + m_SortingLayer: 4 + m_SortingOrder: 0 + m_Sprite: {fileID: 687030705, guid: b08003a91c200674fa33b91ec01ffd86, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.40625, y: 0.59375} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &2163828844866000190 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: cc739925a00880343beac9631c205704, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1839735485 &2159540822915494960 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + m_Enabled: 1 + m_Tiles: {} + m_AnimatedTiles: {} + m_TileAssetArray: [] + m_TileSpriteArray: [] + m_TileMatrixArray: [] + m_TileColorArray: [] + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!114 &7944659884425736257 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} + m_Name: + m_EditorClassIdentifier: + arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} + firePoint: {fileID: 2249165937404378854} + arrowDirection: {x: 0, y: 1, z: 0} +--- !u!61 &6633395310449678054 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 411694592779797494} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 0.40625, y: 0.59375} + newSize: {x: 0.40625, y: 0.59375} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.40625, y: 0.59375} + m_EdgeRadius: 0 +--- !u!1 &6372411766487340553 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2249165937404378854} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2249165937404378854 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6372411766487340553} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.35, z: 0} + m_LocalScale: {x: 0, y: 0, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 766473672656733782} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab.meta new file mode 100644 index 00000000..ac4b4162 --- /dev/null +++ b/Assets/Prefabs/Traps/Crossbow/OldPrefab/crossbow_up_prefab.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d7c2a5ac1f23afe428f872343ed56d71 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab index 42a71abf..b52522f6 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &2412708188970492490 +--- !u!1 &14949534145957612 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,43 +8,13 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 281168768424784037} - m_Layer: 0 - m_Name: point_shot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &281168768424784037 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2412708188970492490} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 5658978381433336244} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &6097000079642511365 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5658978381433336244} - - component: {fileID: 5437987886768700064} - - component: {fileID: 5795171091198292367} - - component: {fileID: -203823895052494} - - component: {fileID: 35751912918643136} - - component: {fileID: 7871202529601744935} + - component: {fileID: 3036592993313591684} + - component: {fileID: 980782555719461752} + - component: {fileID: 3497112153916764893} + - component: {fileID: 6313700679764877809} + - component: {fileID: 7645345853730308104} + - component: {fileID: 3822495635134094462} + - component: {fileID: 3482429164778622301} m_Layer: 0 m_Name: crossbow_down_prefab m_TagString: trap @@ -52,29 +22,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &5658978381433336244 +--- !u!4 &3036592993313591684 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.51, y: 6.49, z: 0} + m_LocalPosition: {x: -24.31, y: 6.49, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 281168768424784037} + - {fileID: 694476628248289116} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &5437987886768700064 +--- !u!212 &980782555719461752 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -120,14 +90,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &5795171091198292367 +--- !u!95 &3497112153916764893 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 608516261a2f95948a35a80ae10fd459, type: 2} @@ -141,13 +111,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1839735485 &-203823895052494 +--- !u!1839735485 &6313700679764877809 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} m_Enabled: 1 m_Tiles: {} m_AnimatedTiles: {} @@ -179,28 +149,28 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!114 &35751912918643136 +--- !u!114 &7645345853730308104 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} m_Name: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} - firePoint: {fileID: 281168768424784037} + firePoint: {fileID: 694476628248289116} arrowDirection: {x: 0, y: -1, z: 0} ---- !u!61 &7871202529601744935 +--- !u!61 &3822495635134094462 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6097000079642511365} + m_GameObject: {fileID: 14949534145957612} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -239,3 +209,139 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.8484273, y: 0.90797377} m_EdgeRadius: 0 +--- !u!82 &3482429164778622301 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 14949534145957612} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3bcc2be36c6eac74abf03a14b42fd055, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0 + MaxDistance: 3.5 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.42937723 + value: 0.57062274 + inSlope: -1.0000001 + outSlope: -1.0000001 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &4509162724998086107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 694476628248289116} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &694476628248289116 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4509162724998086107} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.4, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3036592993313591684} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab.meta index 7f572233..c74a3d72 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab.meta +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_down_prefab.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 127c53d14a0062f41a16963a87a85dc5 +guid: b4cdd571518c6d04589be5fbd02754fb PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab index f3bb5459..c6a8f2aa 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1105690563437684247 +--- !u!1 &2510851681877385366 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,44 +8,14 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3203241062154977645} - m_Layer: 0 - m_Name: point_shot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &3203241062154977645 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1105690563437684247} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.4, y: 0.2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6280293326049797856} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7646078152559978388 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6280293326049797856} - - component: {fileID: 8681870965349933560} - - component: {fileID: 7847072694451724048} - - component: {fileID: 676389503062817133} - - component: {fileID: 5286258800020939821} - - component: {fileID: 8832289385422847377} - - component: {fileID: 6359678448919576393} + - component: {fileID: 1885742497920901335} + - component: {fileID: 7954664712910181091} + - component: {fileID: 7976792890936553350} + - component: {fileID: 6676252085186826523} + - component: {fileID: 4923710299725267261} + - component: {fileID: 3043781499677376048} + - component: {fileID: 6258604230603989996} + - component: {fileID: 2732466800643476448} m_Layer: 0 m_Name: crossbow_side_left_prefab m_TagString: trap @@ -53,29 +23,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6280293326049797856 +--- !u!4 &1885742497920901335 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.8, y: 3.5, z: 0} + m_LocalPosition: {x: 3.3262491, y: 2.9595563, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3203241062154977645} + - {fileID: 2570611950146294380} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8681870965349933560 +--- !u!212 &7954664712910181091 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -121,14 +91,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7847072694451724048 +--- !u!95 &7976792890936553350 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: be908c9b47b57934081cfa09f4858c03, type: 2} @@ -142,13 +112,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1839735485 &676389503062817133 +--- !u!1839735485 &6676252085186826523 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_Tiles: {} m_AnimatedTiles: {} @@ -180,13 +150,13 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!19719996 &5286258800020939821 +--- !u!19719996 &4923710299725267261 TilemapCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -216,28 +186,28 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 ---- !u!114 &8832289385422847377 +--- !u!114 &3043781499677376048 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} m_Name: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} - firePoint: {fileID: 3203241062154977645} + firePoint: {fileID: 2570611950146294380} arrowDirection: {x: -1, y: 0, z: 0} ---- !u!61 &6359678448919576393 +--- !u!61 &6258604230603989996 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 2510851681877385366} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -276,3 +246,139 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.9255028, y: 0.9521079} m_EdgeRadius: 0 +--- !u!82 &2732466800643476448 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2510851681877385366} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3bcc2be36c6eac74abf03a14b42fd055, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0 + MaxDistance: 3.5 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.42937723 + value: 0.57062274 + inSlope: -1.0000001 + outSlope: -1.0000001 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &8829845831690424766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2570611950146294380} + m_Layer: 0 + m_Name: point_shot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2570611950146294380 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8829845831690424766} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.4, y: 0.2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1885742497920901335} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab.meta index 5b5659e5..df073696 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab.meta +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_side_left_prefab.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 96efbcbb8de02c04e8828f4c44b0af95 +guid: 79a5093771393ce48985946fbbe9d9e8 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab index 8481bcfc..df465e18 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1105690563437684247 +--- !u!1 &6025580387136348249 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,7 +8,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3203241062154977645} + - component: {fileID: 2686365796946066467} m_Layer: 0 m_Name: point_shot m_TagString: Untagged @@ -16,22 +16,22 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3203241062154977645 +--- !u!4 &2686365796946066467 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1105690563437684247} + m_GameObject: {fileID: 6025580387136348249} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.4, y: 0.2, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 6280293326049797856} + m_Father: {fileID: 11632593382577939} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &7646078152559978388 +--- !u!1 &7730590183422119401 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -39,13 +39,14 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6280293326049797856} - - component: {fileID: 8681870965349933560} - - component: {fileID: 7847072694451724048} - - component: {fileID: 676389503062817133} - - component: {fileID: 5286258800020939821} - - component: {fileID: 8832289385422847377} - - component: {fileID: 6359678448919576393} + - component: {fileID: 11632593382577939} + - component: {fileID: 1987034518300904387} + - component: {fileID: 1242558505848976219} + - component: {fileID: 3475769062261531036} + - component: {fileID: 1701188734425362919} + - component: {fileID: 5832918217740125044} + - component: {fileID: 5561346511075262884} + - component: {fileID: 308956947462767850} m_Layer: 0 m_Name: crossbow_side_right_prefab m_TagString: trap @@ -53,29 +54,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &6280293326049797856 +--- !u!4 &11632593382577939 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.8, y: 2.33, z: 0} - m_LocalScale: {x: -1, y: 1, z: 1} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 2.9098773, y: 1.0949349, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3203241062154977645} + - {fileID: 2686365796946066467} m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &8681870965349933560 + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!212 &1987034518300904387 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -121,14 +122,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &7847072694451724048 +--- !u!95 &1242558505848976219 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: be908c9b47b57934081cfa09f4858c03, type: 2} @@ -142,13 +143,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1839735485 &676389503062817133 +--- !u!1839735485 &3475769062261531036 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_Tiles: {} m_AnimatedTiles: {} @@ -180,13 +181,13 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!19719996 &5286258800020939821 +--- !u!19719996 &1701188734425362919 TilemapCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -216,28 +217,28 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 ---- !u!114 &8832289385422847377 +--- !u!114 &5832918217740125044 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} m_Name: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} - firePoint: {fileID: 3203241062154977645} + firePoint: {fileID: 2686365796946066467} arrowDirection: {x: 1, y: 0, z: 0} ---- !u!61 &6359678448919576393 +--- !u!61 &5561346511075262884 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7646078152559978388} + m_GameObject: {fileID: 7730590183422119401} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -276,3 +277,108 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.9255028, y: 0.9521079} m_EdgeRadius: 0 +--- !u!82 &308956947462767850 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7730590183422119401} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3bcc2be36c6eac74abf03a14b42fd055, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0 + MaxDistance: 3.5 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.42937723 + value: 0.57062274 + inSlope: -1.0000001 + outSlope: -1.0000001 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab.meta index 797353cb..803d159f 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab.meta +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_side_right_prefab.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6bd44dba7be27674aae083b13ec033b3 +guid: c6dcdedf0f383334aae033d8b4b41f03 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab index a3a66093..d60d93ce 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &411694592779797494 +--- !u!1 &4908425455759625111 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,12 +8,13 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 766473672656733782} - - component: {fileID: 4391778320082753030} - - component: {fileID: 2163828844866000190} - - component: {fileID: 2159540822915494960} - - component: {fileID: 7944659884425736257} - - component: {fileID: 6633395310449678054} + - component: {fileID: 3131354707982436720} + - component: {fileID: 2231022657663289907} + - component: {fileID: 7949882633761799505} + - component: {fileID: 4055707598632427130} + - component: {fileID: 6500701738943123048} + - component: {fileID: 7667998633900560984} + - component: {fileID: 1479595315913282478} m_Layer: 0 m_Name: crossbow_up_prefab m_TagString: trap @@ -21,29 +22,29 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &766473672656733782 +--- !u!4 &3131354707982436720 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: -20.84, y: 0, z: 0} m_LocalScale: {x: 1.9, y: 1.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2249165937404378854} + - {fileID: 5367734962173404864} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &4391778320082753030 +--- !u!212 &2231022657663289907 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -89,14 +90,14 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!95 &2163828844866000190 +--- !u!95 &7949882633761799505 Animator: serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} m_Enabled: 1 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: cc739925a00880343beac9631c205704, type: 2} @@ -110,13 +111,13 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1839735485 &2159540822915494960 +--- !u!1839735485 &4055707598632427130 Tilemap: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} m_Enabled: 1 m_Tiles: {} m_AnimatedTiles: {} @@ -148,28 +149,28 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!114 &7944659884425736257 +--- !u!114 &6500701738943123048 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 55c364571ca00b9468ff5d11c268e446, type: 3} m_Name: m_EditorClassIdentifier: arrowPrefab: {fileID: 3287929166512674387, guid: ef0c1d77c55ae384da75934d4d35628a, type: 3} - firePoint: {fileID: 2249165937404378854} + firePoint: {fileID: 5367734962173404864} arrowDirection: {x: 0, y: 1, z: 0} ---- !u!61 &6633395310449678054 +--- !u!61 &7667998633900560984 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 411694592779797494} + m_GameObject: {fileID: 4908425455759625111} m_Enabled: 1 m_Density: 1 m_Material: {fileID: 0} @@ -208,7 +209,112 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.40625, y: 0.59375} m_EdgeRadius: 0 ---- !u!1 &6372411766487340553 +--- !u!82 &1479595315913282478 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4908425455759625111} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3bcc2be36c6eac74abf03a14b42fd055, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 0 + MaxDistance: 3.5 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.42937723 + value: 0.57062274 + inSlope: -1.0000001 + outSlope: -1.0000001 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1 + outSlope: -1 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!1 &8910157153479061895 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -216,7 +322,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2249165937404378854} + - component: {fileID: 5367734962173404864} m_Layer: 0 m_Name: point_shot m_TagString: Untagged @@ -224,18 +330,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &2249165937404378854 +--- !u!4 &5367734962173404864 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6372411766487340553} + m_GameObject: {fileID: 8910157153479061895} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.35, z: 0} m_LocalScale: {x: 0, y: 0, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 766473672656733782} + m_Father: {fileID: 3131354707982436720} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab.meta b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab.meta index ac4b4162..0ecd3ee0 100644 --- a/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab.meta +++ b/Assets/Prefabs/Traps/Crossbow/crossbow_up_prefab.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d7c2a5ac1f23afe428f872343ed56d71 +guid: 55fe130831dbf8a4da6e32d9a6584167 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Resources/Sound.meta b/Assets/Resources/Sound.meta new file mode 100644 index 00000000..a033af28 --- /dev/null +++ b/Assets/Resources/Sound.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ccd822e9bff6bd949bb7502956386a4e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Effects.meta b/Assets/Resources/Sound/Effects.meta new file mode 100644 index 00000000..3f099175 --- /dev/null +++ b/Assets/Resources/Sound/Effects.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 405566400bb9399448f1dee33e6a8db8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav b/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav new file mode 100644 index 00000000..3ad80ba1 Binary files /dev/null and b/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav differ diff --git a/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav.meta b/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav.meta new file mode 100644 index 00000000..b894046b --- /dev/null +++ b/Assets/Resources/Sound/Effects/Bear_Trap_Sound.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 654ef7bc1ac70fc4b930d8d8e2c1dad6 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Effects/Crossbow_Sound.wav b/Assets/Resources/Sound/Effects/Crossbow_Sound.wav new file mode 100644 index 00000000..e35cff99 Binary files /dev/null and b/Assets/Resources/Sound/Effects/Crossbow_Sound.wav differ diff --git a/Assets/Resources/Sound/Effects/Crossbow_Sound.wav.meta b/Assets/Resources/Sound/Effects/Crossbow_Sound.wav.meta new file mode 100644 index 00000000..f1d29015 --- /dev/null +++ b/Assets/Resources/Sound/Effects/Crossbow_Sound.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: dca653499e2a7fd44b44091249a601b5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Effects/Sewer.wav b/Assets/Resources/Sound/Effects/Sewer.wav new file mode 100644 index 00000000..832a7342 Binary files /dev/null and b/Assets/Resources/Sound/Effects/Sewer.wav differ diff --git a/Assets/Resources/Sound/Effects/Sewer.wav.meta b/Assets/Resources/Sound/Effects/Sewer.wav.meta new file mode 100644 index 00000000..0241e964 --- /dev/null +++ b/Assets/Resources/Sound/Effects/Sewer.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: cda1ffd81462d9a47b8e6667966113d5 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Music.meta b/Assets/Resources/Sound/Music.meta new file mode 100644 index 00000000..9a862307 --- /dev/null +++ b/Assets/Resources/Sound/Music.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c78ea97d050c9714486ba1802c466cfc +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sound/Music/theme.mp3 b/Assets/Resources/Sound/Music/theme.mp3 new file mode 100644 index 00000000..e3bc6ca4 Binary files /dev/null and b/Assets/Resources/Sound/Music/theme.mp3 differ diff --git a/Assets/Resources/Sound/Music/theme.mp3.meta b/Assets/Resources/Sound/Music/theme.mp3.meta new file mode 100644 index 00000000..6cfe62d2 --- /dev/null +++ b/Assets/Resources/Sound/Music/theme.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2aefff97cbda45f498b58b44e35b28d1 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/DevRoom.unity b/Assets/Scenes/DevRoom.unity index 9c144da4..a6c926c6 100644 --- a/Assets/Scenes/DevRoom.unity +++ b/Assets/Scenes/DevRoom.unity @@ -449,7 +449,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3947542212892084636} + m_Father: {fileID: 3307090927746267339} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &382455316 Animator: @@ -511,7 +511,7 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_SortingLayerID: -1791178601 - m_SortingLayer: 3 + m_SortingLayer: 4 m_SortingOrder: 0 m_Sprite: {fileID: 238896255, guid: e13e67bf5c7a47c4099b393b47736308, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} @@ -648,11 +648,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 52d0b7df8b3db394988157e997abbc1f, type: 3} ---- !u!1 &1031121084 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1151693853599494121, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} - m_PrefabInstance: {fileID: 3307090927746267338} - m_PrefabAsset: {fileID: 0} --- !u!1 &1072431131 GameObject: m_ObjectHideFlags: 0 @@ -704,8 +699,8 @@ MonoBehaviour: m_ShadowVolumeIntensityEnabled: 1 m_ShadowVolumeIntensity: 0.75 m_LocalBounds: - m_Center: {x: 0, y: 0, z: 0} - m_Extent: {x: 0, y: 0, z: 0} + m_Center: {x: 0, y: -0.00000011920929, z: 0} + m_Extent: {x: 0.9985302, y: 0.99853027, z: 0} m_PointLightInnerAngle: 360 m_PointLightOuterAngle: 360 m_PointLightInnerRadius: 0 @@ -2921,6 +2916,63 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1001 &2794364920011803750 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalPosition.x + value: -20.84 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3131354707982436720, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4908425455759625111, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} + propertyPath: m_Name + value: crossbow_up_prefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 55fe130831dbf8a4da6e32d9a6584167, type: 3} --- !u!1001 &3307090927746267338 PrefabInstance: m_ObjectHideFlags: 0 @@ -2976,7 +3028,7 @@ PrefabInstance: - target: {fileID: 8054260996891625916, guid: a29b258ccf5dc90498df6e925ee2a3e5, type: 3} propertyPath: canvas value: - objectReference: {fileID: 1031121084} + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 1827612703501095348, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} @@ -2986,11 +3038,182 @@ PrefabInstance: addedObject: {fileID: 382455315} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} ---- !u!4 &3947542212892084636 stripped +--- !u!4 &3307090927746267339 stripped Transform: m_CorrespondingSourceObject: {fileID: 2234560506680264469, guid: e4326c266f4d3fc4482daabdf57ea4f3, type: 3} - m_PrefabInstance: {fileID: 3947542212892084635} + m_PrefabInstance: {fileID: 3307090927746267338} m_PrefabAsset: {fileID: 0} +--- !u!1001 &4575848034203898725 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalPosition.x + value: -19.59 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalPosition.y + value: 2.33 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 11632593382577939, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7730590183422119401, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} + propertyPath: m_Name + value: crossbow_side_right_prefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c6dcdedf0f383334aae033d8b4b41f03, type: 3} +--- !u!1001 &6821699788681146242 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 14949534145957612, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_Name + value: crossbow_down_prefab + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalPosition.x + value: -24.31 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalPosition.y + value: 6.49 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3036592993313591684, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b4cdd571518c6d04589be5fbd02754fb, type: 3} +--- !u!1001 &7284937959160339071 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalPosition.x + value: -22.15 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalPosition.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1885742497920901335, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2510851681877385366, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} + propertyPath: m_Name + value: crossbow_side_left_prefab + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 79a5093771393ce48985946fbbe9d9e8, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -3002,3 +3225,7 @@ SceneRoots: - {fileID: 3307090927746267338} - {fileID: 859053922} - {fileID: 1969499951} + - {fileID: 6821699788681146242} + - {fileID: 7284937959160339071} + - {fileID: 4575848034203898725} + - {fileID: 2794364920011803750} diff --git a/Assets/Scenes/EmptyRoom_2.unity b/Assets/Scenes/EmptyRoom_2.unity index bbcfeded..5aa63b99 100644 --- a/Assets/Scenes/EmptyRoom_2.unity +++ b/Assets/Scenes/EmptyRoom_2.unity @@ -362,11 +362,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6754384466861484289, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} propertyPath: m_LocalPosition.x - value: 4.5 + value: 2.95 objectReference: {fileID: 0} - target: {fileID: 6754384466861484289, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} propertyPath: m_LocalPosition.y - value: 0.5 + value: 0.86 objectReference: {fileID: 0} - target: {fileID: 6754384466861484289, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} propertyPath: m_LocalPosition.z @@ -412,14 +412,21 @@ PrefabInstance: propertyPath: heartPrefab value: objectReference: {fileID: 956820160751323993, guid: 2c8373282a98131488a2026dc22fb8df, type: 3} + - target: {fileID: 7515015931946408894, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} + propertyPath: m_PointLightInnerRadius + value: 2 + objectReference: {fileID: 0} - target: {fileID: 7515015931946408894, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} propertyPath: m_PointLightOuterRadius - value: 100 + value: 5 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 1463738777561398421, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} + insertIndex: -1 + addedObject: {fileID: 2035874657} m_SourcePrefab: {fileID: 100100000, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} --- !u!1001 &1762927023 PrefabInstance: @@ -699,6 +706,19 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 35bed5d2a54129845bcff6b3abaa746b, type: 3} +--- !u!1 &2035874648 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1463738777561398421, guid: 2359570f2fea24215ae3f989d41b590e, type: 3} + m_PrefabInstance: {fileID: 1696561825} + m_PrefabAsset: {fileID: 0} +--- !u!81 &2035874657 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2035874648} + m_Enabled: 1 --- !u!1001 &2117950151 PrefabInstance: m_ObjectHideFlags: 0 @@ -886,6 +906,96 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b95a2840877394746b9c857ec618031d, type: 3} +--- !u!114 &5122644399039610852 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5513200756029160071, guid: b95a2840877394746b9c857ec618031d, type: 3} + m_PrefabInstance: {fileID: 5122644399039610851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5122644399039610853 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4072354183557985843, guid: b95a2840877394746b9c857ec618031d, type: 3} + m_PrefabInstance: {fileID: 5122644399039610851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &5122644399039610854 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 4575735440250469897, guid: b95a2840877394746b9c857ec618031d, type: 3} + m_PrefabInstance: {fileID: 5122644399039610851} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1001 &5614575254252139880 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalPosition.x + value: 0.0013888478 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalPosition.y + value: 11.18389 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalPosition.z + value: -0.061541684 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4614028837852897620, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6216933040412363413, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} + propertyPath: m_Name + value: AudioSystem + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 54b026c1885f3d74db04c3f665e2932f, type: 3} --- !u!1001 &9084864018904812555 PrefabInstance: m_ObjectHideFlags: 0 @@ -956,3 +1066,4 @@ SceneRoots: - {fileID: 3639548686512757813} - {fileID: 9084864018904812555} - {fileID: 1122242796} + - {fileID: 5614575254252139880} diff --git a/Assets/Scripts/Trap/Crossbow/Crossbow.cs b/Assets/Scripts/Trap/Crossbow/Crossbow.cs index 3adab540..37829288 100644 --- a/Assets/Scripts/Trap/Crossbow/Crossbow.cs +++ b/Assets/Scripts/Trap/Crossbow/Crossbow.cs @@ -8,9 +8,12 @@ public class Crossbow : MonoBehaviour public Vector3 arrowDirection = Vector3.right; // Direction de la flèche private Animator animator; + private AudioSource audioSource; + void Start() { animator = GetComponent(); + audioSource = GetComponent(); StartCoroutine(StartShooting()); } @@ -18,7 +21,9 @@ IEnumerator StartShooting() { while (true) { - yield return new WaitForSeconds(1f); // Ajustez pour correspondre à l'intervalle de tir souhaité + PlayShootSound(); + yield return new WaitForSeconds(1f); + animator.SetTrigger("Shoot"); } } @@ -31,4 +36,11 @@ public void FireArrow() // Instancier la flèche avec la rotation correcte GameObject arrow = Instantiate(arrowPrefab, firePoint.position, Quaternion.Euler(0, 0, angle)); } + + private void PlayShootSound() + { + if (audioSource != null && audioSource.clip != null){ + audioSource.Play(); + } + } }