diff --git a/Assets/Resources/GameplaySettings.asset b/Assets/Resources/GameplaySettings.asset index 9beff588..4a8d6abd 100644 --- a/Assets/Resources/GameplaySettings.asset +++ b/Assets/Resources/GameplaySettings.asset @@ -12,8 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 40a8313b47064e26bcdb60e81b588bc9, type: 3} m_Name: GameplaySettings m_EditorClassIdentifier: - levels: - - {fileID: 0} + levels: [] groundMaterials: - {fileID: 2100000, guid: ebf7e8ea2b948a34ca46b0d32ce8d667, type: 2} pistolProjectile: {fileID: 11400000, guid: 288604cc4d8cbea48a12e74bb3dff30d, type: 2} diff --git a/Assets/Scenes/Gameplay.unity b/Assets/Scenes/Gameplay.unity index 8f247010..dc8c0e16 100644 --- a/Assets/Scenes/Gameplay.unity +++ b/Assets/Scenes/Gameplay.unity @@ -8409,6 +8409,11 @@ MonoBehaviour: - {x: -10, y: 0, z: -5} - {x: 5, y: 0, z: -10} - {x: -5, y: 0, z: 10} +--- !u!224 &87525148 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8612927855319088168, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + m_PrefabInstance: {fileID: 1912088910611789087} + m_PrefabAsset: {fileID: 0} --- !u!1 &87691314 GameObject: m_ObjectHideFlags: 0 @@ -96515,6 +96520,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3860490427411111307, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5212196136184599104, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} propertyPath: m_Name value: Header @@ -96625,14 +96634,138 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5374680237116207126, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1363507218} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7016104202138350846, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1073154489} + - targetCorrespondingSourceObject: {fileID: 7016104202138350846, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1073154488} + - targetCorrespondingSourceObject: {fileID: 3841955898643459876, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + insertIndex: -1 + addedObject: {fileID: 1073154487} m_SourcePrefab: {fileID: 100100000, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} --- !u!224 &1073154481 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 7398123045442154089, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} m_PrefabInstance: {fileID: 1073154480} m_PrefabAsset: {fileID: 0} +--- !u!224 &1073154482 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5374680237116207126, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + m_PrefabInstance: {fileID: 1073154480} + m_PrefabAsset: {fileID: 0} +--- !u!224 &1073154483 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3198921966065864718, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + m_PrefabInstance: {fileID: 1073154480} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1073154484 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3841955898643459876, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + m_PrefabInstance: {fileID: 1073154480} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1073154485 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8890324288574311001, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + m_PrefabInstance: {fileID: 1073154480} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073154484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &1073154486 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7016104202138350846, guid: 089d7b8da1dbf9642a5907d1d3533b8d, type: 3} + m_PrefabInstance: {fileID: 1073154480} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1073154487 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073154484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 29e52572e1cea46d593402398f2113b9, type: 3} + m_Name: + m_EditorClassIdentifier: + _label: {fileID: 1073154485} + _icon: {fileID: 1073154483} + _punchMode: 0 + _numericAnimationDuration: 0 + _numericAnimationDelay: 0 + _useDollarPostfix: 0 +--- !u!114 &1073154488 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073154486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c1e84f9535af44b69b95134fa771197f, type: 3} + m_Name: + m_EditorClassIdentifier: + _to: {x: 1, y: 1} + to: 0.3 + _duration: {x: 0.5, y: 0.5} + duration: 0.5 + _durationData: {fileID: 0} + _startDelay: {x: 0, y: 0} + startDelay: 0 + _delayBetweenYoyo: {x: 0, y: 0} + delayBetweenYoyo: 0 + _delayBetweenCycles: {x: 0, y: 0} + delayBetweenCycles: 0 + _loops: 1 + _isRelative: 0 + _destroyOnFinish: 0 + _ease: 4 + _playMode: 1 + _onComplete: [] + curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + _isFrom: 0 + _isLocal: 0 + isRandomnessSupported: 0 + isAdvancedInfoVisible: 1 + isOnCompleteVisible: 0 + isDurationDataMode: 0 + _isPlayingInEditor: 1 + isTargetVisibleInEditor: 0 + beforePlayPosition: {x: 102.337555, y: 0, z: 0} + beforePlayRotation: {x: 0, y: 0, z: 0} + beforePlayScale: {x: 1, y: 1, z: 1} + isIncremental: 0 + _target: {fileID: 87525148} + _isPunchUI: 0 + _vibratio: 0 + _elasity: 0 +--- !u!114 &1073154489 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1073154486} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 292b11bd645046b2b708403400c046c3, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1073990057 GameObject: m_ObjectHideFlags: 0 @@ -119663,6 +119796,56 @@ Transform: - {fileID: 193347178} m_Father: {fileID: 416252396} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1363507217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1363507218} + - component: {fileID: 1363507219} + m_Layer: 5 + m_Name: Pool_FlyingIU + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1363507218 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1363507217} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1073154482} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1363507219 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1363507217} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 365c902c6341b48759f45c20720f4d12, type: 3} + m_Name: + m_EditorClassIdentifier: + _poolType: {fileID: 11400000, guid: 5b2dbafafa198425a97a68d8934eb7a4, type: 2} + poolTypes: [] --- !u!1 &1364447160 GameObject: m_ObjectHideFlags: 0 @@ -188693,6 +188876,46 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _loops + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _target + value: + objectReference: {fileID: 87525148} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _isLocal + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _playMode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _isRelative + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: beforePlayScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: beforePlayScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: beforePlayScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: _isPlayingInEditor + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1008368325, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: beforePlayPosition.x + value: 102.337555 + objectReference: {fileID: 0} - target: {fileID: 118475950818698859, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive value: 1 @@ -189637,6 +189860,22 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8612927855319088168, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8612927855319088168, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8612927855319088168, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8612927855319088170, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8612927856098132616, guid: 2afb0c0b1e9834310869cb2f0c994844, type: 3} propertyPath: m_IsActive value: 0