Closes #141 배 물결 이펙트 수정

+ 물고기 스팟 파티클 변경
This commit is contained in:
NTG 2024-01-18 01:00:48 +09:00
parent c8fdfb9f1b
commit 35c530ac77
9 changed files with 24165 additions and 157 deletions

View File

@ -11857,8 +11857,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1485085414}
serializedVersion: 2
m_LocalRotation: {x: 0.38025182, y: 0.61872417, z: -0.4629529, w: 0.5081964}
m_LocalPosition: {x: -0.0011634827, y: 0, z: -0.0058670044}
m_LocalRotation: {x: 0.3802523, y: 0.61872363, z: -0.4629525, w: 0.50819707}
m_LocalPosition: {x: -0.0011863708, y: 0, z: -0.0059661865}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -22518,7 +22518,7 @@ Transform:
m_GameObject: {fileID: 5511481773815108912}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.451, z: -6.042}
m_LocalPosition: {x: 0, y: 1.451, z: 3.428}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -23325,7 +23325,7 @@ TrailRenderer:
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 1
m_Time: 6
m_Time: 4
m_PreviewTimeScale: 1
m_Parameters:
serializedVersion: 3
@ -23334,14 +23334,14 @@ TrailRenderer:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.107688904
inSlope: 0
outSlope: 0
time: 0.001984127
value: 0.30596215
inSlope: 1.2864585
outSlope: 1.2864585
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
outWeight: 0.097222224
- serializedVersion: 3
time: 1
value: 1
@ -23565,7 +23565,7 @@ Transform:
m_GameObject: {fileID: 8128736397800939824}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.451, z: -6.042}
m_LocalPosition: {x: 0, y: 1.451, z: 3.428}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -23825,7 +23825,7 @@ ParticleSystem:
startSize:
serializedVersion: 2
minMaxState: 0
scalar: 25
scalar: 50
minScalar: 15
maxCurve:
serializedVersion: 2

View File

@ -3,6 +3,7 @@ using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
@ -113,18 +114,15 @@ namespace BlueWaterProject
[Tooltip("경계 범위 기능 여부")]
[SerializeField] private bool showBounds;
[Tooltip("물 표면 이펙트")]
[SerializeField] private ParticleSystem waterEffect;
[Tooltip("물 표면 이펙트 크기 조정")]
[SerializeField] private Vector3 waterEffectSize = new(1f, 1f, 1f);
[Tooltip("FishSpot")]
[SerializeField] private Transform fishSpot;
[Tooltip("물 표면 이펙트 기능 여부")]
[SerializeField] private bool showWaterEffect = true;
[Tooltip("물 표면 이펙트 기능 여부")]
[ShowIf("@showWaterEffect")]
[SerializeField] private Vector3 waterEffectOffset = new(0, 0.5f, 0);
[SerializeField] private Vector3 fishSpotOffset = new(0, 0.5f, 0);
// 디버깅
[Title("디버깅")]
@ -150,15 +148,6 @@ namespace BlueWaterProject
}
findCoroutineTime = new WaitForSeconds(rescanTime);
if (showWaterEffect)
{
waterEffect.Play();
}
else
{
waterEffect.Stop();
}
}
private void OnDrawGizmosSelected()
@ -181,7 +170,7 @@ namespace BlueWaterProject
if (Physics.Raycast(BoundMeshRenderer.transform.position, Vector3.up, out var hit,
float.MaxValue,waterLayer))
{
waterEffect.transform.position = hit.point + waterEffectOffset;
fishSpot.position = hit.point + fishSpotOffset;
}
}
@ -195,15 +184,6 @@ namespace BlueWaterProject
spawnPos = BoundMeshRenderer.transform.position;
targetLayer = LayerMask.GetMask("Player");
waterLayer = LayerMask.GetMask("Water");
if (waterEffect)
{
waterEffect.gameObject.SetActive(true);
var waterEffectTransform = waterEffect.transform;
var parentScale = waterEffectTransform.parent.localScale;
var newLocalScale = new Vector3(waterEffectSize.x / parentScale.x, waterEffectSize.y / parentScale.y,
waterEffectSize.z / parentScale.z);
waterEffectTransform.localScale = newLocalScale;
}
var myTransform = transform;
for (var i = 0; i < boidCount; i++)

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: aa20b019d48a04c4b856dea7e4d89514
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,128 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7861097867308646510
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: GrenadeMissileFire
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- ALWAYS
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 75c822b01a637d547abc69e6f1f590b4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 75c822b01a637d547abc69e6f1f590b4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 2
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EmissionEnabled: 0
- _FlipbookBlending: 0
- _FlipbookMode: 0
- _GlossinessSource: 0
- _InvFade: 1.5
- _LightingEnabled: 0
- _Mode: 4
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Shininess: 0
- _Smoothness: 0.5
- _SmoothnessSource: 0
- _SoftParticlesEnabled: 1
- _SoftParticlesFarFadeDistance: 0.4
- _SoftParticlesNearFadeDistance: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c5e80632eb72b4b499c0d873413f8245
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -31,9 +31,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 30, y: 10, z: 30}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2146763844810315378}
- {fileID: 3971395951883524508}
m_Children: []
m_Father: {fileID: 1800824703194841433}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3243186087995758770
@ -140,6 +138,7 @@ Transform:
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 2854089398056668840}
- {fileID: 6023135201199208214}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5146900491857106217
@ -179,10 +178,9 @@ MonoBehaviour:
randomZigzagAmplitude: {x: 0.1, y: 1}
randomZigzagFrequency: {x: 0.1, y: 1}
showBounds: 1
waterEffect: {fileID: 3971395951898731422}
waterEffectSize: {x: 10, y: 10, z: 10}
fishSpot: {fileID: 6023135201199208214}
showWaterEffect: 1
waterEffectOffset: {x: 0, y: 0.5, z: 0}
fishSpotOffset: {x: 0, y: 0.5, z: 0}
boidList: []
hitColliders:
- {fileID: 0}
@ -194,155 +192,87 @@ MonoBehaviour:
waterLayer:
serializedVersion: 2
m_Bits: 16
--- !u!1001 &2151588411453636044
--- !u!1001 &8504772753982791837
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2854089398056668840}
m_TransformParent: {fileID: 1800824703194841433}
m_Modifications:
- target: {fileID: 1412271066197182, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
propertyPath: m_Name
value: WaterfallSoft
objectReference: {fileID: 0}
- target: {fileID: 1412271066197182, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalScale.x
value: 1
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalScale.y
value: 1
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalScale.z
value: 1
value: 10
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 35fe9aead25a440468b5c2bf0da0c019, type: 3}
--- !u!4 &2146763844810315378 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4833545274551230, guid: 35fe9aead25a440468b5c2bf0da0c019,
type: 3}
m_PrefabInstance: {fileID: 2151588411453636044}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3971395951883867888
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2854089398056668840}
m_Modifications:
- target: {fileID: 130202, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
- target: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4617604176008979014, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_ConstrainProportionsScale
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5897493926044192973, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
propertyPath: m_Name
value: WaterBoiling
objectReference: {fileID: 0}
- target: {fileID: 130202, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalRotation.x
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
value: FishSpot
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d34ea90bd906a734fbebc510fa888643, type: 3}
--- !u!4 &3971395951883524508 stripped
m_SourcePrefab: {fileID: 100100000, guid: 0051ffdc4c5db0d439d5d2c880040228, type: 3}
--- !u!4 &6023135201199208214 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 479084, guid: d34ea90bd906a734fbebc510fa888643,
m_CorrespondingSourceObject: {fileID: 2707081533079000971, guid: 0051ffdc4c5db0d439d5d2c880040228,
type: 3}
m_PrefabInstance: {fileID: 3971395951883867888}
m_PrefabAsset: {fileID: 0}
--- !u!198 &3971395951898731422 stripped
ParticleSystem:
m_CorrespondingSourceObject: {fileID: 19887470, guid: d34ea90bd906a734fbebc510fa888643,
type: 3}
m_PrefabInstance: {fileID: 3971395951883867888}
m_PrefabInstance: {fileID: 8504772753982791837}
m_PrefabAsset: {fileID: 0}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 0051ffdc4c5db0d439d5d2c880040228
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9494,7 +9494,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: e653836c30661fe419b8992e230ca189, type: 2}
- {fileID: 2100000, guid: c5e80632eb72b4b499c0d873413f8245, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
@ -9514,7 +9514,7 @@ ParticleSystemRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingOrder: 1
m_RenderMode: 0
m_MeshDistribution: 0
m_SortMode: 0