diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity index bcf6ccbc..1be0c312 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 1.unity @@ -2313,6 +2313,89 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ab2e507b20e5dc844a1ea24b5619f656, type: 3} +--- !u!1 &391267027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 391267029} + - component: {fileID: 391267028} + m_Layer: 0 + m_Name: TON.CameraConfiner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!60 &391267028 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391267027} + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 109.35594, y: 9.875925} + - {x: -42.522408, y: 9.8345585} + - {x: -42.51193, y: -9.452566} + - {x: 37.229424, y: -9.798737} + - {x: 97.9171, y: -9.557066} + - {x: 109.5338, y: -9.570671} + m_UseDelaunayMesh: 0 +--- !u!4 &391267029 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 391267027} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -63.289806, y: 0.06459762, z: -0.029410893} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &535565208 GameObject: m_ObjectHideFlags: 0 @@ -58478,8 +58561,9 @@ GameObject: - component: {fileID: 1014812134} - component: {fileID: 1014812133} - component: {fileID: 1014812135} + - component: {fileID: 1014812136} m_Layer: 0 - m_Name: CM vcam + m_Name: CM Player Camera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -58507,7 +58591,7 @@ MonoBehaviour: m_Follow: {fileID: 0} m_Lens: FieldOfView: 60 - OrthographicSize: 10 + OrthographicSize: 6 NearClipPlane: 0.3 FarClipPlane: 1000 Dutch: 0 @@ -58532,13 +58616,13 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014812132} serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 27.863968, y: -0.029999256, z: -10.076585} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -96.88, y: -4.5, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1487631563} - m_Father: {fileID: 0} + m_Father: {fileID: 1986734011} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1014812135 MonoBehaviour: @@ -58552,6 +58636,23 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 58f4ec2a370c10c44a9a548e6cfd2d74, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1014812136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1014812132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2fba25a5cd15594e8f050a11e386c80, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ConfineMode: 0 + m_BoundingVolume: {fileID: 0} + m_BoundingShape2D: {fileID: 391267028} + m_ConfineScreenEdges: 1 + m_Damping: 0.5 --- !u!1 &1185367601 GameObject: m_ObjectHideFlags: 0 @@ -58605,7 +58706,7 @@ Camera: far clip plane: 1000 field of view: 60 orthographic: 1 - orthographic size: 10 + orthographic size: 6 m_Depth: -1 m_CullingMask: serializedVersion: 2 @@ -58630,7 +58731,7 @@ Transform: m_GameObject: {fileID: 1185367601} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -87.98603, y: -0.029999256, z: -10.076585} + m_LocalPosition: {x: -95.13507, y: -3.387968, z: -10.076585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -91598,7 +91699,7 @@ Transform: m_GameObject: {fileID: 1441848034} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.87, y: -6.93, z: -0.07658499} + m_LocalPosition: {x: 13.45, y: -5.95, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -91653,21 +91754,21 @@ MonoBehaviour: m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 0 - m_XDamping: 1 + m_XDamping: 2 m_YDamping: 1 m_ZDamping: 1 m_TargetMovementOnly: 1 - m_ScreenX: 0.379 - m_ScreenY: 0.775 + m_ScreenX: 0.3365364 + m_ScreenY: 0.4822644 m_CameraDistance: 10 - m_DeadZoneWidth: 1 - m_DeadZoneHeight: 1 + m_DeadZoneWidth: 0.2074782 + m_DeadZoneHeight: 0.435 m_DeadZoneDepth: 0 m_UnlimitedSoftZone: 0 - m_SoftZoneWidth: 1.5 - m_SoftZoneHeight: 1.034 - m_BiasX: 0 - m_BiasY: 0 + m_SoftZoneWidth: 0.543 + m_SoftZoneHeight: 1.239 + m_BiasX: -0.013 + m_BiasY: -0.022 m_CenterOnActivate: 1 m_GroupFramingMode: 2 m_AdjustmentMode: 0 @@ -102146,6 +102247,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1185367604} + - {fileID: 1014812134} + - {fileID: 391267029} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2067632266 @@ -112177,8 +112280,7 @@ SceneRoots: - {fileID: 315647991} - {fileID: 718284631} - {fileID: 2135657552} - - {fileID: 535565209} - {fileID: 2067632268} + - {fileID: 535565209} - {fileID: 1423029865} - {fileID: 1441848035} - - {fileID: 1014812134} diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity index 481b4b56..29bc727d 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 2.unity @@ -7196,6 +7196,94 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &235576335 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235576336} + - component: {fileID: 235576338} + - component: {fileID: 235576337} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &235576336 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235576335} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1604541691} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &235576337 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235576335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 2 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 + m_ScreenX: 0.3365364 + m_ScreenY: 0.4822644 + m_CameraDistance: 10 + m_DeadZoneWidth: 0.2074782 + m_DeadZoneHeight: 0.435 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 + m_SoftZoneWidth: 0.543 + m_SoftZoneHeight: 1.239 + m_BiasX: -0.013 + m_BiasY: -0.022 + m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 +--- !u!114 &235576338 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235576335} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &265027070 GameObject: m_ObjectHideFlags: 3 @@ -53204,6 +53292,96 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 265027071} +--- !u!1 &1294871278 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1294871279} + - component: {fileID: 1294871280} + m_Layer: 0 + m_Name: TON.CameraConfiner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1294871279 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294871278} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 20.360191, y: 25.964598, z: -0.029410893} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &1294871280 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1294871278} + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 72.11712, y: -32.58574} + - {x: 42.394215, y: -32.41815} + - {x: 42.309402, y: -6.3478527} + - {x: -6.634945, y: -6.263525} + - {x: -6.755329, y: 9.639651} + - {x: -61.72405, y: 9.615573} + - {x: -61.494114, y: -11.418158} + - {x: -21.732374, y: -11.6349745} + - {x: -16.615341, y: -16.381254} + - {x: -17.177624, y: -33.341232} + - {x: 25.27021, y: -33.563072} + - {x: 25.046265, y: -56.276672} + - {x: 72.09766, y: -55.805676} + m_UseDelaunayMesh: 0 --- !u!1001 &1355096343 PrefabInstance: m_ObjectHideFlags: 0 @@ -156171,6 +156349,109 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 +--- !u!1 &1604541690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604541691} + - component: {fileID: 1604541694} + - component: {fileID: 1604541693} + - component: {fileID: 1604541692} + m_Layer: 0 + m_Name: CM Player Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1604541691 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604541690} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -30.04, y: 21.4, z: -10.076585} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 235576336} + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1604541692 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604541690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2fba25a5cd15594e8f050a11e386c80, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ConfineMode: 0 + m_BoundingVolume: {fileID: 0} + m_BoundingShape2D: {fileID: 1294871280} + m_ConfineScreenEdges: 1 + m_Damping: 0.5 +--- !u!114 &1604541693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604541690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58f4ec2a370c10c44a9a548e6cfd2d74, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1604541694 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604541690} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 6 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 235576336} --- !u!1 &1644259201 GameObject: m_ObjectHideFlags: 0 @@ -348795,6 +349076,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1185367604} + - {fileID: 1604541691} + - {fileID: 1294871279} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2007555153 diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity index ed8d518b..fbf2cd38 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 3.unity @@ -36841,6 +36841,109 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &555611694 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 555611695} + - component: {fileID: 555611698} + - component: {fileID: 555611697} + - component: {fileID: 555611696} + m_Layer: 0 + m_Name: CM Player Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &555611695 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555611694} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.48, y: -4.68, z: -10.076585} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 898973141} + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &555611696 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555611694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2fba25a5cd15594e8f050a11e386c80, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ConfineMode: 0 + m_BoundingVolume: {fileID: 0} + m_BoundingShape2D: {fileID: 1364815914} + m_ConfineScreenEdges: 1 + m_Damping: 0.5 +--- !u!114 &555611697 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555611694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58f4ec2a370c10c44a9a548e6cfd2d74, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &555611698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 555611694} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 6 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 898973141} --- !u!1 &718284630 GameObject: m_ObjectHideFlags: 0 @@ -41216,6 +41319,94 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &898973140 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 898973141} + - component: {fileID: 898973143} + - component: {fileID: 898973142} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &898973141 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898973140} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 555611695} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &898973142 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898973140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 2 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 + m_ScreenX: 0.3365364 + m_ScreenY: 0.4822644 + m_CameraDistance: 10 + m_DeadZoneWidth: 0.2074782 + m_DeadZoneHeight: 0.435 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 + m_SoftZoneWidth: 0.543 + m_SoftZoneHeight: 1.239 + m_BiasX: -0.013 + m_BiasY: -0.022 + m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 +--- !u!114 &898973143 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 898973140} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1068442246 PrefabInstance: m_ObjectHideFlags: 0 @@ -44352,6 +44543,90 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1364815912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1364815913} + - component: {fileID: 1364815914} + m_Layer: 0 + m_Name: TON.CameraConfiner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1364815913 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1364815912} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 52.560192, y: 0.06459762, z: -0.029410893} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &1364815914 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1364815912} + 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: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: 35.460785, y: 9.732994} + - {x: -70.28108, y: 10.03426} + - {x: -70.28017, y: -9.781834} + - {x: -0.35424423, y: -9.798363} + - {x: 35.795906, y: -9.684055} + - {x: 35.91521, y: -9.738358} + - {x: 35.78157, y: -9.570671} + m_UseDelaunayMesh: 0 --- !u!1 &1490603789 GameObject: m_ObjectHideFlags: 0 @@ -56579,7 +56854,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 46 - m_TileSpriteIndex: 46 + m_TileSpriteIndex: 52 m_TileMatrixIndex: 1 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -56609,7 +56884,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 45 - m_TileSpriteIndex: 45 + m_TileSpriteIndex: 50 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -59579,7 +59854,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 26 - m_TileSpriteIndex: 31 + m_TileSpriteIndex: 49 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -61030,8 +61305,8 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 4 m_Data: {fileID: 877233149, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 1 - m_Data: {fileID: -1921165662, guid: 76fa8be48da57814ea137aeb42116019, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 4 m_Data: {fileID: 877625539, guid: addba330fa5746846bf7ccb7c801500f, type: 3} - m_RefCount: 18 @@ -61058,22 +61333,22 @@ Tilemap: m_Data: {fileID: -1746007234, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - m_RefCount: 9 m_Data: {fileID: 899948592, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 483183913, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 2129366779, guid: 76fa8be48da57814ea137aeb42116019, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -1207184339, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - m_RefCount: 1 m_Data: {fileID: -1670976261, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: -1921165662, guid: 76fa8be48da57814ea137aeb42116019, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 483183913, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - m_RefCount: 4 m_Data: {fileID: -2090950127, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 2129366779, guid: 76fa8be48da57814ea137aeb42116019, type: 3} - m_RefCount: 1 m_Data: {fileID: 1526097586, guid: addba330fa5746846bf7ccb7c801500f, type: 3} - m_RefCount: 1 @@ -69278,6 +69553,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1185367604} + - {fileID: 555611695} + - {fileID: 1364815913} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2067632266 diff --git a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity index 78d01f4c..844f1efe 100644 --- a/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity +++ b/Gameton-06/Assets/Gameton/Scenes/Stage 4.unity @@ -15060,6 +15060,94 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &770153263 +GameObject: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 770153264} + - component: {fileID: 770153266} + - component: {fileID: 770153265} + m_Layer: 0 + m_Name: cm + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &770153264 +Transform: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770153263} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1271586652} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &770153265 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770153263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TrackedObjectOffset: {x: 0, y: 0, z: 0} + m_LookaheadTime: 0 + m_LookaheadSmoothing: 0 + m_LookaheadIgnoreY: 0 + m_XDamping: 2 + m_YDamping: 1 + m_ZDamping: 1 + m_TargetMovementOnly: 1 + m_ScreenX: 0.3365364 + m_ScreenY: 0.4822644 + m_CameraDistance: 10 + m_DeadZoneWidth: 0.2074782 + m_DeadZoneHeight: 0.435 + m_DeadZoneDepth: 0 + m_UnlimitedSoftZone: 0 + m_SoftZoneWidth: 0.543 + m_SoftZoneHeight: 1.239 + m_BiasX: -0.013 + m_BiasY: -0.022 + m_CenterOnActivate: 1 + m_GroupFramingMode: 2 + m_AdjustmentMode: 0 + m_GroupFramingSize: 0.8 + m_MaxDollyIn: 5000 + m_MaxDollyOut: 5000 + m_MinimumDistance: 1 + m_MaximumDistance: 5000 + m_MinimumFOV: 3 + m_MaximumFOV: 60 + m_MinimumOrthoSize: 1 + m_MaximumOrthoSize: 5000 +--- !u!114 &770153266 +MonoBehaviour: + m_ObjectHideFlags: 3 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770153263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &770762291 GameObject: m_ObjectHideFlags: 0 @@ -18231,6 +18319,109 @@ MonoBehaviour: m_Calls: [] m_LegacyBlendHint: 0 m_ComponentOwner: {fileID: 265027071} +--- !u!1 &1271586651 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1271586652} + - component: {fileID: 1271586655} + - component: {fileID: 1271586654} + - component: {fileID: 1271586653} + m_Layer: 0 + m_Name: CM Player Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1271586652 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271586651} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -5.48, y: -4.68, z: -10.076585} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 770153264} + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1271586653 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271586651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a2fba25a5cd15594e8f050a11e386c80, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ConfineMode: 0 + m_BoundingVolume: {fileID: 0} + m_BoundingShape2D: {fileID: 0} + m_ConfineScreenEdges: 1 + m_Damping: 0.5 +--- !u!114 &1271586654 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271586651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 58f4ec2a370c10c44a9a548e6cfd2d74, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &1271586655 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1271586651} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_ExcludedPropertiesInInspector: + - m_Script + m_LockStageInInspector: + m_StreamingVersion: 20170927 + m_Priority: 10 + m_StandbyUpdate: 2 + m_LookAt: {fileID: 0} + m_Follow: {fileID: 0} + m_Lens: + FieldOfView: 60 + OrthographicSize: 6 + NearClipPlane: 0.3 + FarClipPlane: 1000 + Dutch: 0 + ModeOverride: 0 + LensShift: {x: 0, y: 0} + GateFit: 2 + FocusDistance: 10 + m_SensorSize: {x: 1, y: 1} + m_Transitions: + m_BlendHint: 0 + m_InheritPosition: 0 + m_OnCameraLive: + m_PersistentCalls: + m_Calls: [] + m_LegacyBlendHint: 0 + m_ComponentOwner: {fileID: 770153264} --- !u!1 &1428897358 GameObject: m_ObjectHideFlags: 0 @@ -34452,8 +34643,95 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1185367604} + - {fileID: 2055061000} + - {fileID: 1271586652} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2055060999 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2055061000} + - component: {fileID: 2055061001} + m_Layer: 0 + m_Name: TON.CameraConfiner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2055061000 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055060999} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1986734011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!60 &2055061001 +PolygonCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2055060999} + 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, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Points: + m_Paths: + - - {x: -18.002113, y: 9.921868} + - {x: -17.844536, y: -9.985446} + - {x: 0.67922527, y: -10.047637} + - {x: 6.259497, y: -10.063744} + - {x: 14.751854, y: -9.932543} + - {x: 14.27755, y: -9.985667} + - {x: 17.9036, y: -9.889262} + - {x: 17.844536, y: 9.9699745} + m_UseDelaunayMesh: 0 --- !u!1 &2067632266 GameObject: m_ObjectHideFlags: 0 diff --git a/Gameton-06/ProjectSettings/ProjectSettings.asset b/Gameton-06/ProjectSettings/ProjectSettings.asset index 6caba015..45e6910a 100644 --- a/Gameton-06/ProjectSettings/ProjectSettings.asset +++ b/Gameton-06/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7cb8b5de0ea78b9132ec956b9ec65f1eb76c5f74c9ac295870f8ac62d17c2fbc -size 23641 +oid sha256:b8cff0431030dfb9ed24040bdb7abb87164cf59531b23d10969ebfd1d0995375 +size 23705