diff --git a/Assets/Prefab/Player.prefab b/Assets/Prefab/Player.prefab index 3eb7d55..9f429d4 100644 --- a/Assets/Prefab/Player.prefab +++ b/Assets/Prefab/Player.prefab @@ -70,9 +70,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: ff75911aa8e6e1c42a92966085f22e30, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -152,9 +152,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 04e351cfb1aec44418d3d8d3d0edbed4, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -234,9 +234,9 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 1 + m_SortingOrder: 2 m_Sprite: {fileID: 21300000, guid: 11d3e3d28aa95cd4b9abbf66308d789c, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 @@ -246,7 +246,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1401925065402265152 +--- !u!1 &1561907533 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -254,41 +254,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1401925065402265156} - - component: {fileID: 1401925065402265157} - - component: {fileID: 1401925065402265155} - - component: {fileID: 62723886} - m_Layer: 6 - m_Name: Player - m_TagString: Player + - component: {fileID: 1561907534} + - component: {fileID: 1561907535} + m_Layer: 0 + m_Name: face + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1401925065402265156 +--- !u!4 &1561907534 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401925065402265152} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.46, y: -2.02, z: 0} - m_LocalScale: {x: 0.23494548, y: 0.23507255, z: 0.10724} - m_Children: - - {fileID: 371366809} - - {fileID: 824311394} - - {fileID: 1124008349} - m_Father: {fileID: 0} - m_RootOrder: 0 + m_GameObject: {fileID: 1561907533} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.02, y: 0.17, z: 0} + m_LocalScale: {x: 1.0455993, y: 1.0138965, z: 1.629959} + m_Children: [] + m_Father: {fileID: 1401925065402265156} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1401925065402265157 +--- !u!212 &1561907535 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1401925065402265152} + m_GameObject: {fileID: 1561907533} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -322,6 +317,95 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: fa52e2a66e4b139438c5411d4aae3b91, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 3} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!1 &1401925065402265152 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1401925065402265156} + - component: {fileID: 1401925065402265157} + - component: {fileID: 1401925065402265155} + - component: {fileID: 62723886} + - component: {fileID: 1882719086} + m_Layer: 6 + m_Name: Player + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1401925065402265156 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401925065402265152} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.46, y: -2.02, z: 0} + m_LocalScale: {x: 0.30197543, y: 0.29560375, z: 0.10724} + m_Children: + - {fileID: 371366809} + - {fileID: 824311394} + - {fileID: 1124008349} + - {fileID: 1561907534} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1401925065402265157 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401925065402265152} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + 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: -2 m_Sprite: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -361,13 +445,13 @@ BoxCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1401925065402265152} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} + m_Offset: {x: 0.037444115, y: 0.16466534} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.5, y: 0.5} @@ -378,5 +462,34 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 5.78, y: 4.36} + m_Size: {x: 3.8778343, y: 4.68933} m_EdgeRadius: 0 +--- !u!68 &1882719086 +EdgeCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1401925065402265152} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_EdgeRadius: 0 + m_Points: + - {x: 0.057273388, y: -2.1790206} + - {x: 1.960483, y: -0.33101434} + - {x: 1.4524753, y: 0.21201766} + - {x: 1.9628128, y: 0.6585706} + - {x: -0.00079488754, y: 2.5196757} + - {x: -1.8909527, y: 0.70041287} + - {x: -1.4126854, y: 0.19663985} + - {x: -1.9046292, y: -0.34483123} + - {x: 0.017476559, y: -2.166569} + m_AdjacentStartPoint: {x: 0, y: 0} + m_AdjacentEndPoint: {x: 0, y: 0} + m_UseAdjacentStartPoint: 0 + m_UseAdjacentEndPoint: 0 diff --git a/Assets/Scenes/Levels/Level0.unity b/Assets/Scenes/Levels/Level0.unity index c1873d2..d06f042 100644 --- a/Assets/Scenes/Levels/Level0.unity +++ b/Assets/Scenes/Levels/Level0.unity @@ -1146,7 +1146,6 @@ MonoBehaviour: lineRenderer: {fileID: 438337} edgeCollider2D: {fileID: 438339} drawingFuel: {fileID: 1334512717} - drawingFuelConsumption: 0.0003 --- !u!4 &1011955019 Transform: m_ObjectHideFlags: 0 @@ -1883,11 +1882,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.x - value: -0.1111 + value: -0.412 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.y - value: -2.7 + value: -2.4283 objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.z @@ -1921,10 +1920,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} --- !u!1001 &4392037887054685161 diff --git a/Assets/Scenes/Levels/Level7.unity b/Assets/Scenes/Levels/Level7.unity index aae649c..cbaa41e 100644 --- a/Assets/Scenes/Levels/Level7.unity +++ b/Assets/Scenes/Levels/Level7.unity @@ -1436,7 +1436,6 @@ MonoBehaviour: lineRenderer: {fileID: 438337} edgeCollider2D: {fileID: 438339} drawingFuel: {fileID: 1334512717} - drawingFuelConsumption: 0.0005 --- !u!4 &1011955019 Transform: m_ObjectHideFlags: 0 @@ -2007,14 +2006,6 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.x - value: 8.98 - objectReference: {fileID: 0} - - target: {fileID: 1401925064809260275, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SpriteTilingProperty.oldSize.y - value: 8.98 - objectReference: {fileID: 0} - target: {fileID: 1401925065402265152, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_Name value: Player @@ -2023,18 +2014,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 5 objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.x - value: 0.23494548 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.y - value: 0.23507255 - objectReference: {fileID: 0} - - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_LocalScale.z - value: 0.10724 - objectReference: {fileID: 0} - target: {fileID: 1401925065402265156, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} propertyPath: m_LocalPosition.x value: 1.62 @@ -2075,14 +2054,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: b17eeea0b0d0d489c96df6c0c83c26a6, type: 3} - - target: {fileID: 1401925065402265157, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} - propertyPath: m_SortingOrder - value: -2 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ca014140e3936fc4f94a5f3337ca1557, type: 3} --- !u!1001 &4392037887054685161 @@ -2092,6 +2063,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 1332690989, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} + propertyPath: m_AnchoredPosition.x + value: 7.539917 + objectReference: {fileID: 0} - target: {fileID: 4392037886296478720, guid: 108361155e96f5e4ba43d9a3fde825c9, type: 3} propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index ae035bb..e67f9c6 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -223,7 +223,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Save NOWAI + m_text: Save TWEP m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b741db7ac3d1c423aad5b49a9780ca2d, type: 2} m_sharedMaterial: {fileID: 5568139486216784236, guid: b741db7ac3d1c423aad5b49a9780ca2d, type: 2} diff --git a/Assets/Scripts/Drawer.cs b/Assets/Scripts/Drawer.cs index a2f6267..0213f25 100644 --- a/Assets/Scripts/Drawer.cs +++ b/Assets/Scripts/Drawer.cs @@ -15,7 +15,7 @@ public class Drawer : MonoBehaviour List points = new List(); public Slider drawingFuel; - public float drawingFuelConsumption = 0.05f; + // public float drawingFuelConsumption = 0.05f; // public LayerMask drawMask; bool dragging = false; @@ -46,20 +46,23 @@ public class Drawer : MonoBehaviour drawn = true; GameManager.StartGame(); } + float distance = 0.1f; if(points.Count> 0) { RaycastHit2D hit = Physics2D.Linecast(points[points.Count - 1], worldPos); if (hit.collider != null) { - return; } + + + distance = Vector2.Distance(worldPos, points[points.Count-1]); } points.Add(worldPos); UpdateLine(); - drawingFuel.value -= drawingFuelConsumption; + drawingFuel.value -= distance * 0.03f; } public void OnMouseUp(BaseEventData e) diff --git a/Assets/Sprites/twep_logo.png b/Assets/Sprites/twep_logo.png new file mode 100644 index 0000000..fe115b2 Binary files /dev/null and b/Assets/Sprites/twep_logo.png differ diff --git a/Assets/Sprites/twep_logo.png.meta b/Assets/Sprites/twep_logo.png.meta new file mode 100644 index 0000000..38a205d --- /dev/null +++ b/Assets/Sprites/twep_logo.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: fa52e2a66e4b139438c5411d4aae3b91 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9c2c720..be9e0c3 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -13,7 +13,7 @@ PlayerSettings: useOnDemandResources: 0 accelerometerFrequency: 60 companyName: DefaultCompany - productName: SavePoge + productName: SaveTWEP defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}