diff --git a/Prototype/Assets/Materials/Smile.physicsMaterial2D b/Prototype/Assets/Materials/Smile.physicsMaterial2D new file mode 100644 index 0000000..3410074 --- /dev/null +++ b/Prototype/Assets/Materials/Smile.physicsMaterial2D @@ -0,0 +1,10 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Smile + friction: 0.4 + bounciness: 0.5 diff --git a/Prototype/Assets/Materials/Smile.physicsMaterial2D.meta b/Prototype/Assets/Materials/Smile.physicsMaterial2D.meta new file mode 100644 index 0000000..1fdde63 --- /dev/null +++ b/Prototype/Assets/Materials/Smile.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c4433b433563e6b4ebc0ebe3c48f14cc +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Materials/Wall.physicsMaterial2D b/Prototype/Assets/Materials/Wall.physicsMaterial2D new file mode 100644 index 0000000..5ae5fd5 --- /dev/null +++ b/Prototype/Assets/Materials/Wall.physicsMaterial2D @@ -0,0 +1,10 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!62 &6200000 +PhysicsMaterial2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_Name: Wall + friction: 0.4 + bounciness: 0.5 diff --git a/Prototype/Assets/Materials/Wall.physicsMaterial2D.meta b/Prototype/Assets/Materials/Wall.physicsMaterial2D.meta new file mode 100644 index 0000000..0090447 --- /dev/null +++ b/Prototype/Assets/Materials/Wall.physicsMaterial2D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4c8a339d423f8664da202e96302f6959 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 6200000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Prototype/Assets/Prefabs/goodSmile.prefab b/Prototype/Assets/Prefabs/goodSmile.prefab index 24106ee..91b6b91 100644 --- a/Prototype/Assets/Prefabs/goodSmile.prefab +++ b/Prototype/Assets/Prefabs/goodSmile.prefab @@ -20,9 +20,9 @@ GameObject: m_Component: - component: {fileID: 4848052366342088} - component: {fileID: 212100749619683522} - - component: {fileID: 135923678653754648} - component: {fileID: 114880291302347842} - - component: {fileID: 54790508077356992} + - component: {fileID: 58507608348887176} + - component: {fileID: 50276781725797630} m_Layer: 0 m_Name: goodSmile m_TagString: Smile @@ -43,21 +43,41 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &54790508077356992 -Rigidbody: +--- !u!50 &50276781725797630 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1606677245037588} - serializedVersion: 2 + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.5 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 1 - m_Constraints: 0 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: c4433b433563e6b4ebc0ebe3c48f14cc, type: 2} + m_Interpolate: 0 + m_SleepingMode: 1 m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!58 &58507608348887176 +CircleCollider2D: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1606677245037588} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: c4433b433563e6b4ebc0ebe3c48f14cc, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 2.56 --- !u!114 &114880291302347842 MonoBehaviour: m_ObjectHideFlags: 1 @@ -72,18 +92,6 @@ MonoBehaviour: gameController: {fileID: 0} goodSmile: {fileID: 21300000, guid: a2bd550470c31e845b6c26f543e9e582, type: 3} badSmile: {fileID: 21300000, guid: caf166d1667cea7438d3a73945735d13, type: 3} ---- !u!135 &135923678653754648 -SphereCollider: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1606677245037588} - m_Material: {fileID: 13400000, guid: 3e66bb0e3427c0c4fba290c46515f599, type: 2} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 2.56 - m_Center: {x: 0, y: 0, z: 0} --- !u!212 &212100749619683522 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Prototype/Assets/Scenes/Main menu.unity b/Prototype/Assets/Scenes/Main menu.unity index dbc8083..10e42f0 100644 --- a/Prototype/Assets/Scenes/Main menu.unity +++ b/Prototype/Assets/Scenes/Main menu.unity @@ -130,19 +130,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &202154160 -Transform: +--- !u!224 &202154160 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 202154159} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 96.100006, y: 223.4, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -77, y: -77} + m_SizeDelta: {x: 7.5, y: 7.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &202154161 SpriteRenderer: m_ObjectHideFlags: 0 @@ -214,86 +219,6 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 ---- !u!1 &468781618 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 468781620} - - component: {fileID: 468781619} - m_Layer: 0 - m_Name: BackGround - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &468781619 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 468781618} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: -1 - m_Sprite: {fileID: 21300000, guid: 4da8c50f26ec84a4b9e746048dec1a30, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!224 &468781620 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 468781618} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 86.13, y: 84.215996, z: 63.8} - m_Children: [] - m_Father: {fileID: 1566214680} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10.1, y: 7.6092} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &511442102 GameObject: m_ObjectHideFlags: 0 @@ -312,20 +237,27 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &511442103 -Transform: +--- !u!224 &511442103 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 511442102} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.6, y: -0.6, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 15, y: 15, z: 0.99974597} m_Children: - {fileID: 975177772} + - {fileID: 1669613469} + - {fileID: 552923906} m_Father: {fileID: 1566214680} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.00000011920929, y: -0.00000011920929} + m_SizeDelta: {x: 7.5, y: 7.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &511442104 SpriteRenderer: m_ObjectHideFlags: 0 @@ -436,16 +368,17 @@ RectTransform: m_GameObject: {fileID: 552923905} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.999746, y: 0.999746, z: 0.999746} - m_Children: [] - m_Father: {fileID: 1566214680} - m_RootOrder: 6 + m_LocalScale: {x: 0.06664973, y: 0.06664973, z: 1} + m_Children: + - {fileID: 1187406499} + m_Father: {fileID: 511442103} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 1.662735, y: -127.84158} - m_SizeDelta: {x: 172.41699, y: 46.299988} - m_Pivot: {x: 1, y: 0.5} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 6, y: -6} + m_SizeDelta: {x: 155.1, y: 46.3} + m_Pivot: {x: 0.5, y: 0} --- !u!114 &552923907 MonoBehaviour: m_ObjectHideFlags: 0 @@ -576,19 +509,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &927701440 -Transform: +--- !u!224 &927701440 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 927701439} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -95.6, y: 223.4, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 77, y: -77} + m_SizeDelta: {x: 7.5, y: 7.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &927701441 SpriteRenderer: m_ObjectHideFlags: 0 @@ -765,9 +703,9 @@ RectTransform: m_Father: {fileID: 1566214680} m_RootOrder: 1 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: -93.6, y: -221.5} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 77, y: 77} m_SizeDelta: {x: 7.5, y: 7.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1017778126 @@ -857,19 +795,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1170947645 -Transform: +--- !u!224 &1170947645 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1170947644} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -31.963799, y: 127.4724, z: 0} - m_LocalScale: {x: 12.498245, y: 12.498245, z: 12.498245} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 12.498244, y: 12.498244, z: 12.498244} m_Children: [] - m_Father: {fileID: 1566214680} - m_RootOrder: 8 + m_Father: {fileID: 1669613469} + m_RootOrder: 0 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: -44, y: 0} + m_SizeDelta: {x: 3.5205002, y: 5.2} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1170947646 SpriteRenderer: m_ObjectHideFlags: 0 @@ -978,19 +921,24 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &1187406499 -Transform: +--- !u!224 &1187406499 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1187406497} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -31.94466, y: -127.3448, z: 0} - m_LocalScale: {x: 12.419431, y: 12.419431, z: 12.419431} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 12.422586, y: 12.422586, z: 12.422586} m_Children: [] - m_Father: {fileID: 1566214680} - m_RootOrder: 9 + m_Father: {fileID: 552923906} + m_RootOrder: 0 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: -44, y: 0} + m_SizeDelta: {x: 5.1200027, y: 5.12} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1345157844 GameObject: m_ObjectHideFlags: 0 @@ -1024,7 +972,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.6792453, g: 0, b: 0, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -1085,19 +1033,24 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1439351811 -Transform: +--- !u!224 &1439351811 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1439351810} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 95.8, y: -222.50002, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 7.9998813, y: 7.9998813, z: 0.99974597} m_Children: [] m_Father: {fileID: 1566214680} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -77, y: 77} + m_SizeDelta: {x: 7.5, y: 7.5} + m_Pivot: {x: 0.5, y: 0.5} --- !u!212 &1439351812 SpriteRenderer: m_ObjectHideFlags: 0 @@ -1214,12 +1167,12 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 2 - m_MatchWidthOrHeight: 0 + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 1 m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 @@ -1254,16 +1207,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 468781620} - - {fileID: 1017778125} - {fileID: 511442103} + - {fileID: 1017778125} - {fileID: 1439351811} - {fileID: 927701440} - {fileID: 202154160} - - {fileID: 552923906} - - {fileID: 1669613469} - - {fileID: 1170947645} - - {fileID: 1187406499} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1297,16 +1245,17 @@ RectTransform: m_GameObject: {fileID: 1669613468} 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_Children: [] - m_Father: {fileID: 1566214680} - m_RootOrder: 7 + m_LocalScale: {x: 0.06666666, y: 0.06666666, z: 1.0002542} + m_Children: + - {fileID: 1170947645} + m_Father: {fileID: 511442103} + m_RootOrder: 1 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: 94.393456, y: 128.34727} - m_SizeDelta: {x: 171.492, y: 46.3} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 6, y: 6} + m_SizeDelta: {x: 151.88, y: 46.3} + m_Pivot: {x: 0.5, y: 1} --- !u!114 &1669613470 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Prototype/Assets/Scenes/Play.unity b/Prototype/Assets/Scenes/Play.unity index bc48e80..94ea205 100644 --- a/Prototype/Assets/Scenes/Play.unity +++ b/Prototype/Assets/Scenes/Play.unity @@ -113,91 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &59746479 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 59746480} - - component: {fileID: 59746483} - - component: {fileID: 59746482} - - component: {fileID: 59746481} - m_Layer: 0 - m_Name: RWall - m_TagString: Wall - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &59746480 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 59746479} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.308466, y: 0.0017758608, z: 0} - m_LocalScale: {x: 0.99788, y: 9.997951, z: 1} - m_Children: [] - m_Father: {fileID: 1494342096} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &59746481 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 59746479} - m_Material: {fileID: 13400000, guid: f7b6ca826bab15149b2c0495fb2b58a3, type: 2} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &59746482 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 59746479} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10303, 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_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 ---- !u!33 &59746483 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 59746479} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -231,7 +146,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 1, g: 1, b: 1, a: 0} + m_BackGroundColor: {r: 0.6132076, g: 0.026032386, b: 0.026032386, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -275,41 +190,73 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &642160015 +--- !u!1 &521076469 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 642160016} - - component: {fileID: 642160017} + - component: {fileID: 521076470} + - component: {fileID: 521076472} + - component: {fileID: 521076471} + - component: {fileID: 521076473} m_Layer: 0 - m_Name: BackGround - m_TagString: Untagged + m_Name: RWall + m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &642160016 -Transform: +--- !u!224 &521076470 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 642160015} + m_GameObject: {fileID: 521076469} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -260, y: 1, z: 0} - m_LocalScale: {x: 86.13, y: 84.215996, z: 63.8} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} m_Children: [] m_Father: {fileID: 717251630} - m_RootOrder: 1 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &642160017 + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 32, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 1, y: 0.5} +--- !u!61 &521076471 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 521076469} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.030000001, y: -0.020925045} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.5, y: 19.700874} + m_EdgeRadius: 0 +--- !u!212 &521076472 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 642160015} + m_GameObject: {fileID: 521076469} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -338,8 +285,8 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -1 - m_Sprite: {fileID: 21300000, guid: 4da8c50f26ec84a4b9e746048dec1a30, type: 3} + m_SortingOrder: 0 + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -347,114 +294,106 @@ SpriteRenderer: m_Size: {x: 10.24, y: 7.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &701995165 -Prefab: +--- !u!50 &521076473 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 717251630} - m_Modifications: - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} - m_IsPrefabAsset: 0 ---- !u!1 &705113770 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 521076469} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!1 &612765556 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 705113771} - - component: {fileID: 705113774} - - component: {fileID: 705113773} - - component: {fileID: 705113772} + - component: {fileID: 612765557} + - component: {fileID: 612765559} + - component: {fileID: 612765558} + - component: {fileID: 612765560} m_Layer: 0 - m_Name: 'BWall ' + m_Name: BWall m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &705113771 -Transform: +--- !u!224 &612765557 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705113770} + m_GameObject: {fileID: 612765556} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.0023659468, y: -5.3033237, z: 0} - m_LocalScale: {x: 5.6299887, y: 0.60551, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} m_Children: [] - m_Father: {fileID: 1494342096} - m_RootOrder: 3 + m_Father: {fileID: 717251630} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &705113772 -BoxCollider: + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: -44} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0} +--- !u!61 &612765558 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705113770} - m_Material: {fileID: 13400000, guid: f7b6ca826bab15149b2c0495fb2b58a3, type: 2} - m_IsTrigger: 0 + m_GameObject: {fileID: 612765556} m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.004981518, y: 0.15193298} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &705113773 -MeshRenderer: + m_Size: {x: 20.5, y: 0.3} + m_EdgeRadius: 0 +--- !u!212 &612765559 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705113770} + m_GameObject: {fileID: 612765556} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 2100000, guid: 1c225884260d9a845be82b707451acc0, type: 2} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -466,7 +405,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -474,13 +413,83 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &705113774 -MeshFilter: + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &612765560 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 705113770} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 612765556} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!1001 &701995165 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 717251630} + m_Modifications: + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 686e065bf45f45b45b88594546f9ab40, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &717251626 GameObject: m_ObjectHideFlags: 0 @@ -526,7 +535,7 @@ MonoBehaviour: m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_UiScaleMode: 0 + m_UiScaleMode: 1 m_ReferencePixelsPerUnit: 100 m_ScaleFactor: 1 m_ReferenceResolution: {x: 800, y: 600} @@ -566,8 +575,11 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: + - {fileID: 612765557} + - {fileID: 1962936287} + - {fileID: 1731775105} + - {fileID: 521076470} - {fileID: 2067009724} - - {fileID: 642160016} - {fileID: 1501846922} m_Father: {fileID: 0} m_RootOrder: 2 @@ -687,65 +699,93 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1298760588 +--- !u!1 &1501846919 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, + type: 2} + m_PrefabInternal: {fileID: 701995165} +--- !u!4 &1501846922 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, + type: 2} + m_PrefabInternal: {fileID: 701995165} +--- !u!1 &1731775104 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1298760589} - - component: {fileID: 1298760592} - - component: {fileID: 1298760591} - - component: {fileID: 1298760590} + - component: {fileID: 1731775105} + - component: {fileID: 1731775107} + - component: {fileID: 1731775106} + - component: {fileID: 1731775108} m_Layer: 0 - m_Name: 'TWall ' + m_Name: LWall m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1298760589 -Transform: +--- !u!224 &1731775105 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1298760588} + m_GameObject: {fileID: 1731775104} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.001034081, y: 5.3069754, z: 0} - m_LocalScale: {x: 5.6120267, y: 0.60550636, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} m_Children: [] - m_Father: {fileID: 1494342096} + m_Father: {fileID: 717251630} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1298760590 -BoxCollider: + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: -38, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0, y: 0.5} +--- !u!61 &1731775106 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1298760588} - m_Material: {fileID: 13400000, guid: f7b6ca826bab15149b2c0495fb2b58a3, type: 2} - m_IsTrigger: 0 + m_GameObject: {fileID: 1731775104} m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.030000001, y: -0.013874531} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1298760591 -MeshRenderer: + m_Size: {x: 0.5, y: 19.720936} + m_EdgeRadius: 0 +--- !u!212 &1731775107 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1298760588} + m_GameObject: {fileID: 1731775104} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -757,7 +797,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -765,72 +805,114 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &1298760592 -MeshFilter: + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &1731775108 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1298760588} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1409795760 + m_GameObject: {fileID: 1731775104} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!1 &1962936286 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1409795761} - - component: {fileID: 1409795764} - - component: {fileID: 1409795763} - - component: {fileID: 1409795762} + - component: {fileID: 1962936287} + - component: {fileID: 1962936289} + - component: {fileID: 1962936288} + - component: {fileID: 1962936290} m_Layer: 0 - m_Name: LWall + m_Name: TWall m_TagString: Wall m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1409795761 -Transform: +--- !u!224 &1962936287 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1409795760} + m_GameObject: {fileID: 1962936286} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -3.3115342, y: 0.0066758394, z: 0} - m_LocalScale: {x: 0.97811997, y: 9.976011, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} m_Children: [] - m_Father: {fileID: 1494342096} - m_RootOrder: 0 + m_Father: {fileID: 717251630} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!65 &1409795762 -BoxCollider: + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 1} +--- !u!61 &1962936288 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1409795760} - m_Material: {fileID: 13400000, guid: f7b6ca826bab15149b2c0495fb2b58a3, type: 2} - m_IsTrigger: 0 + m_GameObject: {fileID: 1962936286} m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.004981518, y: 0.15193298} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 10.24, y: 7.68} + newSize: {x: 10.24, y: 7.68} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!23 &1409795763 -MeshRenderer: + m_Size: {x: 20.5, y: 0.3} + m_EdgeRadius: 0 +--- !u!212 &1962936289 +SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1409795760} + m_GameObject: {fileID: 1962936286} m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -842,7 +924,7 @@ MeshRenderer: m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 + m_SelectedEditorRenderState: 0 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 @@ -850,55 +932,37 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &1409795764 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1409795760} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1494342095 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1494342096} - m_Layer: 0 - m_Name: Walls - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1494342096 -Transform: + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 10.24, y: 7.68} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &1962936290 +Rigidbody2D: + serializedVersion: 4 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1494342095} - 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_Children: - - {fileID: 1409795761} - - {fileID: 59746480} - - {fileID: 1298760589} - - {fileID: 705113771} - m_Father: {fileID: 0} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1501846919 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1825723940427572, guid: 686e065bf45f45b45b88594546f9ab40, - type: 2} - m_PrefabInternal: {fileID: 701995165} ---- !u!4 &1501846922 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4927523239576160, guid: 686e065bf45f45b45b88594546f9ab40, - type: 2} - m_PrefabInternal: {fileID: 701995165} + m_GameObject: {fileID: 1962936286} + m_BodyType: 2 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 0 + m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Interpolate: 0 + m_SleepingMode: 0 + m_CollisionDetection: 1 + m_Constraints: 0 --- !u!1 &2067009723 GameObject: m_ObjectHideFlags: 0 @@ -927,7 +991,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 717251630} - m_RootOrder: 0 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -957,7 +1021,7 @@ MonoBehaviour: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} m_FontSize: 30 m_FontStyle: 1 - m_BestFit: 0 + m_BestFit: 1 m_MinSize: 3 m_MaxSize: 59 m_Alignment: 4 diff --git a/Prototype/Assets/Scripts/CntrlSmile.cs b/Prototype/Assets/Scripts/CntrlSmile.cs index 3e1ba57..b119304 100644 --- a/Prototype/Assets/Scripts/CntrlSmile.cs +++ b/Prototype/Assets/Scripts/CntrlSmile.cs @@ -40,7 +40,7 @@ void Update() } } - private void OnCollisionEnter(Collision nearObj) + private void OnCollisionEnter2D(Collision2D nearObj) { if (nearObj.gameObject.tag == "Wall") diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index 3237d7c..156e78a 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -36,12 +36,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1141 + x: 993 y: 0 - width: 445 + width: 593 height: 671 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -70,7 +70,7 @@ MonoBehaviour: m_MinSize: {x: 887, y: 492} m_MaxSize: {x: 16012, y: 14042} vertical: 0 - controlID: 55 + controlID: 119 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -89,8 +89,8 @@ MonoBehaviour: y: 0 width: 334 height: 947 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} m_Panes: - {fileID: 17} @@ -114,8 +114,8 @@ MonoBehaviour: y: 0 width: 218 height: 671 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -169,7 +169,7 @@ MonoBehaviour: y: 0 width: 1920 height: 997 - m_MinSize: {x: 950, y: 542} + m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} --- !u!114 &8 MonoBehaviour: @@ -235,7 +235,7 @@ MonoBehaviour: m_MinSize: {x: 610, y: 492} m_MaxSize: {x: 12010, y: 14042} vertical: 1 - controlID: 56 + controlID: 120 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -260,7 +260,7 @@ MonoBehaviour: m_MinSize: {x: 610, y: 221} m_MaxSize: {x: 12010, y: 4021} vertical: 0 - controlID: 57 + controlID: 121 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -277,10 +277,10 @@ MonoBehaviour: serializedVersion: 2 x: 218 y: 0 - width: 923 + width: 775 height: 671 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -372,9 +372,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 768 + y: 763 width: 1584 - height: 250 + height: 255 m_PersistentViewDataDictionary: {fileID: 0} m_AnimEditor: {fileID: 0} m_LockTracker: @@ -442,20 +442,20 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Scenes + - Assets/Prefabs m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scenes + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 182a0000 - m_LastClickedID: 10776 - m_ExpandedIDs: 00000000ec29000000ca9a3b + m_SelectedIDs: 142c0000 + m_LastClickedID: 11284 + m_ExpandedIDs: 00000000ea29000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -483,7 +483,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ec290000 + m_ExpandedIDs: 00000000ea290000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -510,7 +510,7 @@ MonoBehaviour: m_ListAreaState: m_SelectedInstanceIDs: m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000700200000000007c260000448ef7ff m_RenameOverlay: m_UserAcceptedRename: 0 @@ -599,9 +599,9 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 0c2d0000 - m_LastClickedID: 11532 - m_ExpandedIDs: e4fbffff00000000122d0000182d00002c2d0000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 1284f8ffc60cfeffe4fbffff00000000e42c0000ee2c0000322d00003c2d0000ae2e0000da2e0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -646,18 +646,18 @@ MonoBehaviour: serializedVersion: 2 x: 220 y: 92 - width: 919 + width: 771 height: 650 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 - lastFramingTime: 21356.4038592 - m_2DMode: 1 + lastFramingTime: 7868.8214484 + m_2DMode: 0 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -2.976352, y: -0.6579062, z: -0.08210335} + m_Target: {x: 0.8339547, y: -0.49287844, z: 1.5438805} speed: 2 - m_Value: {x: -2.976352, y: -0.6579062, z: -0.08210335} + m_Value: {x: 0.8339547, y: -0.49287844, z: 1.5438805} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -677,27 +677,27 @@ MonoBehaviour: speed: 2 m_Value: 0 yGrid: - m_Target: 0 - speed: 2 - m_Value: 0 - zGrid: m_Target: 1 speed: 2 m_Value: 1 + zGrid: + m_Target: 0 + speed: 2 + m_Value: 0 m_Rotation: - m_Target: {x: 0, y: 0, z: 0, w: 1} + m_Target: {x: 0.16671106, y: -0.0965551, z: 0.016406296, w: 0.9811297} speed: 2 - m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Value: {x: 0.16671106, y: -0.0965551, z: 0.016406296, w: 0.9811297} m_Size: - m_Target: 11.16836 + m_Target: 20.142725 speed: 2 - m_Value: 11.16836 + m_Value: 20.142725 m_Ortho: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: 0.1902359, y: -0.094668694, z: 0.01843354, w: 0.97698945} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -723,25 +723,25 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1143 + x: 995 y: 92 - width: 441 + width: 589 height: 650 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 00000000000000000000000012000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 0000000000000000000000000c000000000000000000000000000000000000000000000000000000 m_TargetDisplay: 0 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -178 - m_HBaseRangeMax: 178 - m_VBaseRangeMin: -316.5 - m_VBaseRangeMax: 316.5 + m_HBaseRangeMin: -1480 + m_HBaseRangeMax: 1480 + m_VBaseRangeMin: -720 + m_VBaseRangeMax: 720 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -759,25 +759,25 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 441 + width: 589 height: 633 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 220.5, y: 316.5} + m_Scale: {x: 0.19898649, y: 0.19898649} + m_Translation: {x: 294.5, y: 316.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -220.5 - y: -316.5 - width: 441 - height: 633 + x: -1480 + y: -1590.5603 + width: 2960 + height: 3181.1206 m_MinimalGUI: 1 - m_defaultScale: 1 + m_defaultScale: 0.19898649 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 - m_LastWindowPixelSize: {x: 441, y: 650} + m_LastWindowPixelSize: {x: 589, y: 650} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000001000100000100 @@ -803,7 +803,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 768 + y: 763 width: 1584 - height: 250 + height: 255 m_PersistentViewDataDictionary: {fileID: 0} diff --git a/Prototype/Library/InspectorExpandedItems.asset b/Prototype/Library/InspectorExpandedItems.asset index 55ff2b2..e6c1b2b 100644 Binary files a/Prototype/Library/InspectorExpandedItems.asset and b/Prototype/Library/InspectorExpandedItems.asset differ diff --git a/Prototype/Library/LastSceneManagerSetup.txt b/Prototype/Library/LastSceneManagerSetup.txt index 88234d9..3201e86 100644 --- a/Prototype/Library/LastSceneManagerSetup.txt +++ b/Prototype/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/Main menu.unity +- path: Assets/Scenes/Play.unity isLoaded: 1 isActive: 1 diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index bea6755..5c87578 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index baa6704..52e6bb4 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959 b/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959 new file mode 100644 index 0000000..664f280 Binary files /dev/null and b/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959 differ diff --git a/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959.info b/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959.info new file mode 100644 index 0000000..0f536e4 Binary files /dev/null and b/Prototype/Library/metadata/4c/4c8a339d423f8664da202e96302f6959.info differ diff --git a/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc b/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc new file mode 100644 index 0000000..6390084 Binary files /dev/null and b/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc differ diff --git a/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc.info b/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc.info new file mode 100644 index 0000000..1f1773b Binary files /dev/null and b/Prototype/Library/metadata/c4/c4433b433563e6b4ebc0ebe3c48f14cc.info differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index e5b6dfd..44e39bd 100644 Binary files a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c and b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index e7952fa..be4a4a1 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,2 +1,29 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.2.21f1/Editor/Data Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler