diff --git a/Assets/Prefabs/Camera.prefab b/Assets/Prefabs/Camera.prefab index 4949d14..f5a1bb4 100644 --- a/Assets/Prefabs/Camera.prefab +++ b/Assets/Prefabs/Camera.prefab @@ -36,7 +36,7 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1683038502340488} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 33.22, z: -1} + m_LocalPosition: {x: 3.47, y: 36.09, z: -1} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -100,6 +100,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fd512583b04cd7946b3a98cb56ce031c, type: 3} m_Name: m_EditorClassIdentifier: - target: {fileID: 0} + target: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, type: 2} limitFirstCorner: {x: -29.5, y: 7} limitSecondCorner: {x: 30, y: 50} diff --git a/Assets/Prefabs/Enemy.prefab b/Assets/Prefabs/Enemy.prefab index 28e941a..ccffd1e 100644 --- a/Assets/Prefabs/Enemy.prefab +++ b/Assets/Prefabs/Enemy.prefab @@ -87,8 +87,8 @@ Rigidbody2D: m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 m_Mass: 1.5 - m_LinearDrag: 1 - m_AngularDrag: 1 + m_LinearDrag: 0.1 + m_AngularDrag: 0.5 m_GravityScale: 1 m_Material: {fileID: 6200000, guid: 704f912fbe8bba74ebedd5a5f7bff08f, type: 2} m_Interpolate: 0 diff --git a/Assets/Prefabs/Multiplayer Manager.prefab b/Assets/Prefabs/Multiplayer Manager.prefab new file mode 100644 index 0000000..b16aa1b --- /dev/null +++ b/Assets/Prefabs/Multiplayer Manager.prefab @@ -0,0 +1,140 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1475191143568528} + m_IsPrefabAsset: 1 +--- !u!1 &1475191143568528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4132011117567450} + - component: {fileID: 114690282574846718} + - component: {fileID: 114445873336760754} + m_Layer: 0 + m_Name: Multiplayer Manager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4132011117567450 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1475191143568528} + 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: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &114445873336760754 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1475191143568528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 227461547, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + manager: {fileID: 0} + showGUI: 1 + offsetX: 0 + offsetY: 130 +--- !u!114 &114690282574846718 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1475191143568528} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -822479833, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_NetworkPort: 1234 + m_ServerBindToIP: 0 + m_ServerBindAddress: + m_NetworkAddress: localhost + m_DontDestroyOnLoad: 1 + m_RunInBackground: 1 + m_ScriptCRCCheck: 1 + m_MaxDelay: 0.01 + m_LogLevel: 2 + m_PlayerPrefab: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, + type: 2} + m_AutoCreatePlayer: 1 + m_PlayerSpawnMethod: 0 + m_OfflineScene: MainMenu + m_OnlineScene: Game + m_SpawnPrefabs: [] + m_CustomConfig: 0 + m_MaxConnections: 4 + m_ConnectionConfig: + m_PacketSize: 1440 + m_FragmentSize: 500 + m_ResendTimeout: 1200 + m_DisconnectTimeout: 2000 + m_ConnectTimeout: 2000 + m_MinUpdateTimeout: 10 + m_PingTimeout: 500 + m_ReducedPingTimeout: 100 + m_AllCostTimeout: 20 + m_NetworkDropThreshold: 5 + m_OverflowDropThreshold: 5 + m_MaxConnectionAttempt: 10 + m_AckDelay: 33 + m_SendDelay: 10 + m_MaxCombinedReliableMessageSize: 100 + m_MaxCombinedReliableMessageCount: 10 + m_MaxSentMessageQueueSize: 512 + m_AcksType: 1 + m_UsePlatformSpecificProtocols: 0 + m_InitialBandwidth: 0 + m_BandwidthPeakFactor: 2 + m_WebSocketReceiveBufferMaxSize: 0 + m_UdpSocketReceiveBufferMaxSize: 0 + m_SSLCertFilePath: + m_SSLPrivateKeyFilePath: + m_SSLCAFilePath: + m_Channels: [] + m_GlobalConfig: + m_ThreadAwakeTimeout: 1 + m_ReactorModel: 0 + m_ReactorMaximumReceivedMessages: 1024 + m_ReactorMaximumSentMessages: 1024 + m_MaxPacketSize: 2000 + m_MaxHosts: 16 + m_ThreadPoolSize: 1 + m_MinTimerTimeout: 1 + m_MaxTimerTimeout: 12000 + m_MinNetSimulatorTimeout: 1 + m_MaxNetSimulatorTimeout: 12000 + m_Channels: + m_UseWebSockets: 0 + m_UseSimulator: 0 + m_SimulatedLatency: 1 + m_PacketLossPercentage: 0 + m_MaxBufferedPackets: 16 + m_AllowFragmentation: 1 + m_MatchHost: mm.unet.unity3d.com + m_MatchPort: 443 + matchName: default + matchSize: 4 + isNetworkActive: 0 + matchMaker: {fileID: 0} diff --git a/Assets/Prefabs/Multiplayer Manager.prefab.meta b/Assets/Prefabs/Multiplayer Manager.prefab.meta new file mode 100644 index 0000000..12f748e --- /dev/null +++ b/Assets/Prefabs/Multiplayer Manager.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 49a1c4d70d0505b41900fb9f6f8b688f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Ship.prefab b/Assets/Prefabs/Ship.prefab index 98b088e..94435da 100644 --- a/Assets/Prefabs/Ship.prefab +++ b/Assets/Prefabs/Ship.prefab @@ -39,6 +39,8 @@ GameObject: - component: {fileID: 50107883579770240} - component: {fileID: 114893472868460232} - component: {fileID: 114815898204907146} + - component: {fileID: 114320476920337370} + - component: {fileID: 114870102256947850} m_Layer: 8 m_Name: Ship m_TagString: Player @@ -48,33 +50,14 @@ GameObject: m_IsActive: 1 --- !u!1 &1707044546218068 GameObject: - m_ObjectHideFlags: 1 + m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} serializedVersion: 6 m_Component: - component: {fileID: 4811992088834386} - - component: {fileID: 212513540302985290} - - component: {fileID: 61023326388071292} m_Layer: 8 m_Name: Fish Pile - m_TagString: Fish - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1884810528837284 -GameObject: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4881997913105036} - - component: {fileID: 212270562025887474} - - component: {fileID: 114971120113848216} - m_Layer: 8 - m_Name: Cannon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -86,14 +69,15 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1506768218425990} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 3.83, y: 37.79, z: 0} + m_LocalRotation: {x: -0, y: -0, z: 0.049957126, w: -0.99875134} + m_LocalPosition: {x: -14.61, y: 9.41, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4419769467158982} + - {fileID: 4811992088834386} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.727} --- !u!4 &4419769467158982 Transform: m_ObjectHideFlags: 1 @@ -101,11 +85,9 @@ Transform: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1396569450907664} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.93, y: -2.08, z: 0} + m_LocalPosition: {x: 22.3, y: -0.38, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4811992088834386} - - {fileID: 4881997913105036} + m_Children: [] m_Father: {fileID: 4279439219186522} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -115,24 +97,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1707044546218068} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.91920006, y: 0.332, z: 0} + 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: 4419769467158982} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &4881997913105036 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1884810528837284} - m_LocalRotation: {x: -0, y: -0, z: 0.4695518, w: 0.88290495} - m_LocalPosition: {x: -0.08000004, y: 0.61999893, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4419769467158982} + m_Father: {fileID: 4279439219186522} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!50 &50107883579770240 @@ -183,31 +152,38 @@ PolygonCollider2D: - {x: 0.78310096, y: -0.51465136} - {x: 1.3078427, y: 0.32390344} - {x: -1.2722943, y: 0.3283955} ---- !u!61 &61023326388071292 -BoxCollider2D: +--- !u!114 &114320476920337370 +MonoBehaviour: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707044546218068} + m_GameObject: {fileID: 1506768218425990} 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.25} - 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 - serializedVersion: 2 - m_Size: {x: 0.61, y: 0.46} - m_EdgeRadius: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SceneId: + m_Value: 0 + m_AssetId: + i0: 28 + i1: 247 + i2: 3 + i3: 149 + i4: 138 + i5: 102 + i6: 157 + i7: 148 + i8: 42 + i9: 66 + i10: 50 + i11: 100 + i12: 153 + i13: 112 + i14: 19 + i15: 103 + m_ServerOnly: 0 + m_LocalPlayerAuthority: 1 --- !u!114 &114815898204907146 MonoBehaviour: m_ObjectHideFlags: 1 @@ -220,17 +196,30 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: fishCaught: 0 - fishPileSprites: - - {fileID: 0} - - {fileID: 21300000, guid: 1ca1321049c586e4f86c43b461c53210, type: 3} - - {fileID: 21300000, guid: 5357d76bfe87f37489c252197d6548f3, type: 3} - - {fileID: 21300000, guid: 72d0711964923ee469e38d13424858f8, type: 3} - - {fileID: 21300000, guid: 082fbe21a6557cd4a866620a4586293b, type: 3} - - {fileID: 21300000, guid: 69cfde8a6e90b4e4f875f925ecdf4ead, type: 3} - - {fileID: 21300000, guid: ab4f5ce491a45fa4ba43f2e031b26bd1, type: 3} - - {fileID: 21300000, guid: 2749b8097b8dea44b91b5119d5cfd775, type: 3} - fishPileStages: 010000000200000003000000040000000a0000001100000019000000 - fishPile: {fileID: 1707044546218068} + fishPileSprites: [] + fishPileStages: + fishPile: {fileID: 0} +--- !u!114 &114870102256947850 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1506768218425990} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransformSyncMode: 2 + m_SendInterval: 0.1 + m_SyncRotationAxis: 3 + m_RotationSyncCompression: 0 + m_SyncSpin: 0 + m_MovementTheshold: 0.001 + m_VelocityThreshold: 0.0001 + m_SnapThreshold: 5 + m_InterpolateRotation: 1 + m_InterpolateMovement: 1 --- !u!114 &114893472868460232 MonoBehaviour: m_ObjectHideFlags: 1 @@ -247,115 +236,6 @@ MonoBehaviour: verticalShipSpeed: 30 maxJetFuel: 2 jetFuelRechargeSpeed: 0.1 ---- !u!114 &114971120113848216 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1884810528837284} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7bc860ed21bbef247869c07bd6fef82f, type: 3} - m_Name: - m_EditorClassIdentifier: - harpoonAvailable: 1 - harpoon: {fileID: 1737609814504882, guid: 288f16ae5eaa16440b89da431723b1c2, type: 2} - hull: {fileID: 1396569450907664} - maxForce: 5 - forceBuildingSpeed: 4 - startingForce: 1 ---- !u!212 &212270562025887474 -SpriteRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1884810528837284} - 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: -1570049999 - m_SortingLayer: 2 - m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: bdd08b099cc1c614096f43a9ccf99b59, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 1 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.48, y: 1.02} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!212 &212513540302985290 -SpriteRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1707044546218068} - 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: 0 - 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: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!212 &212928515413584804 SpriteRenderer: m_ObjectHideFlags: 1 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 034da12..626df2f 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -399,7 +399,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &162431714 stripped Transform: @@ -499,7 +499,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4978811670595372, guid: 633eed510cb97614896a65613c2eb772, type: 2} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 633eed510cb97614896a65613c2eb772, type: 2} @@ -679,52 +679,6 @@ SphereCollider: serializedVersion: 2 m_Radius: 0.5 m_Center: {x: 0, y: 0, z: 0} ---- !u!1001 &317854633 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1571656221} - m_Modifications: - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.x - value: -19.36 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.y - value: -30.8 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.z - value: 0.40207273 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_Name - value: Enemy (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - m_IsPrefabAsset: 0 --- !u!4 &382755411 stripped Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, @@ -739,11 +693,11 @@ Prefab: m_Modifications: - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_LocalPosition.x - value: 3.47 + value: -2.42 objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_LocalPosition.y - value: 36.09 + value: 39.03 objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_LocalPosition.z @@ -767,26 +721,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27, - type: 2} - propertyPath: target - value: - objectReference: {fileID: 1410052124} - - target: {fileID: 20610604938940038, guid: acb6270a21e7fa744878210a4df90d27, - type: 2} - propertyPath: m_RenderingPath - value: -1 + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: acb6270a21e7fa744878210a4df90d27, type: 2} m_IsPrefabAsset: 0 ---- !u!4 &449207487 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 1105789933} --- !u!1001 &543261843 Prefab: m_ObjectHideFlags: 0 @@ -948,22 +887,22 @@ Prefab: type: 2} propertyPath: script value: - objectReference: {fileID: 1410052124} + objectReference: {fileID: 0} - target: {fileID: 114688263243653950, guid: bc06cb2f1b218344a98d1b869a67ec65, type: 2} propertyPath: nave1 value: - objectReference: {fileID: 1847212376} + objectReference: {fileID: 0} - target: {fileID: 114688263243653950, guid: bc06cb2f1b218344a98d1b869a67ec65, type: 2} propertyPath: nave2 value: - objectReference: {fileID: 1772198299} + objectReference: {fileID: 0} - target: {fileID: 114688263243653950, guid: bc06cb2f1b218344a98d1b869a67ec65, type: 2} propertyPath: nave3 value: - objectReference: {fileID: 2135851599} + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: bc06cb2f1b218344a98d1b869a67ec65, type: 2} m_IsPrefabAsset: 0 @@ -1060,55 +999,13 @@ RectTransform: - {fileID: 949267804} - {fileID: 189120856} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &744010482 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalPosition.x - value: 3.83 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalPosition.y - value: 37.79 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2} - m_IsPrefabAsset: 0 --- !u!1001 &754549122 Prefab: m_ObjectHideFlags: 0 @@ -1202,7 +1099,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4023639078503100, guid: 0514a38f22bae454d821a12517a141c4, type: 2} propertyPath: m_RootOrder - value: 3 + value: 2 objectReference: {fileID: 0} - target: {fileID: 60970885189888988, guid: 0514a38f22bae454d821a12517a141c4, type: 2} @@ -8770,7 +8667,7 @@ Transform: m_Children: - {fileID: 310692030} m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &949267803 GameObject: @@ -8865,6 +8762,46 @@ Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_PrefabInternal: {fileID: 1240811157} +--- !u!1 &980202804 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 980202806} + - component: {fileID: 980202805} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &980202805 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 980202804} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1050975500, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &980202806 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 980202804} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 50.64, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 11 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &994904156 Prefab: m_ObjectHideFlags: 0 @@ -9398,52 +9335,6 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 ---- !u!1001 &1105789933 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1571656221} - m_Modifications: - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.x - value: -11.895 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.y - value: -30.719 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.z - value: 0.40207273 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_Name - value: Enemy (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - m_IsPrefabAsset: 0 --- !u!1 &1147089289 GameObject: m_ObjectHideFlags: 0 @@ -9504,7 +9395,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1187485091 GameObject: @@ -9618,7 +9509,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} propertyPath: m_LocalScale.x @@ -9861,11 +9752,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 4955254497044876, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_PrefabInternal: {fileID: 1597600653} ---- !u!1 &1410052124 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 744010482} --- !u!1001 &1415523105 Prefab: m_ObjectHideFlags: 0 @@ -9917,79 +9803,6 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 ---- !u!1001 &1426862778 -Prefab: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1571656221} - m_Modifications: - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.x - value: -88.68 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.y - value: -30.76 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalPosition.z - value: 0.40207273 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8a1e5fa769b403340be7a2808b56d69c, type: 2} - m_IsPrefabAsset: 0 ---- !u!1 &1571656220 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1571656221} - m_Layer: 0 - m_Name: Enemies - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1571656221 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1571656220} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 50.929913, y: 66.4563, z: -0.40207273} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1721412594} - - {fileID: 2058116047} - - {fileID: 449207487} - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1597600653 Prefab: m_ObjectHideFlags: 0 @@ -10144,16 +9957,6 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 ---- !u!4 &1721412594 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 1426862778} ---- !u!1 &1772198299 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 317854633} --- !u!1 &1810787824 GameObject: m_ObjectHideFlags: 0 @@ -10229,11 +10032,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1847212376 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 1426862778} --- !u!1 &1857488323 GameObject: m_ObjectHideFlags: 0 @@ -10353,7 +10151,7 @@ Transform: - {fileID: 618464446} - {fileID: 1254279577} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2008841353 stripped GameObject: @@ -10515,11 +10313,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!4 &2058116047 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4056561897088050, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 317854633} --- !u!1 &2072399419 GameObject: m_ObjectHideFlags: 0 @@ -15193,7 +14986,7 @@ Transform: m_Children: - {fileID: 95782943} m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2089851341 Prefab: @@ -15251,8 +15044,3 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343a89599f7365845937eb14b4669b20, type: 2} m_IsPrefabAsset: 0 ---- !u!1 &2135851599 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1195403025493360, guid: 8a1e5fa769b403340be7a2808b56d69c, - type: 2} - m_PrefabInternal: {fileID: 1105789933} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index cf789c8..23cd376 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -113,95 +113,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &215901068 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 215901072} - - component: {fileID: 215901071} - - component: {fileID: 215901070} - - component: {fileID: 215901069} - m_Layer: 8 - m_Name: Ship - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &215901069 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114815898204907146, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 215901068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e1de68aef1b6a89419a36f3455e25bf3, type: 3} - m_Name: - m_EditorClassIdentifier: - fishCaught: 0 - fishPileSprites: [] - fishPileStages: - fishPile: {fileID: 0} ---- !u!114 &215901070 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 114893472868460232, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 215901068} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 91d88e1722c056f47a710df9123b44a9, type: 3} - m_Name: - m_EditorClassIdentifier: - hull: {fileID: 757881493} - horizontalShipSpeed: 5 - verticalShipSpeed: 30 - maxJetFuel: 2 - jetFuelRechargeSpeed: 0.1 ---- !u!50 &215901071 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 50107883579770240, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 215901068} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 2 - m_LinearDrag: 1 - m_AngularDrag: 1 - m_GravityScale: 1 - m_Material: {fileID: 6200000, guid: 704f912fbe8bba74ebedd5a5f7bff08f, type: 2} - m_Interpolate: 0 - m_SleepingMode: 1 - m_CollisionDetection: 0 - m_Constraints: 0 ---- !u!4 &215901072 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 215901068} - m_LocalRotation: {x: -0, y: -0, z: 0.049957126, w: -0.99875134} - m_LocalPosition: {x: -14.61, y: 9.41, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 757881496} - - {fileID: 891569523} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -5.727} --- !u!1001 &303581856 Prefab: m_ObjectHideFlags: 0 @@ -239,7 +150,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4722408669233146, guid: c5ddb823086133341948764b93db7721, type: 2} propertyPath: m_RootOrder - value: 9 + value: 7 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c5ddb823086133341948764b93db7721, type: 2} @@ -333,16 +244,57 @@ RectTransform: - {fileID: 682959665} - {fileID: 725114150} - {fileID: 688381489} - - {fileID: 1750903378} - {fileID: 1460525243} m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &529918481 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4132011117567450, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + propertyPath: m_RootOrder + value: 9 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 49a1c4d70d0505b41900fb9f6f8b688f, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &650713241 GameObject: m_ObjectHideFlags: 0 @@ -395,76 +347,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &670477758 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 670477760} - - component: {fileID: 670477759} - - component: {fileID: 670477761} - m_Layer: 0 - m_Name: GameStart - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &670477759 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 670477758} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 1 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 13.7, y: -0.44705772} - 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 - serializedVersion: 2 - m_Size: {x: 8.27, y: 69.63} - m_EdgeRadius: 0 ---- !u!4 &670477760 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 670477758} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 11.6, y: 0.4, z: -50.34375} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 6 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &670477761 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 670477758} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 594e0c139ab753e46afbb701fdea7867, type: 3} - m_Name: - m_EditorClassIdentifier: - image: {fileID: 2033480561} - fade: {fileID: 2033480559} --- !u!1 &682959664 GameObject: m_ObjectHideFlags: 0 @@ -702,144 +586,6 @@ CanvasRenderer: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 725114149} m_CullTransparentMesh: 0 ---- !u!1 &757881493 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1396569450907664, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 757881496} - - component: {fileID: 757881495} - - component: {fileID: 757881494} - m_Layer: 8 - m_Name: Hull - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!60 &757881494 -PolygonCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 60759684842668732, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 757881493} - 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_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 2.68, y: 1.3} - newSize: {x: 1.34, y: 0.65} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Points: - m_Paths: - - - {x: -1.2726313, y: -0.5143094} - - {x: 0.78310096, y: -0.51465136} - - {x: 1.3078427, y: 0.32390344} - - {x: -1.2722943, y: 0.3283955} ---- !u!212 &757881495 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 212928515413584804, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 757881493} - 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: 2 - m_Sprite: {fileID: 21300000, guid: 1f841006c9147454d8eca3d3cae86c0f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1.34, y: 0.65} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &757881496 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4419769467158982, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 757881493} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.3, y: -0.38, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 215901072} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &891569522 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 1707044546218068, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 891569523} - m_Layer: 8 - m_Name: Fish Pile - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &891569523 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 4811992088834386, guid: 1cf703958a669d942a42326499701367, - type: 2} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 891569522} - 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: 215901072} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &922617565 GameObject: m_ObjectHideFlags: 0 @@ -892,7 +638,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &984464199 GameObject: @@ -946,7 +692,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1018142136 Prefab: @@ -985,7 +731,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4059627635461364, guid: acb6270a21e7fa744878210a4df90d27, type: 2} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 114070643257783382, guid: acb6270a21e7fa744878210a4df90d27, type: 2} @@ -1052,7 +798,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1353125949220882, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2} propertyPath: m_Name @@ -1066,6 +812,60 @@ Prefab: m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2} m_IsPrefabAsset: 0 +--- !u!1 &1240646766 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1240646768} + - component: {fileID: 1240646767} + m_Layer: 0 + m_Name: LeftCollider (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1240646767 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1240646766} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 8.33074} + 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 + serializedVersion: 2 + m_Size: {x: 1, y: 54.01412} + m_EdgeRadius: 0 +--- !u!4 &1240646768 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1240646766} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.28, y: -1.3, z: -50.34375} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 10 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1460525242 GameObject: m_ObjectHideFlags: 0 @@ -1094,7 +894,7 @@ RectTransform: m_LocalScale: {x: 0.0039999997, y: 0.0039999997, z: 0.0039999997} m_Children: [] m_Father: {fileID: 366541451} - m_RootOrder: 5 + 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} @@ -1216,83 +1016,8 @@ Transform: m_LocalScale: {x: 12.383024, y: 12.383024, z: 12.383024} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1750903377 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1750903378} - - component: {fileID: 1750903380} - - component: {fileID: 1750903379} - m_Layer: 5 - m_Name: Start - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1750903378 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1750903377} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.0039999997, y: 0.0039999997, z: 0.0039999997} - m_Children: [] - m_Father: {fileID: 366541451} - 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} - m_AnchoredPosition: {x: 23.8, y: -2} - m_SizeDelta: {x: 3056.39, y: 1167.2} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1750903379 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1750903377} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 300 - m_FontStyle: 0 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 300 - m_Alignment: 0 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: Start --> ---- !u!222 &1750903380 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1750903377} - m_CullTransparentMesh: 0 --- !u!1 &2033480559 GameObject: m_ObjectHideFlags: 0 @@ -1441,5 +1166,5 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/EnemyShipAi.cs b/Assets/Scripts/EnemyShipAi.cs index c2c16af..a3beed2 100644 --- a/Assets/Scripts/EnemyShipAi.cs +++ b/Assets/Scripts/EnemyShipAi.cs @@ -130,16 +130,14 @@ public class EnemyShipAi : MonoBehaviour { break; } FishCatcher fishCatcher = fishInstance.GetComponentInParent(); - if (fishCatcher != null && fishCatcher.fishCaught > 0) + + if (fishCatcher != null) { - if (fishCatcher.gameObject.layer == 9) + if (fishCatcher.gameObject.layer == 9 || fishCatcher.fishCaught > 0) { - distance = Mathf.Infinity; - } - else - { - distance = Vector3.Distance(fishInstance.transform.position, transform.position) + 1f; + continue; } + distance = Vector3.Distance(fishInstance.transform.position, transform.position) + 1f; } else { diff --git a/Assets/Scripts/FishCatcher.cs b/Assets/Scripts/FishCatcher.cs index 950f632..7cd49a4 100644 --- a/Assets/Scripts/FishCatcher.cs +++ b/Assets/Scripts/FishCatcher.cs @@ -13,7 +13,9 @@ public class FishCatcher : MonoBehaviour { private void Start() { + fishPile = transform.Find("Fish Pile").gameObject; fishPileRenderer = fishPile.GetComponent(); + Camera.main.GetComponent().target = gameObject; } private void OnCollisionEnter2D(Collision2D collision) diff --git a/Assets/Scripts/FollowGameObject.cs b/Assets/Scripts/FollowGameObject.cs index 7caad09..9f77431 100644 --- a/Assets/Scripts/FollowGameObject.cs +++ b/Assets/Scripts/FollowGameObject.cs @@ -7,7 +7,7 @@ public class FollowGameObject : MonoBehaviour { public GameObject target; public Vector2 limitFirstCorner; public Vector2 limitSecondCorner; - + void Update () { if (target != null) { diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index ff22b25..97c3f3a 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -12,16 +12,16 @@ PlayerSettings: targetDevice: 2 useOnDemandResources: 0 accelerometerFrequency: 60 - companyName: org.RoyalGames.LD42 - productName: LD42 + companyName: org.RoyalGames.BleachBeach + productName: Bleach Beach defaultCursor: {fileID: 0} cursorHotspot: {x: 0, y: 0} - m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1} + m_SplashScreenBackgroundColor: {r: 1, g: 1, b: 1, a: 1} m_ShowUnitySplashScreen: 1 m_ShowUnitySplashLogo: 1 m_SplashScreenOverlayOpacity: 1 m_SplashScreenAnimation: 1 - m_SplashScreenLogoStyle: 1 + m_SplashScreenLogoStyle: 0 m_SplashScreenDrawMode: 0 m_SplashScreenBackgroundAnimationZoom: 1 m_SplashScreenLogoAnimationZoom: 1 @@ -256,8 +256,16 @@ PlayerSettings: height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} - m_BuildTargetIcons: [] + resolutionDialogBanner: {fileID: 2800000, guid: 07c0841a1cd5f3748ad0ac2271ea38d4, + type: 3} + m_BuildTargetIcons: + - m_BuildTarget: + m_Icons: + - serializedVersion: 2 + m_Icon: {fileID: 2800000, guid: 9c0adcc89cc523b429af19427691f792, type: 3} + m_Width: 128 + m_Height: 128 + m_Kind: 0 m_BuildTargetPlatformIcons: [] m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] diff --git a/WebGL/TemplateData/UnityProgress.js b/WebGL/TemplateData/UnityProgress.js new file mode 100644 index 0000000..1ed4372 --- /dev/null +++ b/WebGL/TemplateData/UnityProgress.js @@ -0,0 +1,24 @@ +function UnityProgress(gameInstance, progress) { + if (!gameInstance.Module) + return; + if (!gameInstance.logo) { + gameInstance.logo = document.createElement("div"); + gameInstance.logo.className = "logo " + gameInstance.Module.splashScreenStyle; + gameInstance.container.appendChild(gameInstance.logo); + } + if (!gameInstance.progress) { + gameInstance.progress = document.createElement("div"); + gameInstance.progress.className = "progress " + gameInstance.Module.splashScreenStyle; + gameInstance.progress.empty = document.createElement("div"); + gameInstance.progress.empty.className = "empty"; + gameInstance.progress.appendChild(gameInstance.progress.empty); + gameInstance.progress.full = document.createElement("div"); + gameInstance.progress.full.className = "full"; + gameInstance.progress.appendChild(gameInstance.progress.full); + gameInstance.container.appendChild(gameInstance.progress); + } + gameInstance.progress.full.style.width = (100 * progress) + "%"; + gameInstance.progress.empty.style.width = (100 * (1 - progress)) + "%"; + if (progress == 1) + gameInstance.logo.style.display = gameInstance.progress.style.display = "none"; +} \ No newline at end of file diff --git a/WebGL/TemplateData/favicon.ico b/WebGL/TemplateData/favicon.ico new file mode 100644 index 0000000..dd6bf7e Binary files /dev/null and b/WebGL/TemplateData/favicon.ico differ diff --git a/WebGL/TemplateData/fullscreen.png b/WebGL/TemplateData/fullscreen.png new file mode 100644 index 0000000..8b25bd3 --- /dev/null +++ b/WebGL/TemplateData/fullscreen.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:922b2a609219c96962e2e7af9d27c1f1935881de617c9d5cb08fdb0d034cafdc +size 345 diff --git a/WebGL/TemplateData/progressEmpty.Dark.png b/WebGL/TemplateData/progressEmpty.Dark.png new file mode 100644 index 0000000..6b38a55 --- /dev/null +++ b/WebGL/TemplateData/progressEmpty.Dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3c901e72986f57b3dd474c5b8db981da26ec1d9ad92af9edc722172678c07d44 +size 155 diff --git a/WebGL/TemplateData/progressEmpty.Light.png b/WebGL/TemplateData/progressEmpty.Light.png new file mode 100644 index 0000000..5b85d2e --- /dev/null +++ b/WebGL/TemplateData/progressEmpty.Light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:efbfdb9313bdc0489d96339cf4352c1a80bc953050cf9a6c06a7ced0c0f1a4e2 +size 159 diff --git a/WebGL/TemplateData/progressFull.Dark.png b/WebGL/TemplateData/progressFull.Dark.png new file mode 100644 index 0000000..58331bc --- /dev/null +++ b/WebGL/TemplateData/progressFull.Dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2832fafec86b420ee29e0e2126b95767a22bff85d30dc90ed8de36246b395fd8 +size 137 diff --git a/WebGL/TemplateData/progressFull.Light.png b/WebGL/TemplateData/progressFull.Light.png new file mode 100644 index 0000000..454520e --- /dev/null +++ b/WebGL/TemplateData/progressFull.Light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:706765aced698c9790bb31eafd12b8161fadc46a62214926788a7a84cdc5fb51 +size 142 diff --git a/WebGL/TemplateData/progressLogo.Dark.png b/WebGL/TemplateData/progressLogo.Dark.png new file mode 100644 index 0000000..6c52a5a --- /dev/null +++ b/WebGL/TemplateData/progressLogo.Dark.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b95da4db2adc10af8bee6bfccb5246cc356b3164ce7caf6c7581c1002d64b71b +size 2343 diff --git a/WebGL/TemplateData/progressLogo.Light.png b/WebGL/TemplateData/progressLogo.Light.png new file mode 100644 index 0000000..7907b7a --- /dev/null +++ b/WebGL/TemplateData/progressLogo.Light.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:270d4f3c53ec8acbef1657520116e9bbd5efe074e4fc12db05fdb9a745ae96bb +size 2259 diff --git a/WebGL/TemplateData/style.css b/WebGL/TemplateData/style.css new file mode 100644 index 0000000..2b3ca7c --- /dev/null +++ b/WebGL/TemplateData/style.css @@ -0,0 +1,20 @@ +.webgl-content * {border: 0; margin: 0; padding: 0} +.webgl-content {position: absolute; top: 50%; left: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);} + +.webgl-content .logo, .progress {position: absolute; left: 50%; top: 50%; -webkit-transform: translate(-50%, -50%); transform: translate(-50%, -50%);} +.webgl-content .logo {background: url('progressLogo.Light.png') no-repeat center / contain; width: 154px; height: 130px;} +.webgl-content .progress {height: 18px; width: 141px; margin-top: 90px;} +.webgl-content .progress .empty {background: url('progressEmpty.Light.png') no-repeat right / cover; float: right; width: 100%; height: 100%; display: inline-block;} +.webgl-content .progress .full {background: url('progressFull.Light.png') no-repeat left / cover; float: left; width: 0%; height: 100%; display: inline-block;} + +.webgl-content .logo.Dark {background-image: url('progressLogo.Dark.png');} +.webgl-content .progress.Dark .empty {background-image: url('progressEmpty.Dark.png');} +.webgl-content .progress.Dark .full {background-image: url('progressFull.Dark.png');} + +.webgl-content .footer {margin-top: 5px; height: 38px; line-height: 38px; font-family: Helvetica, Verdana, Arial, sans-serif; font-size: 18px;} +.webgl-content .footer .webgl-logo, .title, .fullscreen {height: 100%; display: inline-block; background: transparent center no-repeat;} +.webgl-content .footer .webgl-logo {background-image: url('webgl-logo.png'); width: 204px; float: left;} +.webgl-content .footer .title {margin-right: 10px; float: right;} +.webgl-content .footer .fullscreen {background-image: url('fullscreen.png'); width: 38px; float: right;} + +.webgl-content .footer .fullscreen-warning {font-size: smaller;} \ No newline at end of file diff --git a/WebGL/TemplateData/webgl-logo.png b/WebGL/TemplateData/webgl-logo.png new file mode 100644 index 0000000..96fdfd5 --- /dev/null +++ b/WebGL/TemplateData/webgl-logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f02bcd2abdd299a100ab8e2a339b3f414727816901ecda211d68cb7ba0705da0 +size 3587 diff --git a/WebGL/index.html b/WebGL/index.html new file mode 100644 index 0000000..02c377c --- /dev/null +++ b/WebGL/index.html @@ -0,0 +1,26 @@ + + + + + + Unity WebGL Player | Bleach Beach + + + + + + + +
+
+ +
+ + \ No newline at end of file