diff --git a/Assets/Prefabs/BreakableTile.prefab b/Assets/Prefabs/BreakableTile.prefab index ca48d83..d380d41 100644 --- a/Assets/Prefabs/BreakableTile.prefab +++ b/Assets/Prefabs/BreakableTile.prefab @@ -149,7 +149,7 @@ BoxCollider2D: m_Bits: 4294967295 m_IsTrigger: 0 m_UsedByEffector: 0 - m_UsedByComposite: 0 + m_UsedByComposite: 1 m_Offset: {x: 0, y: 0} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index dcd1a99..b1a4d46 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,5 +1,69 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &525276400490168249 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8606358469749982917} + m_Layer: 8 + m_Name: L_Knee + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8606358469749982917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 525276400490168249} + m_LocalRotation: {x: 0, y: 0, z: 0.09184216, w: 0.9957736} + m_LocalPosition: {x: 0.47947475, y: -0.00000021830333, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5811801674564757355} + m_Father: {fileID: 149515315115441635} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &590046316339313264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 149515315115441635} + m_Layer: 8 + m_Name: L_LowerBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &149515315115441635 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 590046316339313264} + m_LocalRotation: {x: 0, y: -0, z: 0.99474037, w: 0.10242856} + m_LocalPosition: {x: -0.20894979, y: 0.38865167, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8606358469749982917} + m_Father: {fileID: 5409087674303824736} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1048667121803717404 GameObject: m_ObjectHideFlags: 0 @@ -9,7 +73,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 821236038366831682} - m_Layer: 0 + m_Layer: 8 m_Name: L_Knee m_TagString: Untagged m_Icon: {fileID: 0} @@ -41,7 +105,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5750085072733903937} - m_Layer: 0 + m_Layer: 8 m_Name: R_Leg m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +137,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4539143858996250498} - m_Layer: 0 + m_Layer: 8 m_Name: L_Arm m_TagString: Untagged m_Icon: {fileID: 0} @@ -96,6 +160,187 @@ Transform: m_Father: {fileID: 6160691679832178371} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2247490675390607940 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8164636389946526648} + - component: {fileID: 4922846619610810103} + - component: {fileID: 578132144104610540} + m_Layer: 8 + m_Name: Viking_Back_parts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &8164636389946526648 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2247490675390607940} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5409087674303824736} + m_Father: {fileID: 965998752200834250} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &4922846619610810103 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2247490675390607940} + 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: 769195415 + m_SortingLayer: 3 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: 0b4e399229ec6ed4589eb9528207a93c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.73, y: 6.699198} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &578132144104610540 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2247490675390607940} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RootBone: {fileID: 5409087674303824736} + m_BoneTransforms: + - {fileID: 5409087674303824736} + - {fileID: 8741895741083448917} + - {fileID: 4952740246104246303} + - {fileID: 6588206840087870389} + - {fileID: 7829894871118864405} + - {fileID: 483243375220992577} + - {fileID: 5184328514781748300} + - {fileID: 9077912524209342039} + - {fileID: 6708163568375327027} + - {fileID: 149515315115441635} + - {fileID: 8606358469749982917} + - {fileID: 5811801674564757355} + m_Bounds: + m_Center: {x: 0.11077428, y: -0.044475317, z: 0} + m_Extent: {x: 2.226488, y: 3.0990145, z: 0} + m_AlwaysUpdate: 1 + m_AutoRebind: 0 +--- !u!1 &2837046599248874372 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7829894871118864405} + m_Layer: 8 + m_Name: R_UpperArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7829894871118864405 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2837046599248874372} + m_LocalRotation: {x: 0, y: -0, z: -0.9832774, w: 0.18211432} + m_LocalPosition: {x: -0.060810946, y: -1.0876046, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 483243375220992577} + m_Father: {fileID: 8741895741083448917} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2929943258134430666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9077912524209342039} + m_Layer: 8 + m_Name: R_Knee + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &9077912524209342039 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2929943258134430666} + m_LocalRotation: {x: 0, y: 0, z: -0.15674467, w: 0.9876392} + m_LocalPosition: {x: 0.4865658, y: 0.0000000197559, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6708163568375327027} + m_Father: {fileID: 5184328514781748300} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3156624200786225141 GameObject: m_ObjectHideFlags: 0 @@ -105,7 +350,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8722232351462507904} - m_Layer: 0 + m_Layer: 8 m_Name: Torso m_TagString: Untagged m_Icon: {fileID: 0} @@ -139,7 +384,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6160691679832178371} - m_Layer: 0 + m_Layer: 8 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -172,7 +417,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2756356993697668737} - m_Layer: 0 + m_Layer: 8 m_Name: L_LowerArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -229,6 +474,7 @@ Transform: - {fileID: 3706253573488771434} - {fileID: 6530722701964707747} - {fileID: 4870077556839958209} + - {fileID: 8164636389946526648} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -273,6 +519,8 @@ MonoBehaviour: m_EditorClassIdentifier: _animator: {fileID: 2957004661200399871} MovementSpeed: 2.5 + _bonesSide: {fileID: 9145485872817117069} + _bonesBack: {fileID: 2247490675390607940} _mapLayer: serializedVersion: 2 m_Bits: 8 @@ -333,7 +581,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0.03} + m_Offset: {x: -0.09, y: 0.03} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -344,7 +592,7 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.8, y: 0.89} + m_Size: {x: 0.45, y: 0.89} m_EdgeRadius: 0.01 --- !u!1 &4504781120003423342 GameObject: @@ -424,6 +672,164 @@ MonoBehaviour: m_ShapeLightFalloffSize: 0.5 m_ShapeLightFalloffOffset: {x: 0, y: 0} m_ShapePath: [] +--- !u!1 &4836804681656458181 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6588206840087870389} + m_Layer: 8 + m_Name: L_LowerArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6588206840087870389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4836804681656458181} + m_LocalRotation: {x: 0, y: 0, z: 0.101342775, w: 0.9948516} + m_LocalPosition: {x: 0.93103534, y: -0.00000006368785, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4952740246104246303} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5387503814025257401 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8741895741083448917} + m_Layer: 8 + m_Name: Head + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8741895741083448917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5387503814025257401} + m_LocalRotation: {x: 0, y: 0, z: 0.005233225, w: 0.99998635} + m_LocalPosition: {x: 2.0614116, y: -0.00000060878057, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4952740246104246303} + - {fileID: 7829894871118864405} + m_Father: {fileID: 5409087674303824736} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5442148817883688667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 483243375220992577} + m_Layer: 8 + m_Name: R_LowerArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &483243375220992577 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5442148817883688667} + m_LocalRotation: {x: 0, y: 0, z: -0.1976952, w: 0.9802636} + m_LocalPosition: {x: 1.0464991, y: 0.0000005377195, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7829894871118864405} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5654979082866581916 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4952740246104246303} + m_Layer: 8 + m_Name: L_UpperArm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4952740246104246303 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5654979082866581916} + m_LocalRotation: {x: 0, y: -0, z: 0.9924879, w: 0.12234307} + m_LocalPosition: {x: -0.060306497, y: 1.1242787, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6588206840087870389} + m_Father: {fileID: 8741895741083448917} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &5891751492924946482 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5811801674564757355} + m_Layer: 8 + m_Name: L_Toe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5811801674564757355 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5891751492924946482} + m_LocalRotation: {x: 0, y: 0, z: -0.009432042, w: 0.9999556} + m_LocalPosition: {x: 0.52619857, y: -0.000000071975734, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8606358469749982917} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &6370578819216229813 GameObject: m_ObjectHideFlags: 0 @@ -433,7 +839,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9076224404461001490} - m_Layer: 0 + m_Layer: 8 m_Name: R_Knee m_TagString: Untagged m_Icon: {fileID: 0} @@ -465,7 +871,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1571570198703180397} - m_Layer: 0 + m_Layer: 8 m_Name: R_Arm m_TagString: Untagged m_Icon: {fileID: 0} @@ -488,6 +894,38 @@ Transform: m_Father: {fileID: 6160691679832178371} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6974183028150816375 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5184328514781748300} + m_Layer: 8 + m_Name: R_LowerBack + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5184328514781748300 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6974183028150816375} + m_LocalRotation: {x: 0, y: -0, z: -0.98277175, w: 0.18482342} + m_LocalPosition: {x: -0.22916304, y: -0.5613261, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9077912524209342039} + m_Father: {fileID: 5409087674303824736} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7100171284618724896 GameObject: m_ObjectHideFlags: 0 @@ -497,7 +935,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4494365837907247844} - m_Layer: 0 + m_Layer: 8 m_Name: L_Toe m_TagString: Untagged m_Icon: {fileID: 0} @@ -528,7 +966,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3749092455360134069} - m_Layer: 0 + m_Layer: 8 m_Name: L_Leg m_TagString: Untagged m_Icon: {fileID: 0} @@ -551,6 +989,37 @@ Transform: m_Father: {fileID: 8722232351462507904} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7685356707740776633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6708163568375327027} + m_Layer: 8 + m_Name: R_Toe + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6708163568375327027 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7685356707740776633} + m_LocalRotation: {x: 0, y: 0, z: -0.057277665, w: 0.9983583} + m_LocalPosition: {x: 0.56080276, y: -0.0000000634452, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 9077912524209342039} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7780229847895093112 GameObject: m_ObjectHideFlags: 0 @@ -591,7 +1060,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2068465951755053273} - m_Layer: 0 + m_Layer: 8 m_Name: R_LowerArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -613,6 +1082,40 @@ Transform: m_Father: {fileID: 1571570198703180397} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &8448424677074956309 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5409087674303824736} + m_Layer: 8 + m_Name: Torso + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5409087674303824736 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8448424677074956309} + m_LocalRotation: {x: 0, y: 0, z: 0.7145881, w: 0.6995455} + m_LocalPosition: {x: -0.041246947, y: -1.0994492, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8741895741083448917} + - {fileID: 5184328514781748300} + - {fileID: 149515315115441635} + m_Father: {fileID: 8164636389946526648} + m_RootOrder: -1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8628940554944535785 GameObject: m_ObjectHideFlags: 0 @@ -622,7 +1125,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5215692724244859341} - m_Layer: 0 + m_Layer: 8 m_Name: R_Toe m_TagString: Untagged m_Icon: {fileID: 0} @@ -655,8 +1158,8 @@ GameObject: - component: {fileID: 6530722701964707747} - component: {fileID: 6787737943033011046} - component: {fileID: 8710076703627450349} - m_Layer: 0 - m_Name: Viking_Parts + m_Layer: 8 + m_Name: Viking_Side m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index a1019b8..def3a58 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -128,250 +128,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} m_PrefabInstance: {fileID: 810775542} m_PrefabAsset: {fileID: 0} ---- !u!1 &6535934 +--- !u!1 &6535934 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 2247490675390607940, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + m_PrefabInstance: {fileID: 5855359588613562702} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6535935} - - component: {fileID: 6535937} - - component: {fileID: 6535936} - m_Layer: 8 - m_Name: Viking_Back_parts - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &6535935 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6535934} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1343206830} - m_Father: {fileID: 1627236050} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6535936 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6535934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 57c008f954fe54a8bb972de1018a2cb8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RootBone: {fileID: 1343206830} - m_BoneTransforms: - - {fileID: 1343206830} - - {fileID: 38378803} - - {fileID: 515081367} - - {fileID: 1261662716} - - {fileID: 1307835643} - - {fileID: 738593807} - - {fileID: 874264867} - - {fileID: 731232878} - - {fileID: 56383750} - - {fileID: 1787711887} - - {fileID: 13891758} - - {fileID: 11868818} - m_Bounds: - m_Center: {x: 0.11077428, y: -0.044475317, z: 0} - m_Extent: {x: 2.226488, y: 3.0990145, z: 0} - m_AlwaysUpdate: 1 - m_AutoRebind: 0 ---- !u!212 &6535937 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6535934} - 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: 769195415 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0b4e399229ec6ed4589eb9528207a93c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 4.73, y: 6.699198} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &11868817 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 11868818} - m_Layer: 8 - m_Name: L_Toe - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &11868818 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 11868817} - m_LocalRotation: {x: 0, y: 0, z: -0.009432042, w: 0.9999556} - m_LocalPosition: {x: 0.52619857, y: -0.000000071975734, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 13891758} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &13891757 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 13891758} - m_Layer: 8 - m_Name: L_Knee - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &13891758 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 13891757} - m_LocalRotation: {x: 0, y: 0, z: 0.09184216, w: 0.9957736} - m_LocalPosition: {x: 0.47947475, y: -0.00000021830333, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 11868818} - m_Father: {fileID: 1787711887} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &38378802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 38378803} - m_Layer: 8 - m_Name: Head - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &38378803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 38378802} - m_LocalRotation: {x: 0, y: 0, z: 0.005233225, w: 0.99998635} - m_LocalPosition: {x: 2.0614116, y: -0.00000060878057, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 515081367} - - {fileID: 1307835643} - m_Father: {fileID: 1343206830} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &56383749 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 56383750} - m_Layer: 8 - m_Name: R_Toe - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &56383750 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56383749} - m_LocalRotation: {x: 0, y: 0, z: -0.057277665, w: 0.9983583} - m_LocalPosition: {x: 0.56080276, y: -0.0000000634452, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 731232878} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &62302714 stripped Transform: m_CorrespondingSourceObject: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} @@ -664,67 +425,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} ---- !u!1001 &341367632 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 996611801} - m_Modifications: - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_RootOrder - value: -1 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalPosition.x - value: -2.5 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalPosition.y - value: -4.5 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8175732239415438715, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - propertyPath: m_Name - value: BreakableTile - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} --- !u!1 &350695914 GameObject: m_ObjectHideFlags: 0 @@ -3448,38 +3148,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 4 ---- !u!1 &515081366 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 515081367} - m_Layer: 8 - m_Name: L_UpperArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &515081367 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 515081366} - m_LocalRotation: {x: 0, y: -0, z: 0.9924879, w: 0.12234307} - m_LocalPosition: {x: -0.060306497, y: 1.1242787, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1261662716} - m_Father: {fileID: 38378803} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -3812,6 +3480,18 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 996611801} m_Modifications: + - target: {fileID: 3364452304498334467, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3364452304498334467, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_AutoTiling + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3364452304498334467, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_UsedByComposite + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} propertyPath: m_RootOrder value: -1 @@ -3865,6 +3545,11 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} +--- !u!1 &681564194 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3931708971405200045, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + m_PrefabInstance: {fileID: 5855359588613562702} + m_PrefabAsset: {fileID: 0} --- !u!1001 &685719392 PrefabInstance: m_ObjectHideFlags: 0 @@ -3931,69 +3616,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8121927806228425505, guid: ba1868bb4c26f6d41830aada771e3006, type: 3} m_PrefabInstance: {fileID: 2834098768016774872} m_PrefabAsset: {fileID: 0} ---- !u!1 &731232877 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 731232878} - m_Layer: 8 - m_Name: R_Knee - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &731232878 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 731232877} - m_LocalRotation: {x: 0, y: 0, z: -0.15674467, w: 0.9876392} - m_LocalPosition: {x: 0.4865658, y: 0.0000000197559, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 56383750} - m_Father: {fileID: 874264867} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &738593806 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 738593807} - m_Layer: 8 - m_Name: R_LowerArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &738593807 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 738593806} - m_LocalRotation: {x: 0, y: 0, z: -0.1976952, w: 0.9802636} - m_LocalPosition: {x: 1.0464991, y: 0.0000005377195, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1307835643} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &742170292 PrefabInstance: m_ObjectHideFlags: 0 @@ -4055,11 +3677,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} ---- !u!4 &746087787 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} - m_PrefabInstance: {fileID: 341367632} - m_PrefabAsset: {fileID: 0} --- !u!4 &759697258 stripped Transform: m_CorrespondingSourceObject: {fileID: 8121927806228425505, guid: ba1868bb4c26f6d41830aada771e3006, type: 3} @@ -4197,38 +3814,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ba1868bb4c26f6d41830aada771e3006, type: 3} ---- !u!1 &874264866 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 874264867} - m_Layer: 8 - m_Name: R_LowerBack - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &874264867 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874264866} - m_LocalRotation: {x: 0, y: -0, z: -0.98277175, w: 0.18482342} - m_LocalPosition: {x: -0.22916304, y: -0.5613261, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 731232878} - m_Father: {fileID: 1343206830} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &877886145 PrefabInstance: m_ObjectHideFlags: 0 @@ -4371,8 +3956,6 @@ GameObject: - component: {fileID: 996611801} - component: {fileID: 996611805} - component: {fileID: 996611804} - - component: {fileID: 996611803} - - component: {fileID: 996611802} m_Layer: 3 m_Name: BreakableWalls m_TagString: Untagged @@ -4392,7 +3975,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 746087787} - {fileID: 192902215} - {fileID: 66443746} - {fileID: 358522662} @@ -4404,55 +3986,6 @@ Transform: m_Father: {fileID: 1173618893} m_RootOrder: -1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &996611802 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 996611800} - m_Enabled: 0 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: edf40d39eadb17a4ebb0368b3ac5399a, type: 3} - m_Name: - m_EditorClassIdentifier: - _elementSO: {fileID: 11400000, guid: da0ec95da6f0526499978941b1631c3e, type: 2} ---- !u!19719996 &996611803 -TilemapCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 996611800} - m_Enabled: 0 - 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.00001 - m_UseDelaunayMesh: 0 --- !u!483693784 &996611804 TilemapRenderer: m_ObjectHideFlags: 0 @@ -4460,7 +3993,7 @@ TilemapRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 996611800} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 @@ -4509,7 +4042,7 @@ Tilemap: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 996611800} - m_Enabled: 1 + m_Enabled: 0 m_Tiles: {} m_AnimatedTiles: {} m_TileAssetArray: @@ -4637,37 +4170,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1261662715 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1261662716} - m_Layer: 8 - m_Name: L_LowerArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1261662716 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1261662715} - m_LocalRotation: {x: 0, y: 0, z: 0.101342775, w: 0.9948516} - m_LocalPosition: {x: 0.93103534, y: -0.00000006368785, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 515081367} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1261849835 stripped Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} @@ -4818,38 +4320,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1307835642 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1307835643} - m_Layer: 8 - m_Name: R_UpperArm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1307835643 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1307835642} - m_LocalRotation: {x: 0, y: -0, z: -0.9832774, w: 0.18211432} - m_LocalPosition: {x: -0.060810946, y: -1.0876046, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 738593807} - m_Father: {fileID: 38378803} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1314998800 GameObject: m_ObjectHideFlags: 0 @@ -4988,7 +4458,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: -5, z: 0} second: serializedVersion: 2 @@ -4998,7 +4468,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 12, y: -5, z: 0} second: serializedVersion: 2 @@ -5008,7 +4478,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 16, y: -5, z: 0} second: serializedVersion: 2 @@ -5018,7 +4488,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -7, y: -4, z: 0} second: serializedVersion: 2 @@ -5028,7 +4498,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: -4, z: 0} second: serializedVersion: 2 @@ -5038,7 +4508,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 13, y: -4, z: 0} second: serializedVersion: 2 @@ -5048,7 +4518,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 16, y: -4, z: 0} second: serializedVersion: 2 @@ -5058,7 +4528,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -7, y: -3, z: 0} second: serializedVersion: 2 @@ -5068,7 +4538,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -3, y: -3, z: 0} second: serializedVersion: 2 @@ -5078,7 +4548,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: -3, z: 0} second: serializedVersion: 2 @@ -5088,7 +4558,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 14, y: -3, z: 0} second: serializedVersion: 2 @@ -5098,7 +4568,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -7, y: -2, z: 0} second: serializedVersion: 2 @@ -5108,7 +4578,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -3, y: -2, z: 0} second: serializedVersion: 2 @@ -5118,7 +4588,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: -2, z: 0} second: serializedVersion: 2 @@ -5128,7 +4598,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 14, y: -2, z: 0} second: serializedVersion: 2 @@ -5138,7 +4608,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -3, y: -1, z: 0} second: serializedVersion: 2 @@ -5148,7 +4618,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 10, y: -1, z: 0} second: serializedVersion: 2 @@ -5158,7 +4628,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 14, y: -1, z: 0} second: serializedVersion: 2 @@ -5168,7 +4638,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -3, y: 0, z: 0} second: serializedVersion: 2 @@ -5178,7 +4648,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 10, y: 0, z: 0} second: serializedVersion: 2 @@ -5188,7 +4658,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 14, y: 0, z: 0} second: serializedVersion: 2 @@ -5198,7 +4668,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -3, y: 1, z: 0} second: serializedVersion: 2 @@ -5208,7 +4678,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: 1, z: 0} second: serializedVersion: 2 @@ -5218,7 +4688,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 14, y: 1, z: 0} second: serializedVersion: 2 @@ -5228,7 +4698,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: -2, y: 2, z: 0} second: serializedVersion: 2 @@ -5238,7 +4708,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 - first: {x: 8, y: 2, z: 0} second: serializedVersion: 2 @@ -5248,7 +4718,7 @@ Tilemap: m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 - m_AllTileFlags: 2147483649 + m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - m_RefCount: 0 @@ -5376,40 +4846,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 8121927806228425505, guid: ba1868bb4c26f6d41830aada771e3006, type: 3} m_PrefabInstance: {fileID: 1902862639} m_PrefabAsset: {fileID: 0} ---- !u!1 &1343206829 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1343206830} - m_Layer: 8 - m_Name: Torso - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1343206830 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343206829} - m_LocalRotation: {x: 0, y: 0, z: 0.7145881, w: 0.6995455} - m_LocalPosition: {x: -0.041246947, y: -1.0994492, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 38378803} - - {fileID: 874264867} - - {fileID: 1787711887} - m_Father: {fileID: 6535935} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1376671476 stripped Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} @@ -5863,11 +5299,41 @@ Transform: m_CorrespondingSourceObject: {fileID: 965998752200834250, guid: a7f273d812293e54d92972f62e1f0159, type: 3} m_PrefabInstance: {fileID: 5855359588613562702} m_PrefabAsset: {fileID: 0} ---- !u!95 &1627236053 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 2957004661200399871, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - m_PrefabInstance: {fileID: 5855359588613562702} +--- !u!70 &1627236057 +CapsuleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681564194} + 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.17, y: 0.03} + m_Size: {x: 0.6, y: 0.89} + m_Direction: 0 --- !u!1 &1744467215 GameObject: m_ObjectHideFlags: 0 @@ -5964,38 +5430,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} m_PrefabInstance: {fileID: 877886145} m_PrefabAsset: {fileID: 0} ---- !u!1 &1787711886 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1787711887} - m_Layer: 8 - m_Name: L_LowerBack - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1787711887 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1787711886} - m_LocalRotation: {x: 0, y: -0, z: 0.99474037, w: 0.10242856} - m_LocalPosition: {x: -0.20894979, y: 0.38865167, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 13891758} - m_Father: {fileID: 1343206830} - m_RootOrder: -1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1800031040 PrefabInstance: m_ObjectHideFlags: 0 @@ -6702,10 +6136,6 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} - - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: _animator - value: - objectReference: {fileID: 1627236053} - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: _bonesBack value: @@ -6714,22 +6144,6 @@ PrefabInstance: propertyPath: _bonesSide value: objectReference: {fileID: 582706328} - - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: _vikingBack - value: - objectReference: {fileID: 6535934} - - target: {fileID: 1693252312754102175, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: _vikingSide - value: - objectReference: {fileID: 582706328} - - target: {fileID: 1716637651858965058, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: m_SleepingMode - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3156624200786225141, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: m_Name - value: Torso - objectReference: {fileID: 0} - target: {fileID: 3156624200786225141, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_Layer value: 8 @@ -6758,6 +6172,18 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} + - target: {fileID: 7385329991569660597, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: m_Size.x + value: 0.45 + objectReference: {fileID: 0} + - target: {fileID: 7385329991569660597, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7385329991569660597, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + propertyPath: m_Offset.x + value: -0.09 + objectReference: {fileID: 0} - target: {fileID: 7532776947464835511, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_Layer value: 8 @@ -6770,10 +6196,6 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} - - target: {fileID: 8710076703627450349, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: m_AlwaysUpdate - value: 1 - objectReference: {fileID: 0} - target: {fileID: 9145485872817117069, guid: a7f273d812293e54d92972f62e1f0159, type: 3} propertyPath: m_Name value: Viking_Side @@ -6782,15 +6204,11 @@ PrefabInstance: propertyPath: m_Layer value: 8 objectReference: {fileID: 0} - - target: {fileID: 9145485872817117069, guid: a7f273d812293e54d92972f62e1f0159, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 965998752200834250, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 3931708971405200045, guid: a7f273d812293e54d92972f62e1f0159, type: 3} insertIndex: -1 - addedObject: {fileID: 6535935} - m_AddedComponents: [] + addedObject: {fileID: 1627236057} m_SourcePrefab: {fileID: 100100000, guid: a7f273d812293e54d92972f62e1f0159, type: 3} diff --git a/Assets/Scripts/Character.cs b/Assets/Scripts/Character.cs index 379edad..739fe53 100644 --- a/Assets/Scripts/Character.cs +++ b/Assets/Scripts/Character.cs @@ -12,13 +12,13 @@ public abstract class Character : MonoBehaviour protected GameObject _bonesBack; [SerializeField] - private LayerMask _mapLayer; + private LayerMask _mapLayer; private Rigidbody2D _body; - private BoxCollider2D _boxCollider; - + //private BoxCollider2D _boxCollider; + private CapsuleCollider2D _boxCollider; protected bool _isOnBridge; protected bool _isOnLadder; protected bool _isFalling; @@ -26,35 +26,39 @@ public abstract class Character : MonoBehaviour protected bool isAllowVertical = true; - protected bool isAllowRight=true; - protected bool isAllowLeft= true; + protected bool isAllowRight = true; + protected bool isAllowLeft = true; private void Start() { _body = GetComponent(); - _boxCollider = GetComponent(); + _boxCollider = GetComponent(); } - protected void MoveTo(float inputHorizontal,float inputVertical) + protected void MoveTo(float inputHorizontal, float inputVertical) { var mapElement = GetMapElement(Vector2.down); - + _isOnBridge = mapElement == MapElementType.Bridge && !_isFalling; - - float v_movement=0; - if (mapElement==MapElementType.Wall || _isOnLadder || _isOnBridge|| mapElement == MapElementType.BreakableWall) + + float v_movement = 0; + if (mapElement == MapElementType.Wall || _isOnLadder || _isOnBridge || mapElement == MapElementType.BreakableWall) { var leftCheck = GetMapElement(Vector2.left); var rightCheck = GetMapElement(Vector2.right); - if(leftCheck == MapElementType.Wall) { - isAllowLeft = false; - }else + if (leftCheck == MapElementType.Wall) + { + isAllowLeft = false; + } + else { isAllowLeft = true; } - if (rightCheck ==MapElementType.Wall) { + if (rightCheck == MapElementType.Wall) + { isAllowRight = false; - }else + } + else { isAllowRight = true; } @@ -73,16 +77,18 @@ public abstract class Character : MonoBehaviour SetWalkingAnimation(h_movement != 0); - _isOnLadder = mapElement == MapElementType.Ladder || GetMapElement(Vector2.up) == MapElementType.Ladder; + var upperElement = GetMapElement(Vector2.up); + _isOnLadder = mapElement == MapElementType.Ladder || upperElement == MapElementType.Ladder; if (_isOnLadder) { - + isAllowVertical = true; _isOnLadder = true; v_movement = inputVertical; if (v_movement > 0) { - if (GetMapElement(Vector2.up) != MapElementType.Ladder) + + if (upperElement != MapElementType.Ladder) { v_movement = 0; } @@ -99,16 +105,24 @@ public abstract class Character : MonoBehaviour private MapElementType GetMapElement(Vector2 direction) { - var raycastHit=Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, direction, 0.1f, _mapLayer); + var raycastHit = Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, direction, 0.1f, _mapLayer); if (raycastHit) { - var mapElement = raycastHit.transform.GetComponent(); - - return mapElement == null ? MapElementType.Empty : mapElement.ElementSO.ElementType; + if (mapElement == null) + { + return MapElementType.Empty; + } + if (mapElement.ElementSO.ElementType == MapElementType.BreakableWall) + { + if (mapElement.GetComponent().isTrigger) + { + return MapElementType.Empty; + } + } + return mapElement.ElementSO.ElementType; } - else - return MapElementType.Empty; + return MapElementType.Empty; } protected abstract void SetWalkingAnimation(bool isWalking); @@ -116,7 +130,7 @@ public abstract class Character : MonoBehaviour private void FixedUpdate() { - if (_isOnLadder|| _isOnBridge) + if (_isOnLadder || _isOnBridge) { _body.gravityScale = 0; } @@ -129,7 +143,7 @@ public abstract class Character : MonoBehaviour _body.velocity = new Vector2(0, _body.velocity.y); SetWalkingAnimation(false); - if (GetMapElement(Vector2.down)==MapElementType.Ladder) + if (GetMapElement(Vector2.down) == MapElementType.Ladder) { _body.velocity = Vector2.zero; _isOnLadder = true; @@ -146,5 +160,5 @@ public abstract class Character : MonoBehaviour _facingRight = !_facingRight; } - + } diff --git a/Assets/Sprites/Door.png b/Assets/Sprites/Door.png deleted file mode 100644 index c27864e..0000000 Binary files a/Assets/Sprites/Door.png and /dev/null differ diff --git a/Assets/Sprites/Door.png.meta b/Assets/Sprites/Door.png.meta deleted file mode 100644 index f1d8174..0000000 --- a/Assets/Sprites/Door.png.meta +++ /dev/null @@ -1,120 +0,0 @@ -fileFormatVersion: 2 -guid: 0ad2983bed21bb049b065cbc6efc57e8 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 11 - mipmaps: - mipMapMode: 0 - enableMipMap: 0 - sRGBTexture: 1 - linearTexture: 0 - fadeOut: 0 - borderMipMap: 0 - mipMapsPreserveCoverage: 0 - alphaTestReferenceValue: 0.5 - mipMapFadeDistanceStart: 1 - mipMapFadeDistanceEnd: 3 - bumpmap: - convertToNormalMap: 0 - externalNormalMap: 0 - heightScale: 0.25 - normalMapFilter: 0 - isReadable: 0 - streamingMipmaps: 0 - streamingMipmapsPriority: 0 - vTOnly: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 0 - aniso: 1 - mipBias: 0 - wrapU: 1 - wrapV: 1 - wrapW: 1 - nPOTScale: 0 - lightmap: 0 - compressionQuality: 50 - spriteMode: 1 - spriteExtrude: 1 - spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 - alphaUsage: 1 - alphaIsTransparency: 1 - spriteTessellationDetail: -1 - textureType: 8 - textureShape: 1 - singleChannelComponent: 0 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 0 - applyGammaDecoding: 0 - platformSettings: - - serializedVersion: 3 - buildTarget: DefaultTexturePlatform - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Standalone - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - maxTextureSize: 32 - resizeAlgorithm: 0 - textureFormat: -1 - textureCompression: 1 - compressionQuality: 50 - crunchedCompression: 0 - allowsAlphaSplitting: 0 - overridden: 0 - androidETC2FallbackOverride: 0 - forceMaximumCompressionQuality_BC6H_BC7: 0 - spriteSheet: - serializedVersion: 2 - sprites: [] - outline: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/Tileset.png.meta b/Assets/Sprites/Tileset.png.meta index 5bcf0a2..24f8310 100644 --- a/Assets/Sprites/Tileset.png.meta +++ b/Assets/Sprites/Tileset.png.meta @@ -142,7 +142,11 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -53, y: 66} + - {x: -52, y: -66} + - {x: 58, y: -66} + - {x: 55, y: 66} tessellationDetail: 0 bones: [] spriteID: ee075fd35e03f744bae3d980048a22c5 diff --git a/Assets/Sprites/Tileset_1.asset b/Assets/Sprites/Tileset_1.asset index 7b38f9a..a198251 100644 --- a/Assets/Sprites/Tileset_1.asset +++ b/Assets/Sprites/Tileset_1.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 2 + m_ColliderType: 1