mirror of
https://github.com/Steffo99/bleach-beach.git
synced 2024-12-04 19:04:19 +00:00
Merge remote-tracking branch 'refs/remotes/origin/master'
This commit is contained in:
commit
38c7ddf0bd
7 changed files with 203 additions and 129 deletions
268
Assets/Scenes/Game.unity
generated
268
Assets/Scenes/Game.unity
generated
|
|
@ -117,7 +117,124 @@ NavMeshSettings:
|
|||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1506768218425990, guid: 1cf703958a669d942a42326499701367,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 1077945485}
|
||||
m_PrefabInternal: {fileID: 236105087}
|
||||
--- !u!1 &36874369
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 36874370}
|
||||
- component: {fileID: 36874371}
|
||||
m_Layer: 0
|
||||
m_Name: SeaTexture
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &36874370
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 36874369}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0.9, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1626175911}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!212 &36874371
|
||||
SpriteRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 36874369}
|
||||
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: 21300000, guid: 28558840dcfa2374db223ed9dad0f4c9, 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, y: 5}
|
||||
m_AdaptiveModeThreshold: 0.5
|
||||
m_SpriteTileMode: 0
|
||||
m_WasSpriteAssigned: 1
|
||||
m_MaskInteraction: 0
|
||||
m_SpriteSortPoint: 0
|
||||
--- !u!1001 &236105087
|
||||
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: -4.126
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4279439219186522, guid: 1cf703958a669d942a42326499701367, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 36.531
|
||||
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: 2
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 1cf703958a669d942a42326499701367, type: 2}
|
||||
m_IsPrefabAsset: 0
|
||||
--- !u!1001 &391017218
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -303,117 +420,46 @@ Prefab:
|
|||
propertyPath: m_LinearDrag
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.x
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.oldSize.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.x
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.newSize.y
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 61739251880371716, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
propertyPath: m_SpriteTilingProperty.adaptiveTilingThreshold
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 4dc0408b236da9847b1c799161bbd70a, type: 2}
|
||||
m_IsPrefabAsset: 0
|
||||
--- !u!1 &1218142158
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1218142160}
|
||||
- component: {fileID: 1218142159}
|
||||
m_Layer: 0
|
||||
m_Name: ChainAuto
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1218142159
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1218142158}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 19e8f1cd3ef695e499687d78824c32e7, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
chain: {fileID: 1662540403241760, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
tail: {fileID: 1172082933451472, guid: 288f16ae5eaa16440b89da431723b1c2, type: 2}
|
||||
chainOffset: {x: 0, y: 0.18, z: 0}
|
||||
tailOffset: {x: 0.08, y: 0.8, z: 0}
|
||||
chainNumber: 50
|
||||
--- !u!4 &1218142160
|
||||
--- !u!4 &1626175911 stripped
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInternal: {fileID: 0}
|
||||
m_GameObject: {fileID: 1218142158}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 2.3629713, y: 38.1587, z: 0.18701172}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &1507626316
|
||||
Prefab:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 2.922
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 37.317
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -0.07543945
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_RootOrder
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 233495185698650704, guid: 0ccfd55ddf6d29547b1e9de873bca75d,
|
||||
type: 2}
|
||||
propertyPath: m_ConnectedAnchor.x
|
||||
value: 2.9191158
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 233495185698650704, guid: 0ccfd55ddf6d29547b1e9de873bca75d,
|
||||
type: 2}
|
||||
propertyPath: m_ConnectedAnchor.y
|
||||
value: 37.13177
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 233495185698650704, guid: 0ccfd55ddf6d29547b1e9de873bca75d,
|
||||
type: 2}
|
||||
propertyPath: m_Anchor.x
|
||||
value: 0.18522969
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 233495185698650704, guid: 0ccfd55ddf6d29547b1e9de873bca75d,
|
||||
type: 2}
|
||||
propertyPath: m_Anchor.y
|
||||
value: -0.0028841128
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4392388992178572, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0ccfd55ddf6d29547b1e9de873bca75d, type: 2}
|
||||
m_IsPrefabAsset: 0
|
||||
m_CorrespondingSourceObject: {fileID: 4769752010558754, guid: 4dc0408b236da9847b1c799161bbd70a,
|
||||
type: 2}
|
||||
m_PrefabInternal: {fileID: 1151167808}
|
||||
|
|
|
|||
|
|
@ -2,19 +2,27 @@
|
|||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class Tide : MonoBehaviour {
|
||||
|
||||
private BuoyancyEffector2D buoyancyEffector2D;
|
||||
public float speed = 0.01f;
|
||||
|
||||
void Start () {
|
||||
public class Tide : MonoBehaviour
|
||||
{
|
||||
public BuoyancyEffector2D buoyancyEffector2D;
|
||||
public SpriteRenderer spriterenderer;
|
||||
float speed = 0.01f;
|
||||
// Use this for initialization
|
||||
void Start()
|
||||
{
|
||||
buoyancyEffector2D = GetComponent<BuoyancyEffector2D>();
|
||||
spriterenderer = GetComponentInChildren<SpriteRenderer>();
|
||||
}
|
||||
|
||||
void Update () {
|
||||
if(buoyancyEffector2D.surfaceLevel > 0)
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (buoyancyEffector2D.surfaceLevel > 0)
|
||||
{
|
||||
buoyancyEffector2D.surfaceLevel = buoyancyEffector2D.surfaceLevel - (Time.deltaTime * speed);
|
||||
float y = (buoyancyEffector2D.surfaceLevel * 40) - 10;
|
||||
Vector3 vettore = new Vector3(0.0f, y , 0.0f);
|
||||
spriterenderer.transform.position = vettore;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
BIN
Assets/Sprites/cannone.png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/cannone.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Assets/Sprites/mare.png
(Stored with Git LFS)
BIN
Assets/Sprites/mare.png
(Stored with Git LFS)
Binary file not shown.
21
Assets/Sprites/mare.png.meta
generated
21
Assets/Sprites/mare.png.meta
generated
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3edb25848f9b2294fba386fd65e537c0
|
||||
guid: 28558840dcfa2374db223ed9dad0f4c9
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
|
|
@ -34,9 +34,9 @@ TextureImporter:
|
|||
filterMode: -1
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
wrapU: 0
|
||||
wrapV: 0
|
||||
wrapW: 0
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
|
|
@ -69,13 +69,24 @@ TextureImporter:
|
|||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: dab9dbaa91b1ccd48a2313057f5414f5
|
||||
spriteID: 3c22bb86000abe1418ff88ff50ab2922
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
|
|
|
|||
BIN
Assets/Sprites/pesce1.png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/pesce1.png
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Assets/Sprites/pesce2.png
(Stored with Git LFS)
Normal file
BIN
Assets/Sprites/pesce2.png
(Stored with Git LFS)
Normal file
Binary file not shown.
Loading…
Reference in a new issue