From f25c9e145a85bad2391996229ecd4f697232fd14 Mon Sep 17 00:00:00 2001 From: shieldgenerator7 Date: Wed, 7 Aug 2024 02:46:27 -0400 Subject: [PATCH] #602 add moonicorn to the forest scene --- Assets/Scenes/Levels/Forest.unity | 229 ++++++++++++++++++++++++++++++ Assets/Scenes/Test/Tools.unity | 10 +- 2 files changed, 234 insertions(+), 5 deletions(-) diff --git a/Assets/Scenes/Levels/Forest.unity b/Assets/Scenes/Levels/Forest.unity index 4153f477d..aad3c68a0 100644 --- a/Assets/Scenes/Levels/Forest.unity +++ b/Assets/Scenes/Levels/Forest.unity @@ -79512,6 +79512,101 @@ Transform: m_CorrespondingSourceObject: {fileID: 8742538545776668643, guid: 3fe5ec721e0aaaa41a29763543b700a7, type: 3} m_PrefabInstance: {fileID: 1221477355} m_PrefabAsset: {fileID: 0} +--- !u!1 &1223879084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1223879085} + - component: {fileID: 1223879087} + - component: {fileID: 1223879086} + m_Layer: 0 + m_Name: Contact Made + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1223879085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223879084} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.16534725, w: 0.98623544} + m_LocalPosition: {x: 94.80718, y: 274.79752, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1996060516} + m_Father: {fileID: 2106814175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1223879086 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223879084} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 157980bc11266644cb1bfab4867dfe74, type: 3} + m_Name: + m_EditorClassIdentifier: + title: Contact Made + characters: [] + variableSetAction: {fileID: 0} +--- !u!61 &1223879087 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1223879084} + 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: -0.27243924, y: 0.019606352} + 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: 4.057237, y: 5.1245217} + m_EdgeRadius: 0 --- !u!1001 &1226444640 PrefabInstance: m_ObjectHideFlags: 0 @@ -106254,6 +106349,107 @@ Transform: m_Children: [] m_Father: {fileID: 1750306369} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1996060515 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1996060516} + - component: {fileID: 1996060518} + - component: {fileID: 1996060517} + m_Layer: 0 + m_Name: moonicorn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1996060516 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1996060515} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: 0.0017315298, w: 0.99999857} + m_LocalPosition: {x: -1.0122598, y: 1.6058726, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1223879085} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1996060517 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1996060515} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb914b3be499852479ef4a65144ad56c, type: 3} + m_Name: + m_EditorClassIdentifier: + characterName: Moonicorn +--- !u!212 &1996060518 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1996060515} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 21300000, guid: 0c6ca0fc6c29422499a10aac512a85c8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 0.49019608} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &1996272623 PrefabInstance: m_ObjectHideFlags: 0 @@ -108940,6 +109136,38 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 65ceefcc30cb13142abcfa50f2853724, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2106814174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2106814175} + m_Layer: 0 + m_Name: Dialogue + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2106814175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2106814174} + 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: + - {fileID: 1223879085} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2107521725 PrefabInstance: m_ObjectHideFlags: 0 @@ -110836,3 +111064,4 @@ SceneRoots: - {fileID: 1939390844} - {fileID: 1121648327} - {fileID: 1627823761} + - {fileID: 2106814175} diff --git a/Assets/Scenes/Test/Tools.unity b/Assets/Scenes/Test/Tools.unity index 4ed29deba..113e93473 100644 --- a/Assets/Scenes/Test/Tools.unity +++ b/Assets/Scenes/Test/Tools.unity @@ -26554,7 +26554,7 @@ Transform: m_GameObject: {fileID: 578159050} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: 0.0028429776, w: 0.99999595} - m_LocalPosition: {x: -2.0155444, y: 2.2220697, z: 0} + m_LocalPosition: {x: -0.95422614, y: -2.8441856, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -26962,8 +26962,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 942494481} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: -0.2796459, w: 0.9601032} - m_LocalPosition: {x: 235.56116, y: 370.06845, z: 0} + m_LocalRotation: {x: 0, y: 0, z: -0.1603508, w: 0.9870601} + m_LocalPosition: {x: 89.922806, y: 269.46167, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -26982,10 +26982,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4e4a228c3d54c3c4cb8506b66be89bcc, type: 3} m_Name: m_EditorClassIdentifier: - ForceLaunchAbility: 6 + ForceLaunchAbility: -1 SwapAbility: -1 WallClimbAbility: -1 - AirSliceAbility: 0 + AirSliceAbility: -1 ElectricBeamAbility: -1 LongTeleportAbility: -1 --- !u!1 &1079170519