diff --git a/Assets/Input System/Player Actions.inputactions b/Assets/Input System/Player Actions.inputactions index bf19304..0c77aca 100644 --- a/Assets/Input System/Player Actions.inputactions +++ b/Assets/Input System/Player Actions.inputactions @@ -283,6 +283,17 @@ "isComposite": false, "isPartOfComposite": false }, + { + "name": "", + "id": "c680f154-8519-430c-98ab-9e28bd096560", + "path": "", + "interactions": "", + "processors": "", + "groups": "", + "action": "Action", + "isComposite": false, + "isPartOfComposite": false + }, { "name": "", "id": "2a504570-c560-4eaf-a3f0-49971e1b475a", diff --git a/Assets/Prefabs/Bones.prefab b/Assets/Prefabs/Bones.prefab index ece8b9e..f0e624a 100644 --- a/Assets/Prefabs/Bones.prefab +++ b/Assets/Prefabs/Bones.prefab @@ -19,6 +19,7 @@ GameObject: - component: {fileID: 2344147968324054325} - component: {fileID: 8121950008105218343} - component: {fileID: 2813634395235005482} + - component: {fileID: 3838772665456314839} m_Layer: 0 m_Name: Bones m_TagString: Player @@ -43,6 +44,7 @@ Transform: - {fileID: 5586015051149451479} - {fileID: 2063840941502744053} - {fileID: 7290594200745798336} + - {fileID: 2464722400828814349} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &4642513082199340961 @@ -279,6 +281,19 @@ MonoBehaviour: m_EditorClassIdentifier: blocking: 0 parryThreshold: 0.5 +--- !u!114 &3838772665456314839 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1375850422501237868} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 861b3bde023ca7f48a72c48ef9ee25d2, type: 3} + m_Name: + m_EditorClassIdentifier: + itemTag: Hat --- !u!1 &1648017802882051395 GameObject: m_ObjectHideFlags: 0 @@ -1980,6 +1995,98 @@ BoxCollider2D: m_AutoTiling: 0 m_Size: {x: 2.750043, y: 2.196495} m_EdgeRadius: 0 +--- !u!1 &8766628052651198462 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2464722400828814349} + - component: {fileID: 3591739610359891571} + - component: {fileID: 6805231798249227393} + m_Layer: 0 + m_Name: Item Hold Range + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2464722400828814349 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766628052651198462} + serializedVersion: 2 + 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: 7009259675412950971} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &3591739610359891571 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766628052651198462} + m_Enabled: 1 + serializedVersion: 3 + 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: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 1.6562337, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2.2691138, y: 1.9620712} + m_EdgeRadius: 0 +--- !u!114 &6805231798249227393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8766628052651198462} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 861b3bde023ca7f48a72c48ef9ee25d2, type: 3} + m_Name: + m_EditorClassIdentifier: + itemTag: Hat --- !u!1 &8832061911781686718 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player Select.prefab b/Assets/Prefabs/Player Select.prefab index 1a5c597..9f1ab0a 100644 --- a/Assets/Prefabs/Player Select.prefab +++ b/Assets/Prefabs/Player Select.prefab @@ -383,15 +383,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1204188658820747641} - - {fileID: 4234251132373118416} - - {fileID: 5257551734664631346} - - {fileID: 5566924632766593088} + - {fileID: 2706636298775539429} m_Father: {fileID: 597459829403929617} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 577.58, y: 146.14014} + m_AnchoredPosition: {x: 577.58, y: 116} m_SizeDelta: {x: 991.87, y: 994.27} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &4398521839358101483 @@ -415,7 +412,7 @@ MonoBehaviour: m_StartCorner: 0 m_StartAxis: 0 m_CellSize: {x: 100, y: 100} - m_Spacing: {x: 161.78, y: 300} + m_Spacing: {x: 161.78, y: 169.1} m_Constraint: 0 m_ConstraintCount: 4 --- !u!114 &2354805791164454873 @@ -1312,304 +1309,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 2006297455014043296, guid: 379d0dd7636974e42bcfc11679f61cd0, type: 3} m_PrefabInstance: {fileID: 378488714810919103} m_PrefabAsset: {fileID: 0} ---- !u!1001 &1361276841794986725 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5368898896554409839} - m_Modifications: - - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: playerText - value: - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Name - value: Player Box Target_3 - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 1918502666465040432} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: hurtbox - value: - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.x - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.y - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.z - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 965.33997 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -497.135 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3} ---- !u!114 &1918502666465040432 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 1361276841794986725} - 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!224 &5566924632766593088 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 1361276841794986725} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1680714660764438167 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5368898896554409839} - m_Modifications: - - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: playerText - value: - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Name - value: Player Box Target_2 - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 2245263241364763714} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: hurtbox - value: - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.x - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.y - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalScale.z - value: 0.6 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 703.56 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -497.135 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3} ---- !u!114 &2245263241364763714 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 1680714660764438167} - 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!224 &5257551734664631346 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 1680714660764438167} - m_PrefabAsset: {fileID: 0} --- !u!1001 &3867074982055388481 PrefabInstance: m_ObjectHideFlags: 0 @@ -1964,143 +1663,6 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8152264223886948235, guid: fb4bf85da5c66429d8a3d24fe0e44ef1, type: 3} m_PrefabInstance: {fileID: 5365995410700369971} m_PrefabAsset: {fileID: 0} ---- !u!1001 &5698084126106307548 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 5368898896554409839} - m_Modifications: - - target: {fileID: 107049055310032802, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: playerText - value: - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Name - value: Player Box Target - objectReference: {fileID: 0} - - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_TargetGraphic - value: - objectReference: {fileID: 5145493705120411913} - - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 4103967781863842157, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: hurtbox - value: - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.x - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_AnchoredPosition.y - value: -497.135 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3} ---- !u!224 &1204188658820747641 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 5698084126106307548} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5145493705120411913 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 5698084126106307548} - 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 &6158221634364426999 PrefabInstance: m_ObjectHideFlags: 0 @@ -2365,7 +1927,7 @@ RectTransform: m_CorrespondingSourceObject: {fileID: 8152264223886948235, guid: fb4bf85da5c66429d8a3d24fe0e44ef1, type: 3} m_PrefabInstance: {fileID: 7097897689600722934} m_PrefabAsset: {fileID: 0} ---- !u!1001 &7306701849676904309 +--- !u!1001 &8802968516383405120 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2379,7 +1941,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_Name - value: Player Box Target_1 + value: Player Box Target_7 objectReference: {fileID: 0} - target: {fileID: 539213549865726557, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_IsActive @@ -2388,7 +1950,7 @@ PrefabInstance: - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_TargetGraphic value: - objectReference: {fileID: 7862511508704480672} + objectReference: {fileID: 8237562179169341077} - target: {fileID: 3092004571833081599, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: @@ -2471,7 +2033,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_AnchoredPosition.x - value: 441.78 + value: 180 objectReference: {fileID: 0} - target: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} propertyPath: m_AnchoredPosition.y @@ -2498,15 +2060,15 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e98314581589e49cf928afa2ae1398f2, type: 3} ---- !u!224 &4234251132373118416 stripped +--- !u!224 &2706636298775539429 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 6892066976245176997, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 7306701849676904309} + m_PrefabInstance: {fileID: 8802968516383405120} m_PrefabAsset: {fileID: 0} ---- !u!114 &7862511508704480672 stripped +--- !u!114 &8237562179169341077 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 611326342984514261, guid: e98314581589e49cf928afa2ae1398f2, type: 3} - m_PrefabInstance: {fileID: 7306701849676904309} + m_PrefabInstance: {fileID: 8802968516383405120} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 diff --git a/Assets/Scenes/Platformer With Headroom.unity b/Assets/Scenes/Platformer With Headroom.unity index e189b1a..7e3f481 100644 --- a/Assets/Scenes/Platformer With Headroom.unity +++ b/Assets/Scenes/Platformer With Headroom.unity @@ -269,6 +269,93 @@ Transform: m_CorrespondingSourceObject: {fileID: 5794044177371189323, guid: 5ce441c5fe33344a292ef80ef22aaffd, type: 3} m_PrefabInstance: {fileID: 66512129} m_PrefabAsset: {fileID: 0} +--- !u!1 &238633966 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 238633967} + - component: {fileID: 238633968} + m_Layer: 0 + m_Name: Square_1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &238633967 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238633966} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.3613, z: 0} + m_LocalScale: {x: 1.4437, y: 0.2774, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 444980835} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &238633968 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 238633966} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: 1823612251 + m_SortingLayer: 1 + m_SortingOrder: 101 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0, g: 0, b: 0, 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!1 &421411298 GameObject: m_ObjectHideFlags: 0 @@ -310,6 +397,169 @@ Transform: - {fileID: 1919996325} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &444980832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 444980835} + - component: {fileID: 444980834} + - component: {fileID: 444980833} + - component: {fileID: 444980836} + m_Layer: 0 + m_Name: Square + m_TagString: Hat + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &444980833 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444980832} + m_Enabled: 1 + serializedVersion: 3 + 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_CompositeOperation: 0 + m_CompositeOrder: 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: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!212 &444980834 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444980832} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: 1823612251 + m_SortingLayer: 1 + m_SortingOrder: 100 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 0.047169805, g: 0.047169805, b: 0.047169805, 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!4 &444980835 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444980832} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0779113, y: 14.136367, z: 0} + m_LocalScale: {x: 0.728, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 238633967} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!50 &444980836 +Rigidbody2D: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 444980832} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 --- !u!1 &499038615 GameObject: m_ObjectHideFlags: 0 @@ -553,10 +803,10 @@ RectTransform: - {fileID: 1087263023} m_Father: {fileID: 37237831} 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: -86, y: -431} - m_SizeDelta: {x: 504.197, y: 50} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -136, y: -381} + m_SizeDelta: {x: 504.19702, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &620120983 MonoBehaviour: @@ -891,9 +1141,9 @@ RectTransform: - {fileID: 499038616} m_Father: {fileID: 37237831} 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: 84, y: 432} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 134, y: 382} m_SizeDelta: {x: 504.197, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &818762834 @@ -995,6 +1245,93 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 818762832} m_CullTransparentMesh: 1 +--- !u!1 &826313711 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 826313713} + - component: {fileID: 826313712} + m_Layer: 0 + m_Name: Hat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &826313712 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826313711} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &826313713 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 826313711} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.0779113, y: 14.136367, z: -0.045923177} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &854334842 GameObject: m_ObjectHideFlags: 0 @@ -1953,6 +2290,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1524919192 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1375850422501237868, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_Name + value: Bones + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.x + value: -2.16 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.y + value: 14.08 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7009259675412950971, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 1fd31b88e5609482ab7e8ab16a932947, type: 3} --- !u!1001 &1639418690 PrefabInstance: m_ObjectHideFlags: 0 @@ -6251,3 +6645,6 @@ SceneRoots: - {fileID: 421411299} - {fileID: 854334845} - {fileID: 2646366444304663758} + - {fileID: 1524919192} + - {fileID: 826313713} + - {fileID: 444980835} diff --git a/Assets/Scripts/Damageable.cs b/Assets/Scripts/Damageable.cs index 6df0caa..19eb64c 100644 --- a/Assets/Scripts/Damageable.cs +++ b/Assets/Scripts/Damageable.cs @@ -17,6 +17,8 @@ public class Damageable : MonoBehaviour public bool dying = false; + public event System.Action OnPlayerPunched; + private void Start() { animator = GetComponent(); @@ -46,6 +48,9 @@ public class Damageable : MonoBehaviour float actualForce = damageSource.GetComponent().force; Block blockComponent = GetComponent(); + + GetComponentInChildren().DropItem(); + if (blockComponent != null && blockComponent.blocking) { if (blockComponent.IsParrying()) @@ -92,9 +97,10 @@ public class Damageable : MonoBehaviour } private void Die() - {; + { if (GameManager.Instance != null) { + GetComponent().DropItem(); animator.SetBool("die", true); dying = true; } diff --git a/Assets/Scripts/Punch.cs b/Assets/Scripts/Punch.cs index d94c3d9..243435c 100644 --- a/Assets/Scripts/Punch.cs +++ b/Assets/Scripts/Punch.cs @@ -6,7 +6,6 @@ using UnityEngine.InputSystem; public class Punch : MonoBehaviour { public bool cancelable = true; - public static event System.Action OnPlayerPunched; [SerializeField] private BoxCollider2D hurtbox; @@ -31,7 +30,7 @@ public class Punch : MonoBehaviour GetComponent().Punch(); DisableCancellation(); GetComponent().maxSpeedOverride = 1f; - OnPlayerPunched?.Invoke(gameObject); + //OnPlayerPunched?.Invoke(gameObject); } public void EnableHurtbox() diff --git a/Assets/Scripts/UseItem.cs b/Assets/Scripts/UseItem.cs index ecb26ca..cc3807f 100644 --- a/Assets/Scripts/UseItem.cs +++ b/Assets/Scripts/UseItem.cs @@ -2,6 +2,7 @@ using UnityEngine; public class UseItem : MonoBehaviour { + [SerializeField] private string itemTag; private GameObject heldItem; private bool isHoldingItem = false; @@ -9,13 +10,13 @@ public class UseItem : MonoBehaviour { if (isHoldingItem) { - heldItem.transform.position = transform.position; + heldItem.transform.position = transform.position + Vector3.up; } } - private void OnTriggerEnter2D(Collider2D collision) + private void OnCollisionEnter2D(Collision2D collision) { - if (collision.CompareTag("Item") && !isHoldingItem) + if (collision.gameObject.CompareTag("Hat") && !isHoldingItem) { PickUpItem(collision.gameObject); } @@ -26,6 +27,8 @@ public class UseItem : MonoBehaviour heldItem = item; isHoldingItem = true; item.GetComponent().enabled = false; + item.GetComponent().bodyType = RigidbodyType2D.Static; + item.transform.rotation = Quaternion.identity; } public void DropItem() @@ -33,6 +36,7 @@ public class UseItem : MonoBehaviour if (isHoldingItem) { heldItem.GetComponent().enabled = true; + heldItem.GetComponent().bodyType = RigidbodyType2D.Dynamic; heldItem = null; isHoldingItem = false; } @@ -40,19 +44,19 @@ public class UseItem : MonoBehaviour private void OnEnable() { - Punch.OnPlayerPunched += HandlePlayerPunched; + //Punch.OnPlayerPunched += HandlePlayerPunched; } private void OnDisable() { - Punch.OnPlayerPunched -= HandlePlayerPunched; + //Punch.OnPlayerPunched -= HandlePlayerPunched; } - +/* private void HandlePlayerPunched(GameObject punchedPlayer) { if (punchedPlayer == gameObject) { DropItem(); } - } + }*/ } diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset index 0fccc82..b25f8cd 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings 1.asset @@ -33,28 +33,28 @@ MonoBehaviour: m_Settings: m_SettingsList: m_List: - - rid: 4743468213370093872 - - rid: 4743468213370093873 + - rid: 4743468213370093885 + - rid: 4743468213370093886 - rid: 3813502778313015298 - rid: 3813502778313015299 - rid: 3813502778313015300 - - rid: 4743468213370093874 + - rid: 4743468213370093887 - rid: 3813502778313015302 - rid: 3813502778313015303 - rid: 3813502778313015304 - rid: 3813502778313015305 - - rid: 4743468213370093875 - - rid: 4743468213370093876 - - rid: 4743468213370093877 + - rid: 4743468213370093888 + - rid: 4743468213370093889 + - rid: 4743468213370093890 - rid: 3813502778313015309 - - rid: 4743468213370093878 - - rid: 4743468213370093879 - - rid: 4743468213370093880 + - rid: 4743468213370093891 + - rid: 4743468213370093892 + - rid: 4743468213370093893 - rid: 3813502778313015313 - - rid: 4743468213370093881 - - rid: 4743468213370093882 + - rid: 4743468213370093894 + - rid: 4743468213370093895 - rid: 3813502778313015316 - - rid: 4743468213370093883 + - rid: 4743468213370093896 m_RuntimeSettings: m_List: - rid: 3813502778313015298 @@ -161,7 +161,7 @@ MonoBehaviour: m_ExportShaderVariants: 1 m_ShaderVariantLogLevel: 0 m_StripRuntimeDebugShaders: 1 - - rid: 4743468213370093872 + - rid: 4743468213370093885 type: {class: UniversalRenderPipelineEditorMaterials, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultMaterial: {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} @@ -170,7 +170,7 @@ MonoBehaviour: m_DefaultTerrainMaterial: {fileID: 2100000, guid: 594ea882c5a793440b60ff72d896021e, type: 2} m_DefaultDecalMaterial: {fileID: 2100000, guid: 31d0dcc6f2dd4e4408d18036a2c93862, type: 2} m_DefaultSpriteMaterial: {fileID: 2100000, guid: 9dfc825aed78fcd4ba02077103263b40, type: 2} - - rid: 4743468213370093873 + - rid: 4743468213370093886 type: {class: UniversalRenderPipelineEditorShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} @@ -182,18 +182,18 @@ MonoBehaviour: m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} - - rid: 4743468213370093874 + - rid: 4743468213370093887 type: {class: UniversalRenderPipelineEditorAssets, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_DefaultSettingsVolumeProfile: {fileID: 11400000, guid: eda47df5b85f4f249abf7abd73db2cb2, type: 2} - - rid: 4743468213370093875 + - rid: 4743468213370093888 type: {class: URPShaderStrippingSetting, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 m_StripUnusedPostProcessingVariants: 0 m_StripUnusedVariants: 1 m_StripScreenCoordOverrideVariants: 1 - - rid: 4743468213370093876 + - rid: 4743468213370093889 type: {class: UniversalRendererResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: m_Version: 0 @@ -201,7 +201,7 @@ MonoBehaviour: m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - - rid: 4743468213370093877 + - rid: 4743468213370093890 type: {class: GPUResidentDrawerResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.GPUDriven.Runtime} data: m_Version: 0 @@ -214,21 +214,21 @@ MonoBehaviour: m_OcclusionCullingDebugKernels: {fileID: 7200000, guid: b23e766bcf50ca4438ef186b174557df, type: 3} m_DebugOcclusionTestPS: {fileID: 4800000, guid: d3f0849180c2d0944bc71060693df100, type: 3} m_DebugOccluderPS: {fileID: 4800000, guid: b3c92426a88625841ab15ca6a7917248, type: 3} - - rid: 4743468213370093878 + - rid: 4743468213370093891 type: {class: ProbeVolumeRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 probeVolumeBlendStatesCS: {fileID: 7200000, guid: a3f7b8c99de28a94684cb1daebeccf5d, type: 3} probeVolumeUploadDataCS: {fileID: 7200000, guid: 0951de5992461754fa73650732c4954c, type: 3} probeVolumeUploadDataL2CS: {fileID: 7200000, guid: 6196f34ed825db14b81fb3eb0ea8d931, type: 3} - - rid: 4743468213370093879 + - rid: 4743468213370093892 type: {class: IncludeAdditionalRPAssets, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_version: 0 m_IncludeReferencedInScenes: 0 m_IncludeAssetsByLabel: 0 m_LabelToInclude: - - rid: 4743468213370093880 + - rid: 4743468213370093893 type: {class: ProbeVolumeBakingResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -241,7 +241,7 @@ MonoBehaviour: skyOcclusionRT: {fileID: -5126288278712620388, guid: 5a2a534753fbdb44e96c3c78b5a6999d, type: 3} renderingLayerCS: {fileID: -6772857160820960102, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} renderingLayerRT: {fileID: -5126288278712620388, guid: 94a070d33e408384bafc1dea4a565df9, type: 3} - - rid: 4743468213370093881 + - rid: 4743468213370093894 type: {class: ProbeVolumeDebugResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 @@ -251,12 +251,12 @@ MonoBehaviour: probeVolumeOffsetDebugShader: {fileID: 4800000, guid: db8bd7436dc2c5f4c92655307d198381, type: 3} probeSamplingDebugMesh: {fileID: -3555484719484374845, guid: 20be25aac4e22ee49a7db76fb3df6de2, type: 3} numbersDisplayTex: {fileID: 2800000, guid: 73fe53b428c5b3440b7e87ee830b608a, type: 3} - - rid: 4743468213370093882 + - rid: 4743468213370093895 type: {class: ProbeVolumeGlobalSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_Version: 1 m_ProbeVolumeDisableStreamingAssets: 0 - - rid: 4743468213370093883 + - rid: 4743468213370093896 type: {class: STP/RuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} data: m_setupCS: {fileID: 7200000, guid: 33be2e9a5506b2843bdb2bdff9cad5e1, type: 3} diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index e4070fc..717e961 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -11,6 +11,7 @@ TagManager: - Teleporter - FallPlatform - Transition + - Hat layers: - Default - TransparentFX