Merge remote-tracking branch 'origin/develop' into develop

This commit is contained in:
IDMhan 2024-01-22 12:06:25 +09:00
commit 5160d4312a
151 changed files with 107160 additions and 24034 deletions

File diff suppressed because it is too large Load Diff

Binary file not shown.

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 90581f249edafa242846d362aac473f4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 112000000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -29,16 +29,16 @@ MonoBehaviour:
active: 1
color:
m_OverrideState: 1
m_Value: {r: 0.262, g: 0, b: 0, a: 1}
m_Value: {r: 0.20745817, g: 0.6981132, b: 0.6667745, a: 1}
center:
m_OverrideState: 1
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0
m_Value: 0.3
smoothness:
m_OverrideState: 1
m_Value: 1
m_Value: 0.36
rounded:
m_OverrideState: 1
m_Value: 1

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.1 KiB

View File

@ -0,0 +1,140 @@
fileFormatVersion: 2
guid: 0ef9c9b18d4cca84b8830f87f6f2ee03
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,140 @@
fileFormatVersion: 2
guid: 37a9660f396513f47bc37f71c23116f2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 1
seamlessCubemap: 1
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 2
aniso: 0
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 2
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 100
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Windows Store Apps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -489,6 +489,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
<Tables>k__BackingField: {fileID: 478645707}
<WalkOutPoint>k__BackingField: {fileID: 0}
<Counter>k__BackingField: {fileID: 0}
--- !u!1 &55111069
GameObject:
m_ObjectHideFlags: 0
@ -22070,6 +22072,10 @@ MonoBehaviour:
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
cursorTexture: {fileID: 2800000, guid: 3a146044a282641d99ba04c33b8c2bbf, type: 3}
enemyMarker: {fileID: 21300000, guid: c617a5b08493842c3833527a458fd612, type: 3}
scallion: {fileID: 0}
tomato: {fileID: 0}
onion: {fileID: 0}
kingCrabMeat: {fileID: 0}
--- !u!4 &1426193642
Transform:
m_ObjectHideFlags: 0
@ -31408,6 +31414,9 @@ MonoBehaviour:
backSprite: {fileID: 21300000, guid: dba6626ec18b7497a8cdfe6501394253, type: 3}
frontSprite: {fileID: 21300000, guid: c21e822c2c1ca418fa2695be70e90ddb, type: 3}
foodTransform: {fileID: 0}
foodOnHand: 0
foodVisual: {fileID: 0}
kitchenController: {fileID: 0}
--- !u!1 &2048433007
GameObject:
m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,13 +0,0 @@
fileFormatVersion: 2
<<<<<<<< HEAD:BlueWater/Assets/01.Scenes/99.art_Ocean.unity.meta
guid: 8a38d10f8df4840499eee840996c0edd
timeCreated: 1496770385
licenseType: Store
========
guid: 2e16a4ae1869a405ab4de3fcef3f1d55
folderAsset: yes
>>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9:BlueWater/Assets/03.Images/Tycoon/Floors.meta
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6d5ac1a9a9cfadb48a49e172a759c84b
timeCreated: 1496770385
licenseType: Store
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

View File

@ -12,7 +12,7 @@ namespace BlueWaterProject
public class Boid : MonoBehaviour
{
[field: Title("FishInfo")]
[field: SerializeField] public FishInfo FishInfo { get; private set; }
[field: SerializeField] public FishItem FishItem { get; private set; }
[field: SerializeField] public Vector2 RandomCount { get; private set; } = new(1, 4);
[Title("개체 설정")]
@ -42,7 +42,7 @@ namespace BlueWaterProject
myBoids = boids;
moveSpeed = speed;
hitColliders = new Collider[maxNeighbourCount];
FishInfo.AddCount(Random.Range((int)RandomCount.x, (int)RandomCount.y));
FishItem.ItemCount = Random.Range((int)RandomCount.x, (int)RandomCount.y);
findNeighbourCoroutine ??= StartCoroutine("FindNeighbourCoroutine");
calculateEgoVectorCoroutine ??= StartCoroutine("CalculateEgoVectorCoroutine");

View File

@ -3,7 +3,6 @@ using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
@ -114,15 +113,17 @@ namespace BlueWaterProject
[Tooltip("경계 범위 기능 여부")]
[SerializeField] private bool showBounds;
[Tooltip("물 표면 이펙트")]
[SerializeField] private ParticleSystem waterEffect;
[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);
[field: SerializeField] public MeshRenderer BoundMeshRenderer { get; private set; }
// 디버깅
[Title("디버깅")]
@ -130,8 +131,6 @@ namespace BlueWaterProject
[SerializeField] private Collider[] hitColliders = new Collider[MAX_HIT_NUM];
[SerializeField] private LayerMask targetLayer;
[SerializeField] private LayerMask waterLayer;
public MeshRenderer BoundMeshRenderer { get; private set; }
private Vector3 spawnPos;
private Coroutine findTargetCoroutine;
@ -148,23 +147,28 @@ namespace BlueWaterProject
}
findCoroutineTime = new WaitForSeconds(rescanTime);
if (showWaterEffect)
{
waterEffect.Play();
}
else
{
waterEffect.Stop();
}
}
private void OnDrawGizmosSelected()
{
if (!isDrawGizmos) return;
var centerPos = Vector3.zero;
if (Application.isPlaying)
{
centerPos = fishSpot.position;
}
else
{
if (Physics.Raycast(BoundMeshRenderer.transform.position, Vector3.up, out var hit,
float.MaxValue,waterLayer))
{
centerPos = hit.point + fishSpotOffset;
}
}
Gizmos.color = Color.red;
Gizmos.DrawWireSphere(transform.position, viewRadius);
Gizmos.DrawWireSphere(centerPos, viewRadius);
}
private void Start()
@ -179,7 +183,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;
}
}
@ -211,7 +215,7 @@ namespace BlueWaterProject
{
while (true)
{
var size = Physics.OverlapSphereNonAlloc(transform.position, viewRadius, hitColliders, targetLayer);
var size = Physics.OverlapSphereNonAlloc(fishSpot.position, viewRadius, hitColliders, targetLayer);
for (var i = 0; i < size; i++)
{
if (hitColliders[i] == null || !hitColliders[i].CompareTag("ShipPlayer")) continue;
@ -298,14 +302,23 @@ namespace BlueWaterProject
return rotation * escapeDirection;
}
public void CatchBoid(int count)
public void CatchBoid(Collider hitCollider, int count)
{
count = Mathf.Min(count, boidList.Count);
for (var i = 0; i < count; i++)
{
// 물고기 잡히는 이펙트 효과 추가
var currentBoid = boidList[0];
DataManager.Inst.PlayerInventory.AddFish(currentBoid.FishInfo.Name, currentBoid.FishInfo.Count);
var bounds = hitCollider.bounds;
var x = Random.Range(bounds.min.x, bounds.max.x);
//var y = Random.Range(bounds.min.y, bounds.max.y);
var z = Random.Range(bounds.min.z, bounds.max.z);
var randomPos = new Vector3(x, 0, z);
var catchItem = new FishItem(currentBoid.FishItem.ItemName, currentBoid.FishItem.ItemCount);
ItemDropManager.Inst.DropItem(catchItem, randomPos);
boidList.RemoveAt(0);
Destroy(currentBoid.gameObject);
}
@ -318,5 +331,7 @@ namespace BlueWaterProject
}
gameObject.SetActive(false);
}
public FishItem GetBoidInfo() => boidPrefab.FishItem;
}
}

View File

@ -73,8 +73,6 @@ namespace BlueWaterProject
[SerializeField] private float shakingForceCoefficient = 0.8f;
[SerializeField] private bool useBoostVignetteEffect = true;
[ShowIf("@useBoostVignetteEffect")]
[SerializeField] private float vignetteForceCoefficient = 0.4f;
[DisableIf("@true")]
[SerializeField] private bool isBoosting;
@ -232,7 +230,7 @@ namespace BlueWaterProject
if (useBoostVignetteEffect && UiManager.Inst.OceanUi.ShipBoostSlider.value > 0f)
{
VisualFeedbackManager.Inst.SetVignetteIntensity(UiManager.Inst.OceanUi.ShipBoostSlider.value * vignetteForceCoefficient);
CameraManager.Inst.OceanCamera.BoostVignette(UiManager.Inst.OceanUi.ShipBoostSlider.value);
}
}
@ -405,10 +403,6 @@ namespace BlueWaterProject
{
CameraManager.Inst.OceanCamera.ChangeDistance(shrinkDistance, shrinkTime);
}
if (useBoostVignetteEffect)
{
VisualFeedbackManager.Inst.ToggleEffect<Vignette>(true);
}
}
private void ShipStopBoost()

View File

@ -1,315 +0,0 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class Fish : MonoBehaviour
{
// 초기화 방식
[Title("초기화 방식")]
[SerializeField] private bool autoInit = true;
// 물고기의 기본 설정
[Title("물고기의 기본 설정")]
[SerializeField] private bool isDrawGizmos = true;
[Tooltip("타겟 인식 범위")]
[SerializeField] private float viewRadius = 10f;
[Tooltip("이동속도")]
[SerializeField] private float moveSpd = 500f;
[Tooltip("회전속도")]
[SerializeField] private float rotationSpeed = 10f;
[Tooltip("랜덤 방향으로 도주 여부")]
[SerializeField] private bool isRandomAngle = true;
[ShowIf("@isRandomAngle")]
[Tooltip("도망가는 방향의 랜덤 각도")]
[SerializeField] private float randomAngle = 180f;
[Tooltip("타겟을 재검색하는 시간")]
[SerializeField] private float rescanTime = 0.5f;
[Tooltip("도망가는 시간")]
[SerializeField] private float escapeTime = 10f;
[Tooltip("리스폰 여부")]
[SerializeField] private bool isRespawn = true;
[ShowIf("@isRespawn == true")]
[Tooltip("리스폰되는데 걸리는 시간")]
[SerializeField] private float respawnTime = 5f;
[Tooltip("도망치면서 랜덤 방향 전환 여부")]
[SerializeField] private bool randomDirectionChange;
[ShowIf("@!randomDirectionChange")]
[Tooltip("도망치면서 방향 전환하는데 걸리는 시간")]
[SerializeField] private float directionChangeInterval = 1f;
[ShowIf("@randomDirectionChange")]
[Tooltip("도망치면서 방향 전환하는데 걸리는 랜덤 최소 시간")]
[SerializeField] private float minDirectionChangeInterval = 0.1f;
[ShowIf("@randomDirectionChange")]
[Tooltip("도망치면서 방향 전환하는데 걸리는 랜덤 최대 시간")]
[SerializeField] private float maxDirectionChangeInterval = 1f;
[Tooltip("도주 방식")]
[SerializeField] private EscapeMode escapeMode = EscapeMode.STRAIGHT;
// ZIGZAG
[Title("ZIGZAG")]
[ShowIf("@escapeMode == EscapeMode.ZIGZAG")]
[Tooltip("흔들림의 정도")]
[SerializeField] private bool randomZigzag;
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && !randomZigzag")]
[Tooltip("흔들림의 정도")]
[SerializeField] private float zigzagAmplitude = 1f;
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && !randomZigzag")]
[Tooltip("흔들림의 주기")]
[SerializeField] private float zigzagFrequency = 1f;
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && randomZigzag")]
[Tooltip("흔들림의 정도 랜덤 최솟값")]
[SerializeField] private float minZigzagAmplitude = 0.1f;
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && randomZigzag")]
[Tooltip("흔들림의 정도 랜덤 최댓값")]
[SerializeField] private float maxZigzagAmplitude = 1f;
[Space]
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && randomZigzag")]
[Tooltip("흔들림의 주기 랜덤 최솟값")]
[SerializeField] private float minZigzagFrequency = 0.1f;
[ShowIf("@escapeMode == EscapeMode.ZIGZAG && randomZigzag")]
[Tooltip("흔들림의 주기 랜덤 최댓값")]
[SerializeField] private float maxZigzagFrequency = 1f;
// 디버깅
[Title("디버깅")]
[SerializeField] private Collider[] hitColliders = new Collider[MAX_HIT_NUM];
[SerializeField] private LayerMask targetLayer;
private Rigidbody rb;
private Coroutine findTargetCoroutine;
private Coroutine escapeCoroutine;
private WaitForSeconds findCoroutineTime;
private Vector3 spawnPos;
private const int MAX_HIT_NUM = 3;
private void OnValidate()
{
findCoroutineTime = new WaitForSeconds(rescanTime);
}
private void OnDrawGizmosSelected()
{
if (!isDrawGizmos) return;
Gizmos.color = Color.red;
Gizmos.DrawWireSphere(transform.position, viewRadius);
}
[Button("셋팅 초기화")]
private void Init()
{
rb = GetComponent<Rigidbody>();
targetLayer = LayerMask.GetMask("Player");
}
#region Preset
[HorizontalGroup("Split")]
[Button("프리셋 1번")]
private void Preset1()
{
isDrawGizmos = true;
viewRadius = 20f;
moveSpd = 500f;
rotationSpeed = 10f;
isRandomAngle = false;
rescanTime = 0.5f;
escapeTime = 10f;
isRespawn = true;
respawnTime = 5f;
randomDirectionChange = false;
directionChangeInterval = 3f;
escapeMode = EscapeMode.STRAIGHT;
}
[HorizontalGroup("Split")]
[Button("프리셋 2번")]
private void Preset2()
{
isDrawGizmos = true;
viewRadius = 20f;
moveSpd = 500f;
rotationSpeed = 10f;
isRandomAngle = true;
randomAngle = 120f;
rescanTime = 0.5f;
escapeTime = 10f;
isRespawn = true;
respawnTime = 5f;
randomDirectionChange = true;
minDirectionChangeInterval = 1f;
maxDirectionChangeInterval = 3f;
directionChangeInterval = 3f;
escapeMode = EscapeMode.ZIGZAG;
randomZigzag = false;
zigzagAmplitude = 0.5f;
zigzagFrequency = 1f;
}
[HorizontalGroup("Split")]
[Button("프리셋 3번")]
private void Preset3()
{
isDrawGizmos = true;
viewRadius = 20f;
moveSpd = 500f;
rotationSpeed = 10f;
isRandomAngle = true;
randomAngle = 120f;
rescanTime = 0.5f;
escapeTime = 10f;
isRespawn = true;
respawnTime = 5f;
randomDirectionChange = true;
minDirectionChangeInterval = 1f;
maxDirectionChangeInterval = 3f;
directionChangeInterval = 3f;
escapeMode = EscapeMode.ZIGZAG;
randomZigzag = true;
minZigzagAmplitude = 0.1f;
maxZigzagAmplitude = 2f;
minZigzagFrequency = 0.1f;
maxZigzagFrequency = 2f;
}
#endregion
private void Awake()
{
if (autoInit)
{
Init();
}
}
private void OnEnable()
{
hitColliders = new Collider[MAX_HIT_NUM];
findCoroutineTime = new WaitForSeconds(rescanTime);
if (findTargetCoroutine != null) return;
findTargetCoroutine = StartCoroutine(FindTargetCoroutine());
}
private void Start()
{
spawnPos = transform.position;
}
private IEnumerator FindTargetCoroutine()
{
while (true)
{
var size = Physics.OverlapSphereNonAlloc(transform.position, viewRadius, hitColliders, targetLayer);
for (var i = 0; i < size; i++)
{
var hitCollider = hitColliders[i];
if (hitCollider == null || !hitCollider.CompareTag("ShipPlayer")) continue;
findTargetCoroutine = null;
escapeCoroutine = StartCoroutine(EscapeCoroutine(hitCollider));
yield break;
}
yield return findCoroutineTime;
}
}
private IEnumerator EscapeCoroutine(Collider targetCollider)
{
var currentDirectionChangeInterval = randomDirectionChange ?
UnityEngine.Random.Range(minDirectionChangeInterval, maxDirectionChangeInterval)
: directionChangeInterval;
var rotatedEscapeDirection = CalculateEscapeDirection(targetCollider.transform.position);
var time = 0f;
var directionChangeTime = 0f;
while (time < escapeTime)
{
time += Time.deltaTime;
directionChangeTime += Time.deltaTime;
if (directionChangeTime >= currentDirectionChangeInterval)
{
rotatedEscapeDirection = CalculateEscapeDirection(targetCollider.transform.position);
directionChangeTime = 0f;
currentDirectionChangeInterval = randomDirectionChange ?
UnityEngine.Random.Range(minDirectionChangeInterval, maxDirectionChangeInterval)
: directionChangeInterval;
if (escapeMode == EscapeMode.ZIGZAG && randomZigzag)
{
zigzagFrequency = UnityEngine.Random.Range(minZigzagFrequency, maxZigzagFrequency);
zigzagAmplitude = UnityEngine.Random.Range(minZigzagAmplitude, maxZigzagAmplitude);
}
}
var newDirection = escapeMode switch
{
EscapeMode.NONE => throw new ArgumentOutOfRangeException(),
EscapeMode.STRAIGHT => rotatedEscapeDirection,
EscapeMode.ZIGZAG => rotatedEscapeDirection +
new Vector3(Mathf.Sin(Time.time * zigzagFrequency) * zigzagAmplitude,0,
Mathf.Sin(Time.time * zigzagFrequency) * zigzagAmplitude),
EscapeMode.TOWARDS => -rotatedEscapeDirection,
_ => throw new ArgumentOutOfRangeException()
};
rb.velocity = newDirection.normalized * (moveSpd * Time.deltaTime);
var targetRotation = Quaternion.LookRotation(newDirection);
transform.rotation = Quaternion.Slerp(transform.rotation, targetRotation, rotationSpeed * Time.deltaTime);
yield return null;
}
rb.velocity = Vector3.zero;
escapeCoroutine = null;
if (isRespawn)
{
//FishManager.Inst.RespawnFish(gameObject, respawnTime, spawnPos);
}
gameObject.SetActive(false);
}
private Vector3 CalculateEscapeDirection(Vector3 targetPos)
{
var escapeDirection = (transform.position - targetPos).normalized;
escapeDirection.y = 0;
if (!isRandomAngle) return escapeDirection;
var randomRotationAngle = UnityEngine.Random.Range(-randomAngle * 0.5f, randomAngle * 0.5f);
var rotation = Quaternion.Euler(0, randomRotationAngle, 0);
return rotation * escapeDirection;
}
}
}

View File

@ -1,31 +0,0 @@
using System;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
[Serializable]
public class FishInfo
{
[field: SerializeField] public string Name { get; private set; }
[field: SerializeField] public int Count { get; private set; }
public FishInfo(string name, int count)
{
Name = name;
Count = count;
}
public void AddCount(int? value = null)
{
if (value == null)
{
Count++;
}
else
{
Count += (int)value;
}
}
}
}

View File

@ -0,0 +1,17 @@
using System;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
[Serializable]
public class FishItem : Item
{
public FishItem(string name, int count = 1, Sprite icon = null) : base(name, count, icon)
{
ItemName = name;
ItemCount = count;
ItemIcon = icon;
}
}
}

View File

@ -0,0 +1,13 @@
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public interface IItem
{
string ItemName { get; set; }
int ItemCount { get; set; }
Sprite ItemIcon { get; set; }
void Acquire();
}
}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: a0f3e1c9930c204498f3a86452337290
guid: 895973422f0e42c4fb1a58e8df2d3505
MonoImporter:
externalObjects: {}
serializedVersion: 2

View File

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

View File

@ -0,0 +1,41 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class DropItemGroupController : MonoBehaviour
{
[field: SerializeField] public List<DropItemInfoUi> dropItemInfoUiList = new(3);
private WaitForSeconds coroutineRestartTime = new(0.5f);
public void ShowDropItemInfoUi(IItem iItem)
{
StartCoroutine(ShowDropItemInfoUiCoroutine(iItem));
}
private IEnumerator ShowDropItemInfoUiCoroutine(IItem iItem)
{
while (true)
{
foreach (var list in dropItemInfoUiList)
{
if (list.UiView.gameObject.activeSelf) continue;
var itemText = iItem.ItemName + " x" + iItem.ItemCount;
list.SetInfo(iItem.ItemIcon, itemText);
list.ShowUi();
while (list.UiView.gameObject.activeSelf)
{
yield return null;
}
yield break;
}
yield return coroutineRestartTime;
}
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 3eee56b795537aa4aab4e0afcdd738e5

View File

@ -0,0 +1,31 @@
using Doozy.Runtime.UIManager.Containers;
using TMPro;
using UnityEngine;
using UnityEngine.UI;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class DropItemInfoUi : MonoBehaviour
{
[field: SerializeField] public UIView UiView { get; set; }
[field: SerializeField] public Image ItemIcon { get; set; }
[field: SerializeField] public TMP_Text ItemText { get; set; }
public void SetInfo(Sprite icon, string text)
{
ItemIcon.sprite = icon;
ItemText.text = text;
}
public void ShowUi()
{
UiView.Show();
}
public void HideUi()
{
UiView.Hide();
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 38ce10e1036560e4789b9a24e540ef5b

View File

@ -0,0 +1,26 @@
using System;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
[Serializable]
public class Item : IItem
{
[field: SerializeField] public string ItemName { get; set; }
[field: SerializeField] public int ItemCount { get; set; }
[field: SerializeField] public Sprite ItemIcon { get; set; }
public Item(string name, int count = 1, Sprite icon = null)
{
ItemName = name;
ItemCount = count;
ItemIcon = icon;
}
public void Acquire()
{
DataManager.Inst.PlayerInventory.AddItem(this);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 6ed42387fa88b3b4d9ee7d94750f3dd5

View File

@ -0,0 +1,114 @@
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class ItemController : MonoBehaviour
{
[Title("아이템")]
[SerializeField] private Item item;
[SerializeField] private ItemUiController itemUiPrefab;
[Title("자동 파괴")]
[SerializeField] private bool useAutoDestroy = true;
[ShowIf("@useAutoDestroy")]
[SerializeField] private float autoDestroyTime = 30f;
[Title("획득")]
[SerializeField] private bool drawGizmos = true;
[SerializeField] private float radius = 5f;
[SerializeField] private float acquisitionTime = 1f;
[SerializeField] private LayerMask targetLayer;
private Collider[] hitColliders = new Collider[1];
private Collider targetCollider;
private WaitForSeconds lootCoroutineTime = new(0.5f);
private AudioSource audioSource;
private Transform itemsLoot;
private ItemUiController itemLootUi;
private void OnDrawGizmosSelected()
{
if (!drawGizmos) return;
Gizmos.DrawWireSphere(transform.position, radius);
}
public void Init(Item newItem)
{
item = newItem;
if (!itemsLoot)
{
itemsLoot = UiManager.Inst.OceanUi.MainCanvas.transform.Find("ItemsLoot");
}
var myPos = transform.position;
var screenPos = CameraManager.Inst.MainCam.WorldToScreenPoint(myPos);
itemLootUi = Instantiate(itemUiPrefab, screenPos, Quaternion.identity, itemsLoot);
itemLootUi.Init(transform);
}
private void Awake()
{
audioSource = transform.parent.Find("Audio").GetComponent<AudioSource>();
itemsLoot = UiManager.Inst.OceanUi.MainCanvas.transform.Find("ItemsLoot");
}
private void Start()
{
if (useAutoDestroy)
{
Destroy(transform.parent.gameObject, autoDestroyTime);
Destroy(itemLootUi.gameObject, autoDestroyTime);
}
StartCoroutine(LootCoroutine());
}
private IEnumerator LootCoroutine()
{
while (true)
{
var maxSize = Physics.OverlapSphereNonAlloc(transform.position, radius, hitColliders, targetLayer);
if (maxSize > 0)
{
targetCollider = hitColliders[0];
itemLootUi.ItemAcquisition();
break;
}
yield return lootCoroutineTime;
}
var startPosition = transform.position;
var elapsedTime = 0f;
while (elapsedTime < acquisitionTime)
{
elapsedTime += Time.deltaTime;
var t = elapsedTime / acquisitionTime;
t = Mathf.SmoothStep(0f, 1f, t);
transform.position = Vector3.Lerp(startPosition, targetCollider.transform.position, t);
yield return null;
}
item.Acquire();
itemLootUi.gameObject.SetActive(false);
UiManager.Inst.OceanUi.DropItemGroupController.ShowDropItemInfoUi(item);
if (audioSource && audioSource.resource)
{
audioSource.Play();
}
yield return new WaitForSeconds(audioSource.clip.length);
Destroy(transform.parent.gameObject);
Destroy(itemLootUi.gameObject);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: c3ea0c13f4edde747b6d5eb5d6842905

View File

@ -0,0 +1,40 @@
using Sirenix.OdinInspector;
using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class ItemDropManager : Singleton<ItemDropManager>
{
[Title("초기화 방식")]
[SerializeField] private bool autoInit = true;
[field: Title("아이템")]
[field: SerializeField] public GameObject ItemPrefab { get; private set; }
[SerializeField] private Transform instantiateObjects;
[SerializeField] private Transform items;
[Button("셋팅 초기화")]
private void Init()
{
instantiateObjects = GameObject.Find("InstantiateObjects").transform;
items = instantiateObjects.transform.Find("Items");
}
protected override void OnAwake()
{
base.OnAwake();
if (autoInit)
{
Init();
}
}
public void DropItem(Item item, Vector3 dropPosition)
{
var itemController = Instantiate(ItemPrefab, dropPosition, Quaternion.identity, items).GetComponentInChildren<ItemController>();
itemController.Init(item);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: bb206c5a6ef8a5c4699d0abf67531d7d

View File

@ -0,0 +1,39 @@
using UnityEngine;
using UnityEngine.UI;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class ItemUiController : MonoBehaviour
{
[SerializeField] private RectTransform rectTransform;
[SerializeField] private Image border;
[SerializeField] private Image icon;
[SerializeField] private RectTransform line;
private Transform targetTransform;
public void Init(Transform target, Sprite sprite = null)
{
targetTransform = target;
if (sprite)
{
icon.sprite = sprite;
}
gameObject.SetActive(true);
}
private void Update()
{
rectTransform.position = CameraManager.Inst.MainCam.WorldToScreenPoint(targetTransform.position);
}
public void ItemAcquisition()
{
if (line)
{
line.gameObject.SetActive(false);
}
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 3f8bfea5b12b9674dabae714608eb764

View File

@ -3,6 +3,8 @@ using System.Collections.Generic;
using Cinemachine;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -15,6 +17,15 @@ namespace BlueWaterProject
[field: Title("카메라")]
[field: SerializeField] public CinemachineVirtualCamera BaseShipCam { get; private set; }
[Title("포스트 프로세싱")]
[SerializeField] private Color boostVignetteColor = Color.red;
[SerializeField] private Color boostIntermediateVignetteColor = Color.gray;
[Range(0f, 4f)]
[SerializeField] private float vignetteIntensity = 0.4f;
private Vignette vignette;
private Color defaultVignetteColor;
private float defaultVignetteIntensity;
private List<CinemachineVirtualCamera> cineCamList;
private GameObject cineCams;
private CinemachineFramingTransposer framingTransposer;
@ -33,6 +44,13 @@ namespace BlueWaterProject
CameraManager.Inst.OceanCamera = this;
CameraManager.Inst.MainCam = Camera.main;
vignette = GetEffect<Vignette>();
if (vignette)
{
defaultVignetteColor = vignette.color.value;
defaultVignetteIntensity = vignette.intensity.value;
}
}
[Button("셋팅 초기화")]
@ -114,5 +132,45 @@ namespace BlueWaterProject
framingTransposer.m_CameraDistance = defaultDistance;
yield return null;
}
#region PostProcessing
public void ToggleEffect<T>(bool value) where T : VolumeComponent
{
var effect = GetEffect<T>();
if (effect == null)
{
print(typeof(T) + "효과가 없습니다.");
return;
}
effect.active = value;
}
private T GetEffect<T>() where T : VolumeComponent
{
var postProcessVolume = FindAnyObjectByType<Volume>();
if (postProcessVolume == null)
{
print("Volume 컴포넌트를 가진 오브젝트가 없습니다.");
return null;
}
postProcessVolume.profile.TryGet(out T effect);
return effect;
}
public void BoostVignette(float boostGauge)
{
if (boostGauge <= 0.3f)
{
vignette.color.value = Color.Lerp(defaultVignetteColor, boostIntermediateVignetteColor, boostGauge / 0.3f);
}
else
{
vignette.color.value = Color.Lerp(boostIntermediateVignetteColor, boostVignetteColor, (boostGauge - 0.3f) / 0.7f);
vignette.intensity.value = Mathf.Lerp(defaultVignetteIntensity, vignetteIntensity, (boostGauge - 0.3f) / 0.7f);
}
}
#endregion
}
}

View File

@ -1,77 +1,10 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.UI;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
#region ProcessBar Class
[Serializable]
public class ProcessBar
{
[field: SerializeField] public GameObject Obj { get; set; }
[field: SerializeField] public Image Fill { get; set; }
[field: SerializeField] public Transform PreviousGaugeLine { get; set; }
[field: SerializeField] public Slider ReloadSlider { get; set; }
[field: SerializeField] public float ShakeDuration { get; set; } = 0.5f;
[field: SerializeField] public float ShakePower { get; set; } = 10f;
private AudioSource reloadingAttackSound;
private bool isShaking;
public ProcessBar(GameObject obj, Image fill, Transform previousGaugeLine, Slider reloadSlider)
{
Obj = obj;
Fill = fill;
PreviousGaugeLine = previousGaugeLine;
ReloadSlider = reloadSlider;
reloadingAttackSound = ReloadSlider.GetComponent<AudioSource>();
SetFillAmount(0f);
}
public void SetActive(bool value) => Obj.SetActive(value);
public void SetPosition(Vector3 value) => Obj.transform.position = value;
public void SetFillAmount(float value) => Fill.fillAmount = value;
public void SetRotateZ(float value) => PreviousGaugeLine.rotation = Quaternion.Euler(0f, 0f, value);
public void SetActiveReloadSlider(bool value) => ReloadSlider.gameObject.SetActive(value);
public void SetSliderValue(float value) => ReloadSlider.value = value;
public IEnumerator ShakeProcessBarCoroutine()
{
if (isShaking) yield break;
isShaking = true;
reloadingAttackSound.Play();
var time = 0f;
var processBarOriginalPos = Obj.transform.localPosition;
while (time < ShakeDuration)
{
if (!Obj.gameObject.activeSelf)
{
Obj.transform.localPosition = processBarOriginalPos;
isShaking = false;
yield break;
}
time += Time.deltaTime;
var shakeAmount = Random.Range(-1f, 1f) * ShakePower;
var processBarLocalPos = Obj.transform.localPosition;
Obj.transform.localPosition = new Vector3(processBarLocalPos.x + shakeAmount, processBarLocalPos.y, processBarLocalPos.z);
yield return null;
}
Obj.transform.localPosition = processBarOriginalPos;
isShaking = false;
}
}
#endregion
public class OceanUi : MonoBehaviour
{
[Title("초기화 방식")]
@ -84,31 +17,35 @@ namespace BlueWaterProject
[field: SerializeField] public Slider ShipBoostSlider { get; set; }
[field: SerializeField] public GameObject SpeedLines { get; set; }
[field: SerializeField] public DropItemGroupController DropItemGroupController { get; set; }
private Canvas canvas;
public Canvas MainCanvas { get; private set; }
[Button("셋팅 초기화")]
private void Init()
{
canvas = GetComponent<Canvas>();
if (!canvas)
MainCanvas = GetComponent<Canvas>();
if (!MainCanvas)
{
Debug.LogError("canvas is null error");
return;
}
var processBar = canvas.transform.Find("ProcessBar").gameObject;
var processBar = MainCanvas.transform.Find("ProcessBar").gameObject;
var fill = processBar.transform.Find("Fill").GetComponent<Image>();
var previousGaugeLine = processBar.transform.Find("PreviousGaugeLine").transform;
var reloadSlider = canvas.transform.Find("ReloadSlider").GetComponent<Slider>();
var reloadSlider = MainCanvas.transform.Find("ReloadSlider").GetComponent<Slider>();
ProcessBar = new ProcessBar(processBar, fill, previousGaugeLine, reloadSlider);
ProcessBar.SetActiveReloadSlider(false);
ShipBoostSlider = canvas.transform.Find("ShipBoostSlider").GetComponent<Slider>();
ShipBoostSlider = MainCanvas.transform.Find("ShipBoostSlider").GetComponent<Slider>();
ShipBoostSlider.value = 0f;
SpeedLines = canvas.transform.Find("SpeedLines").gameObject;
SpeedLines = MainCanvas.transform.Find("SpeedLines").gameObject;
SpeedLines.SetActive(false);
DropItemGroupController = MainCanvas.transform.Find("DropItemGroup").GetComponent<DropItemGroupController>();
}
private void Awake()
@ -131,7 +68,7 @@ namespace BlueWaterProject
ProcessBar.SetPosition(result);
}
}
public void SetActiveSpeedLine(bool value) => SpeedLines.SetActive(value);
}
}

View File

@ -26,6 +26,7 @@ namespace BlueWaterProject
private float cannonRadius;
private LayerMask boidsLayer;
private Collider[] hitColliders = new Collider[3];
private void Awake()
{
@ -54,7 +55,6 @@ namespace BlueWaterProject
var projectile = Instantiate(projectileObj, firePos.position, Quaternion.Euler(firePosRotation));
var particleWeapon = projectile.GetComponent<ParticleWeapon>();
particleWeapon.onHitAction.AddListener(HandleCannonHit);
//projectile.GetComponent<Rigidbody>().AddForce(projectile.transform.forward * (chargingGauge * speed));
projectile.GetComponent<Rigidbody>().velocity = projectile.transform.forward * speed;
}
@ -62,22 +62,14 @@ namespace BlueWaterProject
{
if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water"))
{
var start = hit.point;
var direction = Vector3.down;
var radius = cannonRadius;
var maxDistance = height;
if (Physics.SphereCast(start, radius, direction, out var hitInfo, maxDistance,
boidsLayer, QueryTriggerInteraction.Collide))
{
Debug.DrawRay(start, direction * height, Color.green, 3f);
var maxSize = Physics.OverlapSphereNonAlloc(hit.point, cannonRadius, hitColliders, boidsLayer,
QueryTriggerInteraction.Collide);
var hitBoids = hitInfo.collider.GetComponentInParent<Boids>();
hitBoids.CatchBoid(Random.Range((int)randomCatch.x, (int)randomCatch.y));
}
else
for (var i = 0; i < maxSize; i++)
{
Debug.DrawRay(start, direction * height, Color.red, 3f);
var hitBoids = hitColliders[i].GetComponentInParent<Boids>();
var catchSize = Random.Range((int)randomCatch.x, (int)randomCatch.y);
hitBoids.CatchBoid(hitColliders[i], catchSize);
}
}
else

View File

@ -8,26 +8,20 @@ namespace BlueWaterProject
[Serializable]
public class PlayerInventory
{
[SerializeField] private List<FishInfo> fishInfoList = new();
[SerializeField] private List<Item> items = new();
public void AddFish(string name, int? count = null)
public void AddItem(IItem item)
{
var existingFish = fishInfoList.Find(fish => fish.Name == name);
if (existingFish != null)
var existingItem = items.Find(i => i.ItemName == item.ItemName);
if (existingItem != null)
{
existingFish.AddCount(count);
existingItem.ItemCount += item.ItemCount;
}
else
{
fishInfoList.Add(new FishInfo(name, 1));
items.Add(new Item(item.ItemName, item.ItemCount));
}
}
public int GetFishCount(string name)
{
var fish = fishInfoList.Find(f => f.Name == name);
return fish?.Count ?? 0;
}
}
}

View File

@ -0,0 +1,72 @@
using System;
using System.Collections;
using UnityEngine;
using UnityEngine.UI;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
[Serializable]
public class ProcessBar
{
[field: SerializeField] public GameObject Obj { get; set; }
[field: SerializeField] public Image Fill { get; set; }
[field: SerializeField] public Transform PreviousGaugeLine { get; set; }
[field: SerializeField] public Slider ReloadSlider { get; set; }
[field: SerializeField] public float ShakeDuration { get; set; } = 0.5f;
[field: SerializeField] public float ShakePower { get; set; } = 10f;
private AudioSource reloadingAttackSound;
private bool isShaking;
public ProcessBar(GameObject obj, Image fill, Transform previousGaugeLine, Slider reloadSlider)
{
Obj = obj;
Fill = fill;
PreviousGaugeLine = previousGaugeLine;
ReloadSlider = reloadSlider;
reloadingAttackSound = ReloadSlider.GetComponent<AudioSource>();
SetFillAmount(0f);
}
public void SetActive(bool value) => Obj.SetActive(value);
public void SetPosition(Vector3 value) => Obj.transform.position = value;
public void SetFillAmount(float value) => Fill.fillAmount = value;
public void SetRotateZ(float value) => PreviousGaugeLine.rotation = Quaternion.Euler(0f, 0f, value);
public void SetActiveReloadSlider(bool value) => ReloadSlider.gameObject.SetActive(value);
public void SetSliderValue(float value) => ReloadSlider.value = value;
public IEnumerator ShakeProcessBarCoroutine()
{
if (isShaking) yield break;
isShaking = true;
reloadingAttackSound.Play();
var time = 0f;
var processBarOriginalPos = Obj.transform.localPosition;
while (time < ShakeDuration)
{
if (!Obj.gameObject.activeSelf)
{
Obj.transform.localPosition = processBarOriginalPos;
isShaking = false;
yield break;
}
time += Time.deltaTime;
var shakeAmount = Random.Range(-1f, 1f) * ShakePower;
var processBarLocalPos = Obj.transform.localPosition;
Obj.transform.localPosition = new Vector3(processBarLocalPos.x + shakeAmount, processBarLocalPos.y,
processBarLocalPos.z);
yield return null;
}
Obj.transform.localPosition = processBarOriginalPos;
isShaking = false;
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: f86fa54994439bd4682548d17f8ebdbd

View File

@ -1,37 +1,14 @@
using System;
using System.Collections;
using Cinemachine;
using MoreMountains.Feedbacks;
using MoreMountains.FeedbacksForThirdParty;
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
using UnityEngine.SceneManagement;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class VisualFeedbackManager : Singleton<VisualFeedbackManager>
{
private Vignette vignette;
private void OnEnable()
{
SceneManager.sceneLoaded += OnSceneLoaded;
}
private void OnDisable()
{
SceneManager.sceneLoaded -= OnSceneLoaded;
}
private void OnSceneLoaded(Scene scene, LoadSceneMode mode)
{
vignette = null;
vignette = GetEffect<Vignette>();
}
#region HitStop
/// <summary>
@ -71,50 +48,6 @@ namespace BlueWaterProject
mmfPlayer.PlayFeedbacks();
}
#region PostProcessing
public void ToggleEffect<T>(bool value) where T : VolumeComponent
{
var effect = GetEffect<T>();
if (effect == null)
{
print(typeof(T) + "효과가 없습니다.");
return;
}
effect.active = value;
}
private T GetEffect<T>() where T : VolumeComponent
{
var postProcessVolume = FindAnyObjectByType<Volume>();
if (postProcessVolume == null)
{
print("Volume 컴포넌트를 가진 오브젝트가 없습니다.");
return null;
}
postProcessVolume.profile.TryGet(out T effect);
return effect;
}
public void SetVignetteIntensity(float intensity)
{
if (vignette == null)
{
vignette = GetEffect<Vignette>();
}
if (vignette != null)
{
vignette.intensity.value = intensity;
}
else
{
print("vignette is null.");
}
}
#endregion
#endregion
}
}

View File

@ -1,53 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6554737609160912332
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: island_3 1
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 2100000, guid: 1fdb04dd94962674e9d65958f0424612, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: e36a3c09e72db7d43af61f5da90dacc4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: e36a3c09e72db7d43af61f5da90dacc4, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: []
m_Colors: []
m_BuildTextureStacks: []

View File

@ -1,14 +0,0 @@
fileFormatVersion: 2
<<<<<<<< HEAD:BlueWater/Assets/03.Images/Island/Materials/island_3 1.mat.meta
guid: 41302cf81a786ea428566b68926f2e1e
NativeFormatImporter:
========
guid: 5b58195b2bf7f4d56a297642824e9f33
folderAsset: yes
DefaultImporter:
>>>>>>>> 3c3086cc4799be66ca98f944d372c1128cbe04c9:BlueWater/Assets/03.Images/Tycoon/Foods.meta
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,196 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: obj_bush01_2048
m_Shader: {fileID: 482279110045391116, guid: d7b0192b9bf19c949900035fa781fdc4, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ADVANCED_SHADING
- _CAUSTICS
- _DISTANCE_NORMALS
- _FOAM
- _NORMALMAP
- _REFRACTION
- _SHARP_INERSECTION
- _TRANSLUCENCY
m_InvalidKeywords:
- _DEPTHEXP_ON
- _ZCLIP_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: e36a3c09e72db7d43af61f5da90dacc4, 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}
- _BumpMapLarge:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMapSlope:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CausticsTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FoamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FoamTexDynamic:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IntersectionNoise:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _PlanarReflection:
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:
- _CausticsBrightness: 2
- _CausticsDistortion: 0.15
- _CausticsOn: 1
- _CausticsSpeed: 0.1
- _CausticsTiling: 0.5
- _ColorAbsorption: 0
- _Cull: 2
- _DepthExp: 1
- _DepthHorizontal: 1
- _DepthVertical: 4
- _DisableDepthTexture: 0
- _DistanceNormalsOn: 1
- _DistanceNormalsTiling: 0.15
- _EdgeFade: 0.1
- _EnvironmentReflectionsOn: 1
- _FlatShadingOn: 0
- _FoamBaseAmount: 0
- _FoamClipping: 0
- _FoamDistortion: 0
- _FoamOn: 1
- _FoamSpeed: 0.1
- _FoamSpeedDynamic: 0.1
- _FoamSubSpeed: -0.25
- _FoamSubSpeedDynamic: -0.1
- _FoamSubTiling: 0.5
- _FoamSubTilingDynamic: 2
- _FoamTilingDynamic: 0.1
- _FoamWaveAmount: 0
- _HorizonDistance: 8
- _IntersectionClipping: 0.5
- _IntersectionFalloff: 0.5
- _IntersectionLength: 2
- _IntersectionRippleDist: 32
- _IntersectionRippleStrength: 0.5
- _IntersectionSource: 0
- _IntersectionSpeed: 0.1
- _IntersectionStyle: 1
- _IntersectionTiling: 0.2
- _LightingOn: 1
- _NormalMapOn: 1
- _NormalSpeed: 0.2
- _NormalStrength: 0.135
- _NormalSubSpeed: -0.5
- _NormalSubTiling: 0.5
- _PlanarReflectionsEnabled: 0
- _PointSpotLightReflectionDistortion: 0.5
- _PointSpotLightReflectionSize: 0
- _PointSpotLightReflectionStrength: 10
- _ReceiveShadows: 1
- _ReflectionBlur: 0
- _ReflectionDistortion: 0.05
- _ReflectionFresnel: 5
- _ReflectionLighting: 0
- _ReflectionStrength: 1
- _RefractionChromaticAberration: 1
- _RefractionOn: 1
- _RefractionStrength: 0.1
- _RiverModeOn: 0
- _ShadingMode: 1
- _ShadowStrength: 1
- _SlopeAngleFalloff: 25
- _SlopeAngleThreshold: 15
- _SlopeFoam: 1
- _SlopeSpeed: 2
- _SlopeStretching: 0.5
- _SparkleIntensity: 0
- _SparkleSize: 0.28
- _SpecularReflectionsOn: 1
- _Speed: 1
- _SunReflectionDistortion: 0.49
- _SunReflectionSize: 0.5
- _SunReflectionStrength: 10
- _TessMax: 15
- _TessMin: 0
- _TessValue: 16
- _TranslucencyCurvatureMask: 0.75
- _TranslucencyExp: 4
- _TranslucencyOn: 1
- _TranslucencyReflectionMask: 1
- _TranslucencyStrength: 1
- _TranslucencyStrengthDirect: 0.05
- _UnderwaterRefractionOffset: 0.2
- _UnderwaterSurfaceSmoothness: 0.8
- _VertexColorDepth: 0
- _VertexColorFoam: 0
- _VertexColorWaveFlattening: 0
- _WaveCount: 1
- _WaveDistance: 0.8
- _WaveHeight: 0.25
- _WaveNormalStr: 0.5
- _WaveSpeed: 2
- _WaveSteepness: 0.1
- _WaveTint: 0
- _WavesOn: 0
- _WorldSpaceUV: 1
- _ZClip: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0.44, b: 0.62, a: 1}
- _Direction: {r: 0, g: -1, b: 0, a: 0}
- _DistanceNormalsFadeDist: {r: 100, g: 300, b: 0, a: 0}
- _FoamColor: {r: 1, g: 1, b: 1, a: 1}
- _FoamTiling: {r: 0.1, g: 0.1, b: 0, a: 0}
- _HorizonColor: {r: 0.84, g: 1, b: 1, a: 0.15}
- _IntersectionColor: {r: 1, g: 1, b: 1, a: 1}
- _NormalTiling: {r: 0.5, g: 0.5, b: 0, a: 0}
- _ShallowColor: {r: 0.1, g: 0.9, b: 0.89, a: 0.02}
- _WaveDirection: {r: 1, g: 1, b: 1, a: 1}
- _WaveFadeDistance: {r: 150, g: 300, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,121 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: obj_bush02_2048
m_Shader: {fileID: 4800000, guid: bee44b4a58655ee4cbff107302a3e131, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _CELPRIMARYMODE_SINGLE
- _DETAILMAPBLENDINGMODE_MULTIPLY
- _TEXTUREBLENDINGMODE_MULTIPLY
m_InvalidKeywords:
- _UNITYSHADOWMODE_NONE
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 28e5ffbe334b09b48bb81accc5694a8a, 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}
- _CelCurveTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CelStepTexture:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMap:
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}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _BaseMapPremultiply: 0
- _Blend: 0
- _CameraDistanceImpact: 0
- _CelExtraEnabled: 0
- _CelNumSteps: 3
- _CelPrimaryMode: 1
- _Cull: 2
- _Cutoff: 0.5
- _DetailMapBlendingMode: 0
- _DetailMapImpact: 0
- _DstBlend: 0
- _FlatRimEdgeSmoothness: 0.5
- _FlatRimLightAlign: 0
- _FlatRimSize: 0.5
- _FlatSpecularEdgeSmoothness: 0
- _FlatSpecularSize: 0.1
- _Flatness: 1
- _FlatnessExtra: 1
- _GradientAngle: 0
- _GradientCenterX: 0
- _GradientCenterY: 0
- _GradientEnabled: 0
- _GradientSize: 10
- _LightContribution: 0
- _LightFalloffSize: 0
- _LightmapDirectionPitch: 0
- _LightmapDirectionYaw: 0
- _OutlineDepthOffset: 0
- _OutlineEnabled: 0
- _OutlineScale: 1
- _OutlineWidth: 1
- _OverrideLightmapDir: 0
- _QueueOffset: 0
- _RimEnabled: 0
- _SelfShadingSize: 0.5
- _SelfShadingSizeExtra: 0.6
- _ShadowEdgeSize: 0.05
- _ShadowEdgeSizeExtra: 0.05
- _SpecularEnabled: 0
- _SrcBlend: 1
- _Surface: 0
- _TextureBlendingMode: 0
- _TextureImpact: 1
- _UnityShadowMode: 0
- _UnityShadowOcclusion: 0
- _UnityShadowPower: 0.2
- _UnityShadowSharpness: 1
- _VertexColorsEnabled: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _ColorDim: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
- _ColorDimCurve: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
- _ColorDimExtra: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
- _ColorDimSteps: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
- _ColorGradient: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
- _DetailMapColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _FlatRimColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
- _FlatSpecularColor: {r: 0.85023, g: 0.85034, b: 0.85045, a: 0.85056}
- _LightmapDirection: {r: 0, g: 1, b: 0, a: 0}
- _OutlineColor: {r: 1, g: 1, b: 1, a: 1}
- _UnityShadowColor: {r: 0.85023, g: 0.85034, b: 0.8504499, a: 0.85056}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,196 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: tree
m_Shader: {fileID: 482279110045391116, guid: d7b0192b9bf19c949900035fa781fdc4, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ADVANCED_SHADING
- _CAUSTICS
- _DISTANCE_NORMALS
- _FOAM
- _NORMALMAP
- _REFRACTION
- _SHARP_INERSECTION
- _TRANSLUCENCY
m_InvalidKeywords:
- _DEPTHEXP_ON
- _ZCLIP_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: b926898833587254d82e8e8efbffce38, 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}
- _BumpMapLarge:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMapSlope:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CausticsTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FoamTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FoamTexDynamic:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IntersectionNoise:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _PlanarReflection:
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:
- _CausticsBrightness: 2
- _CausticsDistortion: 0.15
- _CausticsOn: 1
- _CausticsSpeed: 0.1
- _CausticsTiling: 0.5
- _ColorAbsorption: 0
- _Cull: 2
- _DepthExp: 1
- _DepthHorizontal: 1
- _DepthVertical: 4
- _DisableDepthTexture: 0
- _DistanceNormalsOn: 1
- _DistanceNormalsTiling: 0.15
- _EdgeFade: 0.1
- _EnvironmentReflectionsOn: 1
- _FlatShadingOn: 0
- _FoamBaseAmount: 0
- _FoamClipping: 0
- _FoamDistortion: 0
- _FoamOn: 1
- _FoamSpeed: 0.1
- _FoamSpeedDynamic: 0.1
- _FoamSubSpeed: -0.25
- _FoamSubSpeedDynamic: -0.1
- _FoamSubTiling: 0.5
- _FoamSubTilingDynamic: 2
- _FoamTilingDynamic: 0.1
- _FoamWaveAmount: 0
- _HorizonDistance: 8
- _IntersectionClipping: 0.5
- _IntersectionFalloff: 0.5
- _IntersectionLength: 2
- _IntersectionRippleDist: 32
- _IntersectionRippleStrength: 0.5
- _IntersectionSource: 0
- _IntersectionSpeed: 0.1
- _IntersectionStyle: 1
- _IntersectionTiling: 0.2
- _LightingOn: 1
- _NormalMapOn: 1
- _NormalSpeed: 0.2
- _NormalStrength: 0.135
- _NormalSubSpeed: -0.5
- _NormalSubTiling: 0.5
- _PlanarReflectionsEnabled: 0
- _PointSpotLightReflectionDistortion: 0.5
- _PointSpotLightReflectionSize: 0
- _PointSpotLightReflectionStrength: 10
- _ReceiveShadows: 1
- _ReflectionBlur: 0
- _ReflectionDistortion: 0.05
- _ReflectionFresnel: 5
- _ReflectionLighting: 0
- _ReflectionStrength: 1
- _RefractionChromaticAberration: 1
- _RefractionOn: 1
- _RefractionStrength: 0.1
- _RiverModeOn: 0
- _ShadingMode: 1
- _ShadowStrength: 1
- _SlopeAngleFalloff: 25
- _SlopeAngleThreshold: 15
- _SlopeFoam: 1
- _SlopeSpeed: 2
- _SlopeStretching: 0.5
- _SparkleIntensity: 0
- _SparkleSize: 0.28
- _SpecularReflectionsOn: 1
- _Speed: 1
- _SunReflectionDistortion: 0.49
- _SunReflectionSize: 0.5
- _SunReflectionStrength: 10
- _TessMax: 15
- _TessMin: 0
- _TessValue: 16
- _TranslucencyCurvatureMask: 0.75
- _TranslucencyExp: 4
- _TranslucencyOn: 1
- _TranslucencyReflectionMask: 1
- _TranslucencyStrength: 1
- _TranslucencyStrengthDirect: 0.05
- _UnderwaterRefractionOffset: 0.2
- _UnderwaterSurfaceSmoothness: 0.8
- _VertexColorDepth: 0
- _VertexColorFoam: 0
- _VertexColorWaveFlattening: 0
- _WaveCount: 1
- _WaveDistance: 0.8
- _WaveHeight: 0.25
- _WaveNormalStr: 0.5
- _WaveSpeed: 2
- _WaveSteepness: 0.1
- _WaveTint: 0
- _WavesOn: 0
- _WorldSpaceUV: 1
- _ZClip: 1
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0, g: 0.44, b: 0.62, a: 1}
- _Direction: {r: 0, g: -1, b: 0, a: 0}
- _DistanceNormalsFadeDist: {r: 100, g: 300, b: 0, a: 0}
- _FoamColor: {r: 1, g: 1, b: 1, a: 1}
- _FoamTiling: {r: 0.1, g: 0.1, b: 0, a: 0}
- _HorizonColor: {r: 0.84, g: 1, b: 1, a: 0.15}
- _IntersectionColor: {r: 1, g: 1, b: 1, a: 1}
- _NormalTiling: {r: 0.5, g: 0.5, b: 0, a: 0}
- _ShallowColor: {r: 0.1, g: 0.9, b: 0.89, a: 0.02}
- _WaveDirection: {r: 1, g: 1, b: 1, a: 1}
- _WaveFadeDistance: {r: 150, g: 300, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

View File

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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7ee4cfa4aff8c40b281bd877cce92d7c
guid: aff4ba8046b68fa488f0d4035c26091a
folderAsset: yes
DefaultImporter:
externalObjects: {}

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: island_tile_down
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 61a2e18d1d1175847b2c8824175dc64d, 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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: 61a2e18d1d1175847b2c8824175dc64d, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
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: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &2172632659071585706
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

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 61b247dd8f9aa904ca45e3028a61a121
guid: 614a28da6a402f546ada854be47ee2f8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1910531119350334783
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: island_west04
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: c6749636e84d62b489c02a91cbe4d748, 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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: c6749636e84d62b489c02a91cbe4d748, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
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: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 1fdb04dd94962674e9d65958f0424612
guid: cfebfe50ae26e43408ae286897f959f2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6150910412851929440
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: island_worldmap
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 590851e5b1ade374e943521bde396053, 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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: 590851e5b1ade374e943521bde396053, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
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: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 327eede0125b8894ba10e6b22649fa35
guid: 347604b2a5dccfb4484e9ac771c535ba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6554737609160912332
--- !u!114 &-1354684283742634097
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
@ -20,7 +20,7 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: island_tree
m_Name: land01
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
@ -40,7 +40,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: b926898833587254d82e8e8efbffce38, type: 3}
m_Texture: {fileID: 2800000, guid: ee40cf7053c686c49a4d70e09c6cff39, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
@ -64,7 +64,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: b926898833587254d82e8e8efbffce38, type: 3}
m_Texture: {fileID: 2800000, guid: ee40cf7053c686c49a4d70e09c6cff39, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@ -134,3 +134,4 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 889749be286eaab45b194ee817bbabe5
guid: 151f722082aaca84b917c14f83d722e8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: waterfall
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _ALPHATEST_ON
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2450
stringTagMap:
RenderType: TransparentCutout
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 1b701913a3b628d409be0d7786185294, 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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: 1b701913a3b628d409be0d7786185294, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
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: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &6252635112142381105
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

View File

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

View File

Before

Width:  |  Height:  |  Size: 3.6 MiB

After

Width:  |  Height:  |  Size: 3.6 MiB

View File

Before

Width:  |  Height:  |  Size: 526 KiB

After

Width:  |  Height:  |  Size: 526 KiB

View File

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 182 KiB

View File

Before

Width:  |  Height:  |  Size: 3.2 MiB

After

Width:  |  Height:  |  Size: 3.2 MiB

View File

Before

Width:  |  Height:  |  Size: 2.0 MiB

After

Width:  |  Height:  |  Size: 2.0 MiB

View File

Before

Width:  |  Height:  |  Size: 76 KiB

After

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 363 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 44e1801a58d9d814897cb8d99da940cd
guid: 61a2e18d1d1175847b2c8824175dc64d
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 MiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: e36a3c09e72db7d43af61f5da90dacc4
guid: c6749636e84d62b489c02a91cbe4d748
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.0 MiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 28e5ffbe334b09b48bb81accc5694a8a
guid: 590851e5b1ade374e943521bde396053
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

Binary file not shown.

After

Width:  |  Height:  |  Size: 1002 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 385188d281dfc4040a538298aa063145
guid: ee40cf7053c686c49a4d70e09c6cff39
TextureImporter:
internalIDToNameTable: []
externalObjects: {}

View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 59dcb7592b427754e980fe2d66586b7f
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: 9b63d30dcc8941f4f885cc292de5625f
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 0.01
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,136 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-7784332240474065813
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: mountain03-3
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: 730cf80409268a54e8844ace230110cd, 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}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
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: 730cf80409268a54e8844ace230110cd, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
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: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 730cf80409268a54e8844ace230110cd
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,107 @@
fileFormatVersion: 2
guid: b1ef4913cd088ba459df1b323c656fdd
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 1
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 1
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 90 KiB

View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: cae69a1fa3f9d8641977fdec31450a1b
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Some files were not shown because too many files have changed in this diff Show More