iwnc2020/OldBlueWater
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset
This commit is contained in:
IDMhan 2024-03-10 17:51:53 +09:00
commit aefbbb64dc
254 changed files with 358053 additions and 12666 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11974
BlueWater/Assets/01.Scenes/02.Ocean.unity
View File

File diff suppressed because one or more lines are too long

3
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for SW2 Underwater Integration.unitypackage.meta → BlueWater/Assets/01.Scenes/02.Tycoon_video.meta
View File

@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: aba6fa52907672a4da99307e9c925639
guid: 0d447eb922ef42e478f53dc95229cb10
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:

262064
BlueWater/Assets/01.Scenes/02.Tycoon_video.unity Normal file
View File

File diff suppressed because it is too large Load Diff

2
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for HDRP.unitypackage.meta → BlueWater/Assets/01.Scenes/02.Tycoon_video.unity.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 004bb78c41a95b84093e416b01e1fbe8
guid: f464a3dfd27f11147afa97dade2f0d96
DefaultImporter:
externalObjects: {}
userData:

BIN
BlueWater/Assets/01.Scenes/02.Tycoon_video/NavMesh-NavMesh Surface.asset Normal file
View File

Binary file not shown.

2
BlueWater/Assets/01.Scenes/02.Tycoon/NavMesh-NavMesh Surface.asset.meta → BlueWater/Assets/01.Scenes/02.Tycoon_video/NavMesh-NavMesh Surface.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 7f435cceb6d614cf0b149079d184c785
guid: 7bcc47d10bd48184cbe2b84632b11714
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 23800000

5749
BlueWater/Assets/01.Scenes/99.Tycoon1.unity
View File

File diff suppressed because it is too large Load Diff

2
BlueWater/Assets/02.Scripts/Ai/BehaviorTree/Task/PirateShip/PatrolWait.cs
View File

@ -17,7 +17,7 @@ namespace BlueWaterProject
public override void OnStart()
{
currentWaitTime = iPatrol.GetCurrentWayPoint().WaitTime;
currentWaitTime = iPatrol.GetCurrentWayPointInfo().WaitTime;
time = 0f;
}

60
BlueWater/Assets/02.Scripts/Ai/ShipPatrol.cs → BlueWater/Assets/02.Scripts/Ai/Patrol.cs
View File

@ -1,25 +1,20 @@
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.AI;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class ShipPatrol : MonoBehaviour, IPatrol
public class Patrol : MonoBehaviour
{
/***********************************************************************
* Variables
***********************************************************************/
#region Variables
// 컴포넌트
[Title("컴포넌트")]
[SerializeField] private Rigidbody rb;
// 패트롤 옵션
[Title("패트롤 옵션")]
[SerializeField] private bool showWayPointGizmo = true;
[field: SerializeField] public WayPoint[] WayPoints { get; set; }
[field: SerializeField] public WayPointInfo[] WayPoints { get; set; }
[field: SerializeField] public Vector3 OriginalPoint { get; set; }
[field: SerializeField] public int CurrentIndex { get; set; }
[field: SerializeField] public int PreviousIndex { get; set; }
@ -43,7 +38,7 @@ namespace BlueWaterProject
if (!Application.isPlaying)
{
OriginalPoint = rb.position;
OriginalPoint = transform.position;
}
for (var i = 0; i < WayPoints.Length; i++)
@ -87,7 +82,8 @@ namespace BlueWaterProject
***********************************************************************/
#region Methods
public WayPoint GetCurrentWayPoint() => WayPoints[CurrentIndex];
public WayPointInfo GetCurrentWayPointInfo() => WayPoints[CurrentIndex];
public Vector3 GetCurrentWayPoint() => OriginalPoint + WayPoints[CurrentIndex].Point;
public int GetNextIndex()
{
@ -106,65 +102,23 @@ namespace BlueWaterProject
public bool HasReachedDestination()
{
var myPosition = rb.position;
var myPosition = transform.position;
var movePoint = OriginalPoint + WayPoints[CurrentIndex].Point;
var distance = Vector3.Distance(myPosition, movePoint);
print(distance);
if (distance > 3f) return false;
print("도착");
return true;
}
public void SetMovePoint()
{
if (!rb || WayPoints == null || WayPoints.Length <= CurrentIndex) return;
if (WayPoints == null || WayPoints.Length <= CurrentIndex) return;
print("다음 목적지");
PreviousIndex = CurrentIndex;
CurrentIndex = GetNextIndex();
}
public void UpdatePositionAndRotation()
{
// // 현재 위치에서 목표지점까지의 방향과 거리 계산
// var myPosition = rb.position;
// var movePoint = OriginalPoint + WayPoints[CurrentIndex].Point;
// var direction = (movePoint - myPosition).normalized;
// var distance = Vector3.Distance(movePoint, myPosition);
//
// // Combine forces with weights
// var currentVelocity = seekForce + avoidForce;
// currentVelocity = Vector3.ClampMagnitude(currentVelocity, maxVelocity);
//
// if (distance < 10f)
// {
// // 목적지에 가까워짐에 따라 속도를 동적으로 조절
// var desiredSpeed = (distance / 10f) * maxSpeed;
// currentVelocity = currentVelocity.normalized * desiredSpeed;
// }
// else
// {
// // 목적지에서 멀리 떨어져 있을 때는 최대 속도로 이동
// currentVelocity = Vector3.ClampMagnitude(currentVelocity, maxSpeed);
// }
//
// rb.AddForce(currentVelocity - rb.velocity, ForceMode.Acceleration);
//
// //rb.AddForce(currentVelocity, ForceMode.Acceleration);
//
// if (rb.velocity.magnitude > 10f)
// {
// rb.velocity = rb.velocity.normalized * 10f;
// }
//
// var targetRotation = Quaternion.LookRotation(direction);
// rb.MoveRotation(Quaternion.RotateTowards(rb.rotation, targetRotation, rotationSpeed * Time.deltaTime));
}
#endregion
}
}

0
BlueWater/Assets/02.Scripts/Ai/ShipPatrol.cs.meta → BlueWater/Assets/02.Scripts/Ai/Patrol.cs.meta
View File

335
BlueWater/Assets/02.Scripts/Ai/PirateShipAi.cs
View File

@ -1,17 +1,91 @@
using System;
using System.Collections;
using BehaviorDesigner.Runtime;
using Pathfinding;
using RayFire;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Serialization;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class PirateShipAi : MonoBehaviour
public class PirateShipAi : MonoBehaviour, IDamageable
{
/***********************************************************************
* Variables
***********************************************************************/
#region Variables
// Components
[SerializeField] private ShipPatrol shipPatrol;
// 컴포넌트
[TitleGroup("컴포넌트"), BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private Patrol patrol;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private Cannon cannon;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private RayfireRigid[] rayfireRigids;
// 배의 기본 설정
[field: TitleGroup("배의 기본 설정")]
// AI
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟 감지 거리"), Range(0f, 200f)]
[SerializeField] private float viewRadius = 100f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟의 정면 방향으로 Offset만큼의 위치를 목표 지점으로 설정"), Range(0f, 100f)]
[SerializeField] private float targetForwardOffset = 50f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟과 유지할 거리"), Range(0f, 100f)]
[SerializeField] private float targetMaintainDistance = 40f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟을 놓치기 시작한 거리"), Range(0f, 200f)]
[SerializeField] private float missDistance = 100f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟을 놓치기 시작한 거리"), Range(0f, 20f)]
[SerializeField] private float missedTargetTime = 5f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟을 완전히 놓친 후, 기다리는 시간"), Range(0f, 10f)]
[SerializeField] private float returnPatrolWaitTime = 3f;
[BoxGroup("배의 기본 설정/AI")]
[Tooltip("타겟과 유지할 거리"), Range(0f, 100f)]
[SerializeField] private float cannonLaunchDistance = 60f;
// 체력
[field: BoxGroup("배의 기본 설정/체력")]
[field: Tooltip("배의 최대 체력"), Range(1f, 1000f)]
[field: SerializeField] public float MaxHp { get; private set; } = 100f;
[field: BoxGroup("배의 기본 설정/체력")]
[field: Tooltip("배의 현재 체력")]
[field: SerializeField] public float CurrentHp { get; private set; }
// 기타
[BoxGroup("배의 기본 설정/기타")]
[SerializeField] private bool isDrawingGizmos = true;
[BoxGroup("배의 기본 설정/기타")]
[SerializeField] private LayerMask targetLayer;
[field: SerializeField] public Collider Target { get; private set; }
private IAstarAI ai;
private Collider[] hitColliders;
private WaitForSeconds rescanTime = new(1f);
private Coroutine findNearestTargetCoroutine;
private Coroutine patrolCoroutine;
private Coroutine chaseCoroutine;
private Coroutine missedTargetCoroutine;
private const int MAX_HIT_SIZE = 5;
#endregion
@ -20,19 +94,270 @@ namespace BlueWaterProject
***********************************************************************/
#region Unity Events
private void OnDrawGizmosSelected()
{
if (!isDrawingGizmos) return;
var centerPosition = transform.position;
Gizmos.color = Color.red;
Gizmos.DrawWireSphere(centerPosition, viewRadius);
}
private void Start()
{
InitStart();
}
private void Update()
{
RotateCannon();
}
#endregion
/***********************************************************************
* Init Methods
***********************************************************************/
#region Init Methods
[Button("셋팅 초기화")]
private void Init()
{
patrol = GetComponent<Patrol>();
cannon = transform.Find("Cannon")?.GetComponent<Cannon>();
}
private void InitStart()
{
ai = GetComponent<IAstarAI>();
hitColliders = new Collider[MAX_HIT_SIZE];
SetCurrentHp(MaxHp);
findNearestTargetCoroutine = StartCoroutine(nameof(FindNearestTargetCoroutine));
if (!Target)
{
patrolCoroutine = StartCoroutine(nameof(PatrolCoroutine));
}
}
#endregion
/***********************************************************************
* Interfaces
***********************************************************************/
#region Interfaces
public void TakeDamage(float attackerPower, Vector3? attackPos = null)
{
var changeHp = Mathf.Max(CurrentHp - attackerPower, 0f);
SetCurrentHp(changeHp);
if (CurrentHp == 0f)
{
Die();
}
}
public void Die()
{
if (ai != null)
{
ai.isStopped = true;
}
foreach (var element in rayfireRigids)
{
if (element)
{
element.Demolish();
}
}
}
public float GetCurrentHp() => CurrentHp;
#endregion
/***********************************************************************
* Methods
***********************************************************************/
#region Methods
private IEnumerator FindNearestTargetCoroutine()
{
while (true)
{
var centerPos = transform.position;
var hitSize = Physics.OverlapSphereNonAlloc(centerPos, viewRadius, hitColliders, targetLayer, QueryTriggerInteraction.Ignore);
if (hitSize <= 0)
{
Target = null;
yield return rescanTime;
continue;
}
var nearestDistance = float.PositiveInfinity;
Collider nearestTargetCollider = null;
for (var i = 0; i < hitSize; i++)
{
var distance = Vector3.Distance(centerPos, hitColliders[i].transform.position);
if (distance >= nearestDistance) continue;
nearestDistance = distance;
nearestTargetCollider = hitColliders[i];
}
Target = nearestTargetCollider;
if (Target != null)
{
if (patrolCoroutine != null)
{
StopCoroutine(patrolCoroutine);
patrolCoroutine = null;
}
chaseCoroutine ??= StartCoroutine(nameof(ChaseCoroutine));
findNearestTargetCoroutine = null;
yield break;
}
yield return rescanTime;
}
}
private IEnumerator PatrolCoroutine()
{
if (patrol.WayPoints.Length <= 0) yield break;
var movePoint = patrol.GetCurrentWayPoint();
SetDestination(movePoint);
while (ai.pathPending)
{
yield return null;
}
while (!ai.reachedDestination)
{
SetDestination(movePoint);
yield return null;
}
var elapsedTime = 0f;
var currentWaitTime = patrol.GetCurrentWayPointInfo().WaitTime;
while (elapsedTime < currentWaitTime)
{
elapsedTime += Time.deltaTime;
yield return null;
}
patrol.SetMovePoint();
patrolCoroutine = StartCoroutine(nameof(PatrolCoroutine));
}
private IEnumerator ChaseCoroutine()
{
while (Target)
{
var targetTransform = Target.transform;
var toTarget = targetTransform.position - transform.position;
toTarget.y = 0f;
var targetDistance = toTarget.magnitude;
var targetDirection = toTarget.normalized;
if (targetDistance > missDistance)
{
missedTargetCoroutine ??= StartCoroutine(nameof(MissedTargetCoroutine));
}
var movePosition = targetTransform.position + targetTransform.forward * targetForwardOffset;
if (targetDistance < targetMaintainDistance)
{
var crossDirection = Vector3.Cross(targetDirection, Vector3.up).normalized;
movePosition = targetTransform.position + crossDirection * targetMaintainDistance;
}
if (targetDistance < cannonLaunchDistance && !cannon.IsReloading)
{
cannon.LaunchAtTarget(Target);
}
SetDestination(movePosition);
yield return null;
}
chaseCoroutine = null;
}
private IEnumerator MissedTargetCoroutine()
{
var elapsedTime = 0f;
while (elapsedTime <= missedTargetTime)
{
elapsedTime += Time.deltaTime;
var targetDistance = Vector3.Distance(transform.position, Target.transform.position);
if (targetDistance <= missDistance)
{
missedTargetCoroutine = null;
yield break;
}
yield return null;
}
Target = null;
ai.isStopped = true;
yield return new WaitForSeconds(returnPatrolWaitTime);
missedTargetCoroutine = null;
findNearestTargetCoroutine ??= StartCoroutine(nameof(FindNearestTargetCoroutine));
patrolCoroutine ??= StartCoroutine(nameof(PatrolCoroutine));
}
private void SetDestination(Vector3 position)
{
if (ai == null) return;
if (ai.isStopped)
{
ai.isStopped = false;
}
ai.destination = position;
}
private void RotateCannon()
{
if (!Target) return;
var directionToMouse = (Target.transform.position - transform.position).normalized;
directionToMouse.y = 0f;
var lookRotation = Quaternion.LookRotation(directionToMouse);
var cannonRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
cannon.transform.rotation = cannonRotationDirection;
}
public void HitAction(RaycastHit hit, float power, GameObject marker = null)
{
hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
cannon.SetActivePredictLine(false);
if (marker)
{
Destroy(marker);
}
}
public void SetCurrentHp(float value) => CurrentHp = value;
#endregion
}

48
BlueWater/Assets/02.Scripts/BlueWater.cs
View File

@ -154,7 +154,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""initialStateCheck"": false
},
{
""name"": ""ToggleCannon"",
""name"": ""ToggleLaunchMode"",
""type"": ""Button"",
""id"": ""2d9a2349-b5a2-4926-a6e8-41abf2e24a3a"",
""expectedControlType"": ""Button"",
@ -163,7 +163,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""initialStateCheck"": false
},
{
""name"": ""FireCannon"",
""name"": ""LaunchCannon"",
""type"": ""Button"",
""id"": ""36407aa9-c5a9-4654-8452-ac5c52abf32f"",
""expectedControlType"": ""Button"",
@ -407,7 +407,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""FireCannon"",
""action"": ""LaunchCannon"",
""isComposite"": false,
""isPartOfComposite"": false
},
@ -440,7 +440,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""ToggleCannon"",
""action"": ""ToggleLaunchMode"",
""isComposite"": false,
""isPartOfComposite"": false
}
@ -620,8 +620,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
m_Player_Attack = m_Player.FindAction("Attack", throwIfNotFound: true);
m_Player_Dash = m_Player.FindAction("Dash", throwIfNotFound: true);
m_Player_ActivateMainSkill = m_Player.FindAction("ActivateMainSkill", throwIfNotFound: true);
m_Player_ToggleCannon = m_Player.FindAction("ToggleCannon", throwIfNotFound: true);
m_Player_FireCannon = m_Player.FindAction("FireCannon", throwIfNotFound: true);
m_Player_ToggleLaunchMode = m_Player.FindAction("ToggleLaunchMode", throwIfNotFound: true);
m_Player_LaunchCannon = m_Player.FindAction("LaunchCannon", throwIfNotFound: true);
m_Player_ShiftKey = m_Player.FindAction("ShiftKey", throwIfNotFound: true);
m_Player_BuildMode = m_Player.FindAction("BuildMode", throwIfNotFound: true);
// Camera
@ -708,8 +708,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
private readonly InputAction m_Player_Attack;
private readonly InputAction m_Player_Dash;
private readonly InputAction m_Player_ActivateMainSkill;
private readonly InputAction m_Player_ToggleCannon;
private readonly InputAction m_Player_FireCannon;
private readonly InputAction m_Player_ToggleLaunchMode;
private readonly InputAction m_Player_LaunchCannon;
private readonly InputAction m_Player_ShiftKey;
private readonly InputAction m_Player_BuildMode;
public struct PlayerActions
@ -730,8 +730,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
public InputAction @Attack => m_Wrapper.m_Player_Attack;
public InputAction @Dash => m_Wrapper.m_Player_Dash;
public InputAction @ActivateMainSkill => m_Wrapper.m_Player_ActivateMainSkill;
public InputAction @ToggleCannon => m_Wrapper.m_Player_ToggleCannon;
public InputAction @FireCannon => m_Wrapper.m_Player_FireCannon;
public InputAction @ToggleLaunchMode => m_Wrapper.m_Player_ToggleLaunchMode;
public InputAction @LaunchCannon => m_Wrapper.m_Player_LaunchCannon;
public InputAction @ShiftKey => m_Wrapper.m_Player_ShiftKey;
public InputAction @BuildMode => m_Wrapper.m_Player_BuildMode;
public InputActionMap Get() { return m_Wrapper.m_Player; }
@ -785,12 +785,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@ActivateMainSkill.started += instance.OnActivateMainSkill;
@ActivateMainSkill.performed += instance.OnActivateMainSkill;
@ActivateMainSkill.canceled += instance.OnActivateMainSkill;
@ToggleCannon.started += instance.OnToggleCannon;
@ToggleCannon.performed += instance.OnToggleCannon;
@ToggleCannon.canceled += instance.OnToggleCannon;
@FireCannon.started += instance.OnFireCannon;
@FireCannon.performed += instance.OnFireCannon;
@FireCannon.canceled += instance.OnFireCannon;
@ToggleLaunchMode.started += instance.OnToggleLaunchMode;
@ToggleLaunchMode.performed += instance.OnToggleLaunchMode;
@ToggleLaunchMode.canceled += instance.OnToggleLaunchMode;
@LaunchCannon.started += instance.OnLaunchCannon;
@LaunchCannon.performed += instance.OnLaunchCannon;
@LaunchCannon.canceled += instance.OnLaunchCannon;
@ShiftKey.started += instance.OnShiftKey;
@ShiftKey.performed += instance.OnShiftKey;
@ShiftKey.canceled += instance.OnShiftKey;
@ -843,12 +843,12 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@ActivateMainSkill.started -= instance.OnActivateMainSkill;
@ActivateMainSkill.performed -= instance.OnActivateMainSkill;
@ActivateMainSkill.canceled -= instance.OnActivateMainSkill;
@ToggleCannon.started -= instance.OnToggleCannon;
@ToggleCannon.performed -= instance.OnToggleCannon;
@ToggleCannon.canceled -= instance.OnToggleCannon;
@FireCannon.started -= instance.OnFireCannon;
@FireCannon.performed -= instance.OnFireCannon;
@FireCannon.canceled -= instance.OnFireCannon;
@ToggleLaunchMode.started -= instance.OnToggleLaunchMode;
@ToggleLaunchMode.performed -= instance.OnToggleLaunchMode;
@ToggleLaunchMode.canceled -= instance.OnToggleLaunchMode;
@LaunchCannon.started -= instance.OnLaunchCannon;
@LaunchCannon.performed -= instance.OnLaunchCannon;
@LaunchCannon.canceled -= instance.OnLaunchCannon;
@ShiftKey.started -= instance.OnShiftKey;
@ShiftKey.performed -= instance.OnShiftKey;
@ShiftKey.canceled -= instance.OnShiftKey;
@ -1022,8 +1022,8 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
void OnAttack(InputAction.CallbackContext context);
void OnDash(InputAction.CallbackContext context);
void OnActivateMainSkill(InputAction.CallbackContext context);
void OnToggleCannon(InputAction.CallbackContext context);
void OnFireCannon(InputAction.CallbackContext context);
void OnToggleLaunchMode(InputAction.CallbackContext context);
void OnLaunchCannon(InputAction.CallbackContext context);
void OnShiftKey(InputAction.CallbackContext context);
void OnBuildMode(InputAction.CallbackContext context);
}

8
BlueWater/Assets/02.Scripts/BlueWater.inputactions
View File

@ -132,7 +132,7 @@
"initialStateCheck": false
},
{
"name": "ToggleCannon",
"name": "ToggleLaunchMode",
"type": "Button",
"id": "2d9a2349-b5a2-4926-a6e8-41abf2e24a3a",
"expectedControlType": "Button",
@ -141,7 +141,7 @@
"initialStateCheck": false
},
{
"name": "FireCannon",
"name": "LaunchCannon",
"type": "Button",
"id": "36407aa9-c5a9-4654-8452-ac5c52abf32f",
"expectedControlType": "Button",
@ -385,7 +385,7 @@
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "FireCannon",
"action": "LaunchCannon",
"isComposite": false,
"isPartOfComposite": false
},
@ -418,7 +418,7 @@
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "ToggleCannon",
"action": "ToggleLaunchMode",
"isComposite": false,
"isPartOfComposite": false
}

17
BlueWater/Assets/02.Scripts/Character/Player/Type/ShipPlayer.cs
View File

@ -1,3 +1,4 @@
using RayFire;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.InputSystem;
@ -20,6 +21,9 @@ namespace BlueWaterProject
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private Rigidbody rb;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private RayfireRigid[] rayfireRigids;
// 배의 기본 설정
[TitleGroup("배의 기본 설정")]
@ -66,9 +70,6 @@ namespace BlueWaterProject
[field: BoxGroup("배의 기본 설정/기타")]
[field: Tooltip("배의 힘(충돌)")]
[field: SerializeField] public int Strength { get; set; } = 500;
[BoxGroup("배의 기본 설정/기타")]
[SerializeField] private LayerMask waterLayer;
[BoxGroup("배의 기본 설정/기타")]
[SerializeField] private LayerMask groundLayer;
@ -262,13 +263,17 @@ namespace BlueWaterProject
{
Die();
}
print("오브젝트 충돌 - 현재 체력 : " + CurrentHp);
}
public void Die()
{
print("배 파괴 - 현재 체력 : " + CurrentHp);
foreach (var element in rayfireRigids)
{
if (element)
{
element.Demolish();
}
}
}
public float GetCurrentHp() => CurrentHp;

6
BlueWater/Assets/02.Scripts/Editor/PatrolEditor.cs
View File

@ -4,13 +4,13 @@ using UnityEngine;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
[CustomEditor(typeof(ShipPatrol),true)]
[CustomEditor(typeof(Patrol),true)]
public class ShipPatrolEditor : Editor
{
private void OnSceneGUI()
{
Handles.color = Color.green;
var patrol = (ShipPatrol)target;
var patrol = (Patrol)target;
for (var i = 0; i < patrol.WayPoints.Length; i++)
{
@ -37,7 +37,7 @@ namespace BlueWaterProject
private Vector3 ApplyAxisLock(Vector3 oldPoint, Vector3 newPoint)
{
var patrolSetting = (ShipPatrol)target;
var patrolSetting = (Patrol)target;
if (patrolSetting.LockHandlesOnXAxis)
{
newPoint.x = oldPoint.x;

4
BlueWater/Assets/02.Scripts/Interface/IPatrol.cs
View File

@ -5,12 +5,12 @@ namespace BlueWaterProject
{
public interface IPatrol
{
WayPoint[] WayPoints { get; set; }
WayPointInfo[] WayPoints { get; set; }
Vector3 OriginalPoint { get; set; }
int CurrentIndex { get; set; }
int PreviousIndex { get; set; }
WayPoint GetCurrentWayPoint();
WayPointInfo GetCurrentWayPointInfo();
int GetNextIndex();
bool HasReachedDestination();
void SetMovePoint();

318
BlueWater/Assets/02.Scripts/Player/Cannon.cs
View File

@ -1,9 +1,7 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.InputSystem;
using Random = UnityEngine.Random;
using UnityEngine.Events;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -31,9 +29,6 @@ namespace BlueWaterProject
// 컴포넌트
[TitleGroup("컴포넌트"), BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private PlayerInput playerInput;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private GameObject projectileObject;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
@ -43,32 +38,25 @@ namespace BlueWaterProject
[Required, SerializeField] private Transform launchTransform;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private LineRenderer predictedLine;
[SerializeField] private LineRenderer predictedLine;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private GameObject hitMarker;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private GameObject directionIndicator;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private ProcessBar launchProcessBar;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private Transform instantiateObjects;
// 대포 기본 설정
[TitleGroup("대포 기본 설정")]
// 게이지
[BoxGroup("대포 기본 설정/게이지")]
[Range(0.1f, 5f), Tooltip("게이지가 모두 차는데 걸리는 시간\n게이지는 0 ~ 1의 값을 가짐")]
[SerializeField] private float gaugeChargingTime = 1f;
[field: TitleGroup("대포 기본 설정")]
// 발사 기능
[field: BoxGroup("대포 기본 설정/발사 기능")]
[field: Range(0f, 10f), Tooltip("발사 재사용 시간")]
[field: SerializeField] public float LaunchCooldown { get; set; } = 1f;
[BoxGroup("대포 기본 설정/발사 기능")]
[Range(0f, 3f), Tooltip("발사 재사용 시간")]
[SerializeField] private float launchCooldown = 1f;
[Tooltip("대포 공격력")]
[SerializeField] private float damage = 20f;
[BoxGroup("대포 기본 설정/발사 기능")]
[Range(1f, 100f), Tooltip("발사될 거리 계수\nchargingGauge * 변수값")]
@ -99,52 +87,23 @@ namespace BlueWaterProject
[SerializeField] private float lineInterval = 0.025f;
// 기타
[BoxGroup("대포 기본 설정/기타")]
[Tooltip("랜덤으로 잡힐 물고기 마릿수 x, y를 포함하는 사이의 값")]
[SerializeField] private Vector2 randomCatch = new(1, 4);
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private float mouseRayDistance = 500f;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private float rayDistance = 100f;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private LayerMask hitLayer;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private LayerMask waterLayer;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private LayerMask boidsLayer;
// 카메라 효과 옵션
[TitleGroup("카메라"), BoxGroup("카메라/카메라 흔들림 효과", ShowLabel = false)]
[SerializeField] private float cameraShakePower = 2f;
[BoxGroup("카메라/카메라 흔들림 효과", ShowLabel = false)]
[SerializeField] private float cameraShakeDuration = 0.3f;
// 실시간 상태
[TitleGroup("실시간 상태")]
[DisableIf("@true")]
[SerializeField] private bool isLaunchMode;
[DisableIf("@true")]
[SerializeField] private bool isCharging;
[DisableIf("@true")]
[SerializeField] private bool isReloading;
[DisableIf("@true")]
[SerializeField] private float chargingGauge;
[DisableIf("@true")]
[SerializeField] private float previousGauge;
private float cannonRadius;
[field: TitleGroup("실시간 상태")]
[field: DisableIf("@true")]
[field: SerializeField] public bool IsReloading { get; set; }
public UnityEvent<RaycastHit, float, GameObject> onHitAction;
public float CannonRadius { get; private set; }
private Vector3 launchVelocity;
private Collider[] hitColliders;
private GameObject newHitMarker;
private RaycastHit endPositionHit;
private const int MAX_HIT_SIZE = 8;
#endregion
@ -155,30 +114,7 @@ namespace BlueWaterProject
private void Start()
{
cannonRadius = projectileObject.GetComponent<SphereCollider>()?.radius ??
projectileObject.GetComponent<ParticleWeapon>().colliderRadius;
launchProcessBar = UiManager.Inst.OceanUi.ProcessBar;
hitColliders = new Collider[MAX_HIT_SIZE];
}
private void OnEnable()
{
playerInput.actions.FindAction("ToggleCannon").started += _ => ToggleCannon();
playerInput.actions.FindAction("FireCannon").started += _ => ChargeCannon();
playerInput.actions.FindAction("FireCannon").canceled += _ => FireCannon();
}
private void OnDisable()
{
playerInput.actions.FindAction("ToggleCannon").started -= _ => ToggleCannon();
playerInput.actions.FindAction("FireCannon").started -= _ => ChargeCannon();
playerInput.actions.FindAction("FireCannon").canceled -= _ => FireCannon();
}
private void Update()
{
HandleFireCannon();
InitStart();
}
#endregion
@ -191,7 +127,6 @@ namespace BlueWaterProject
[Button("셋팅 초기화")]
private void Init()
{
playerInput = GetComponentInParent<PlayerInput>();
projectileObject = Utils.LoadFromFolder<GameObject>("Assets/05.Prefabs/Particles/GrenadeFire", "GrenadeFireOBJ", ".prefab");
visualLook = transform.Find("VisualLook");
launchTransform = transform.Find("LaunchPosition");
@ -201,85 +136,12 @@ namespace BlueWaterProject
predictedLine.gameObject.SetActive(false);
}
hitMarker = Utils.LoadFromFolder<GameObject>("Assets/05.Prefabs", "HitMarker", ".prefab");
// directionIndicator = transform.parent.Find("DirectionIndicator")?.gameObject;
// if (directionIndicator)
// {
// directionIndicator.SetActive(false);
// }
instantiateObjects = GameObject.Find("InstantiateObjects").transform;
waterLayer = LayerMask.GetMask("Water");
boidsLayer = LayerMask.GetMask("Boids");
}
#endregion
/***********************************************************************
* PlayerInput
***********************************************************************/
#region PlayerInput
private void ToggleCannon()
private void InitStart()
{
isLaunchMode = !isLaunchMode;
if (directionIndicator)
{
directionIndicator.SetActive(isLaunchMode);
}
launchProcessBar.SetActive(isLaunchMode);
if (!isLaunchMode)
{
isCharging = false;
predictedLine.gameObject.SetActive(false);
if (newHitMarker)
{
Destroy(newHitMarker);
}
chargingGauge = 0f;
previousGauge = chargingGauge;
launchProcessBar.SetFillAmount(0f);
launchProcessBar.SetRotateZ(previousGauge * -360f);
launchProcessBar.SetRotateZ(0f);
launchProcessBar.SetSliderValue(0f);
}
}
private void ChargeCannon()
{
if (!isLaunchMode) return;
if (isReloading)
{
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine());
}
else
{
predictedLine.gameObject.SetActive(true);
if (hitMarker)
{
newHitMarker = Instantiate(hitMarker, Vector3.zero, hitMarker.transform.rotation, instantiateObjects);
newHitMarker.transform.localScale *= cannonRadius * 2f;
hitMarker.SetActive(true);
}
isCharging = true;
chargingGauge = 0f;
}
}
private void FireCannon()
{
if (!isLaunchMode || !isCharging) return;
isCharging = false;
predictedLine.gameObject.SetActive(false);
previousGauge = chargingGauge;
chargingGauge = 0f;
launchProcessBar.SetFillAmount(0f);
launchProcessBar.SetRotateZ(previousGauge * -360f);
Launch();
StartCoroutine(LaunchCoolDown(launchCooldown));
CannonRadius = projectileObject.GetComponent<SphereCollider>()?.radius ??
projectileObject.GetComponent<ParticleWeapon>().colliderRadius;
}
#endregion
@ -289,52 +151,9 @@ namespace BlueWaterProject
***********************************************************************/
#region Methods
private void HandleFireCannon()
{
if (!isLaunchMode) return;
var ray = CameraManager.Inst.MainCam.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out var hit, mouseRayDistance, waterLayer, QueryTriggerInteraction.Collide))
{
var directionToMouse = (hit.point - transform.position).normalized;
directionToMouse.y = 0f;
var lookRotation = Quaternion.LookRotation(directionToMouse);
var cannonRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
if (directionIndicator)
{
directionIndicator.transform.rotation = cannonRotationDirection;
}
transform.rotation = cannonRotationDirection;
}
if (!isCharging) return;
if (chargingGauge < 1f)
{
if (gaugeChargingTime == 0f)
{
gaugeChargingTime = 1f;
}
chargingGauge += 1 / gaugeChargingTime * Time.deltaTime;
chargingGauge = Mathf.Clamp(chargingGauge, 0f, 1f);
}
else
{
chargingGauge = 1f;
}
launchProcessBar.SetFillAmount(chargingGauge);
CalculateLaunchTrajectory();
}
private void CalculateLaunchTrajectory()
public void CalculateLaunchTrajectory(Vector3 endPosition, bool isPredict = false)
{
var startPosition = launchTransform.position;
var endPosition = CalculateEndPosition();
var d = Vector3.Distance(new Vector3(endPosition.x, 0, endPosition.z), new Vector3(startPosition.x, 0, startPosition.z));
var h = endPosition.y - startPosition.y;
@ -350,7 +169,7 @@ namespace BlueWaterProject
var g = Physics.gravity.magnitude;
var v0 = Mathf.Sqrt((g * d * d) / (2 * Mathf.Cos(theta) * Mathf.Cos(theta) * (d * Mathf.Tan(theta) - h)));
launchVelocity = CalculateVelocityFromAngleAndSpeed(startPosition, theta, v0);
launchVelocity = CalculateVelocityFromAngleAndSpeed(theta, v0);
break;
case LaunchType.FIXED_SPEED:
var targetDirection = (endPosition - startPosition).normalized;
@ -370,7 +189,10 @@ namespace BlueWaterProject
throw new ArgumentOutOfRangeException();
}
PredictLine(startPosition);
if (isPredict)
{
PredictLine(startPosition);
}
}
private float CalculateAngleForFixedSpeed(float x, float y, float speed)
@ -393,7 +215,7 @@ namespace BlueWaterProject
return selectedAngle;
}
private Vector3 CalculateEndPosition()
public Vector3 CalculateEndPosition(float chargingGauge)
{
var direction = transform.forward;
direction.y = 0f;
@ -409,7 +231,7 @@ namespace BlueWaterProject
return startPosition;
}
private Vector3 CalculateVelocityFromAngleAndSpeed(Vector3 startPosition, float angleRad, float speed)
private Vector3 CalculateVelocityFromAngleAndSpeed(float angleRad, float speed)
{
var direction = launchTransform.forward;
direction.y = 0;
@ -437,7 +259,7 @@ namespace BlueWaterProject
predictPosition = nextPosition;
UpdateLineRender(lineMaxPoint, (i, predictPosition));
if (Physics.Raycast(predictPosition - currentVelocity.normalized * lineInterval, currentVelocity.normalized, out var hit, cannonRadius * 2, hitLayer, QueryTriggerInteraction.Collide))
if (Physics.Raycast(predictPosition - currentVelocity.normalized * lineInterval, currentVelocity.normalized, out var hit, CannonRadius * 2, hitLayer, QueryTriggerInteraction.Collide))
{
UpdateLineRender(i + 1, (i, predictPosition));
@ -459,68 +281,60 @@ namespace BlueWaterProject
currentVelocity *= Mathf.Clamp01(1f - drag * increment);
return currentVelocity;
}
private void UpdateLineRender(int count, (int point, Vector3 pos) pointPos)
{
predictedLine.positionCount = count;
predictedLine.SetPosition(pointPos.point, pointPos.pos);
}
private IEnumerator LaunchCoolDown(float waitTime)
public void Launch()
{
var time = 0f;
launchProcessBar.SetSliderValue(0f);
launchProcessBar.SetActiveReloadSlider(true);
while (time <= waitTime)
{
time += Time.deltaTime;
var sliderValue = time > 0 ? time / waitTime : 0f;
launchProcessBar.SetSliderValue(sliderValue);
yield return null;
}
isReloading = false;
launchProcessBar.SetActiveReloadSlider(false);
}
private void Launch()
{
VisualFeedbackManager.Inst.CameraShake(CameraManager.Inst.OceanCamera.BaseShipCam, cameraShakePower, cameraShakeDuration);
var projectile = Instantiate(projectileObject, launchTransform.position, Quaternion.identity);
var particleWeapon = projectile.GetComponent<ParticleWeapon>();
particleWeapon.SetHitMarker(newHitMarker);
particleWeapon.onHitAction.AddListener(HitAction);
particleWeapon.onHitAction.AddListener((hit, _, marker) => onHitAction?.Invoke(hit, damage, marker));
particleWeapon.Rb.AddForce(launchVelocity, ForceMode.VelocityChange);
isReloading = true;
IsReloading = true;
}
private void HitAction(RaycastHit hit, float power, GameObject marker = null)
public void LaunchAtTarget(Collider target)
{
if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water"))
{
var maxSize = Physics.OverlapSphereNonAlloc(hit.point, cannonRadius, hitColliders, boidsLayer,
QueryTriggerInteraction.Collide);
CalculateLaunchTrajectory(target.bounds.center, true);
StartChargeCannon();
Launch();
StartCoroutine(Utils.CoolDown(LaunchCooldown, () => IsReloading = false));
}
for (var i = 0; i < maxSize; i++)
{
var hitBoids = hitColliders[i].GetComponentInParent<Boids>();
var catchSize = Random.Range((int)randomCatch.x, (int)randomCatch.y + 1);
hitBoids.CatchBoid(hitColliders[i], catchSize);
}
}
else
public void ExitLaunchMode()
{
SetActivePredictLine(false);
if (newHitMarker)
{
hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
}
if (marker)
{
Destroy(marker);
Destroy(newHitMarker);
}
}
public void StartChargeCannon()
{
SetActivePredictLine(true);
if (hitMarker)
{
newHitMarker = Instantiate(hitMarker, Vector3.zero, hitMarker.transform.rotation, instantiateObjects);
newHitMarker.transform.localScale *= CannonRadius * 2f;
hitMarker.SetActive(true);
}
}
public void SetActivePredictLine(bool value)
{
if (isUsingPredictLine)
{
predictedLine.gameObject.SetActive(value);
}
}
#endregion
}
}
}

265
BlueWater/Assets/02.Scripts/Player/CannonController.cs Normal file
View File

@ -0,0 +1,265 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.InputSystem;
using Random = UnityEngine.Random;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
{
public class CannonController : MonoBehaviour
{
/***********************************************************************
* Variables
***********************************************************************/
#region Variables
// 컴포넌트
[TitleGroup("컴포넌트"), BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private Cannon cannon;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[Required, SerializeField] private PlayerInput playerInput;
[BoxGroup("컴포넌트/컴포넌트", ShowLabel = false)]
[SerializeField] private ProcessBar launchProcessBar;
// 대포 기본 설정
[TitleGroup("대포 기본 설정")]
// 게이지
[BoxGroup("대포 기본 설정/게이지")]
[Range(0.1f, 5f), Tooltip("게이지가 모두 차는데 걸리는 시간\n게이지는 0 ~ 1의 값을 가짐")]
[SerializeField] private float gaugeChargingTime = 1f;
// 기타
[BoxGroup("대포 기본 설정/기타")]
[Tooltip("랜덤으로 잡힐 물고기 마릿수 x, y를 포함하는 사이의 값")]
[SerializeField] private Vector2 randomCatch = new(1, 4);
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private float mouseRayDistance = 500f;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private LayerMask waterLayer;
[BoxGroup("대포 기본 설정/기타")]
[SerializeField] private LayerMask boidsLayer;
// 카메라 효과 옵션
[TitleGroup("카메라"), BoxGroup("카메라/카메라 흔들림 효과", ShowLabel = false)]
[SerializeField] private float cameraShakePower = 2f;
[BoxGroup("카메라/카메라 흔들림 효과", ShowLabel = false)]
[SerializeField] private float cameraShakeDuration = 0.3f;
// 실시간 상태
[TitleGroup("실시간 상태")]
[DisableIf("@true")]
[SerializeField] private bool isLaunchMode;
[DisableIf("@true")]
[SerializeField] private bool isCharging;
[DisableIf("@true")]
[SerializeField] private float chargingGauge;
[DisableIf("@true")]
[SerializeField] private float previousGauge;
private Collider[] hitColliders;
private const int MAX_HIT_SIZE = 8;
#endregion
/***********************************************************************
* Unity Events
***********************************************************************/
#region Unity Events
private void Start()
{
launchProcessBar = UiManager.Inst.OceanUi.ProcessBar;
hitColliders = new Collider[MAX_HIT_SIZE];
}
private void OnEnable()
{
playerInput.actions.FindAction("ToggleLaunchMode").started += _ => ToggleLaunchMode();
playerInput.actions.FindAction("LaunchCannon").started += _ => ChargeCannon();
playerInput.actions.FindAction("LaunchCannon").canceled += _ => LaunchCannon();
}
private void OnDisable()
{
playerInput.actions.FindAction("ToggleLaunchMode").started -= _ => ToggleLaunchMode();
playerInput.actions.FindAction("LaunchCannon").started -= _ => ChargeCannon();
playerInput.actions.FindAction("LaunchCannon").canceled -= _ => LaunchCannon();
}
private void Update()
{
HandleLaunchCannon();
}
#endregion
/***********************************************************************
* Init Methods
***********************************************************************/
#region Init Methods
[Button("셋팅 초기화")]
private void Init()
{
cannon = GetComponent<Cannon>();
playerInput = GetComponentInParent<PlayerInput>();
}
#endregion
/***********************************************************************
* PlayerInput
***********************************************************************/
#region PlayerInput
private void ToggleLaunchMode()
{
isLaunchMode = !isLaunchMode;
launchProcessBar.SetActive(isLaunchMode);
if (!isLaunchMode)
{
isCharging = false;
chargingGauge = 0f;
previousGauge = chargingGauge;
launchProcessBar.SetFillAmount(0f);
launchProcessBar.SetRotateZ(previousGauge * -360f);
launchProcessBar.SetRotateZ(0f);
launchProcessBar.SetSliderValue(0f);
cannon.ExitLaunchMode();
}
}
private void ChargeCannon()
{
if (!isLaunchMode) return;
if (cannon.IsReloading)
{
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine());
}
else
{
isCharging = true;
chargingGauge = 0f;
cannon.StartChargeCannon();
}
}
private void LaunchCannon()
{
if (!isLaunchMode || !isCharging) return;
isCharging = false;
previousGauge = chargingGauge;
chargingGauge = 0f;
launchProcessBar.SetFillAmount(0f);
launchProcessBar.SetRotateZ(previousGauge * -360f);
cannon.SetActivePredictLine(false);
cannon.Launch();
StartCoroutine(LaunchCoolDown(cannon.LaunchCooldown));
VisualFeedbackManager.Inst.CameraShake(CameraManager.Inst.OceanCamera.BaseShipCam, cameraShakePower, cameraShakeDuration);
}
#endregion
/***********************************************************************
* Methods
***********************************************************************/
#region Methods
private void HandleLaunchCannon()
{
if (!isLaunchMode) return;
var ray = CameraManager.Inst.MainCam.ScreenPointToRay(Input.mousePosition);
if (Physics.Raycast(ray, out var hit, mouseRayDistance, waterLayer, QueryTriggerInteraction.Collide))
{
var directionToMouse = (hit.point - transform.position).normalized;
directionToMouse.y = 0f;
var lookRotation = Quaternion.LookRotation(directionToMouse);
var cannonRotationDirection = Quaternion.Euler(0f, lookRotation.eulerAngles.y, 0f);
transform.rotation = cannonRotationDirection;
}
if (!isCharging) return;
if (chargingGauge < 1f)
{
if (gaugeChargingTime == 0f)
{
gaugeChargingTime = 1f;
}
chargingGauge += 1 / gaugeChargingTime * Time.deltaTime;
chargingGauge = Mathf.Clamp(chargingGauge, 0f, 1f);
}
else
{
chargingGauge = 1f;
}
launchProcessBar.SetFillAmount(chargingGauge);
cannon.CalculateLaunchTrajectory(cannon.CalculateEndPosition(chargingGauge), true);
}
private IEnumerator LaunchCoolDown(float waitTime)
{
var time = 0f;
launchProcessBar.SetSliderValue(0f);
launchProcessBar.SetActiveReloadSlider(true);
while (time <= waitTime)
{
time += Time.deltaTime;
var sliderValue = time > 0 ? time / waitTime : 0f;
launchProcessBar.SetSliderValue(sliderValue);
yield return null;
}
cannon.IsReloading = false;
launchProcessBar.SetActiveReloadSlider(false);
}
public void HitAction(RaycastHit hit, float power, GameObject marker = null)
{
if (hit.collider.gameObject.layer == LayerMask.NameToLayer("Water"))
{
var maxSize = Physics.OverlapSphereNonAlloc(hit.point, cannon.CannonRadius, hitColliders, boidsLayer,
QueryTriggerInteraction.Collide);
for (var i = 0; i < maxSize; i++)
{
var hitBoids = hitColliders[i].GetComponentInParent<Boids>();
var catchSize = Random.Range((int)randomCatch.x, (int)randomCatch.y + 1);
hitBoids.CatchBoid(hitColliders[i], catchSize);
}
}
else
{
hit.transform.GetComponent<IDamageable>()?.TakeDamage(power);
}
if (marker)
{
Destroy(marker);
}
}
#endregion
}
}

11
BlueWater/Assets/02.Scripts/Player/CannonController.cs.meta Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 18cbbf3c14017be4d990dd008561a7ea
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

39
BlueWater/Assets/02.Scripts/TestMove.cs Normal file
View File

@ -0,0 +1,39 @@
using System;
using UnityEngine;
using UnityEngine.AI;
public class TestMove : MonoBehaviour
{
public NavMeshAgent agent;
public Animator animator;
private void Awake()
{
agent = GetComponent<NavMeshAgent>();
animator = transform.GetChild(0).GetComponent<Animator>();
}
private void Update()
{
if (agent.velocity != Vector3.zero)
{
animator.SetFloat("RunState", 0.5f);
}
else
{
animator.SetFloat("RunState", 0f);
}
var localScale = animator.transform.localScale;
if (agent.velocity.x >= 0)
{
localScale.x = -Mathf.Abs(localScale.x);
}
else
{
localScale.x = Mathf.Abs(localScale.x);
}
animator.transform.localScale = localScale;
}
}

2
BlueWater/Assets/02.Scripts/TestMove.cs.meta Normal file
View File

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

6
BlueWater/Assets/02.Scripts/Tycoon/KitchenController.cs
View File

@ -14,8 +14,10 @@ namespace BlueWaterProject
private bool isCooking;
public Image cookingProcess;
public GameObject sotUp;
private Vector3 sotUpOriginal = new Vector3(4.17999983f, 8.80000019f, 16.5300007f);
private Vector3 sotUpClose = new Vector3(4.17999983f, 7.05000019f, 14.7799997f);
// private Vector3 sotUpOriginal = new Vector3(4.17999983f, 8.80000019f, 16.5300007f);
// private Vector3 sotUpClose = new Vector3(4.17999983f, 7.05000019f, 14.7799997f);
private Vector3 sotUpOriginal = new Vector3(4.92f, 9.384f, 22.72f);
private Vector3 sotUpClose = new Vector3(4.92f, 7.634f, 20.97f);
public GameObject[] sotSteamEff;
private Dictionary<GlobalValue.FoodOnHand, int> ingredientsInPot = new();
private Dictionary<GlobalValue.FoodOnHand, int> kingCrabRecipe = new()

2
BlueWater/Assets/02.Scripts/WayPoint.cs → BlueWater/Assets/02.Scripts/WayPointInfo.cs
View File

@ -5,7 +5,7 @@ using UnityEngine;
namespace BlueWaterProject
{
[Serializable]
public class WayPoint
public class WayPointInfo
{
[field: SerializeField] public Vector3 Point { get; set; }
[field: SerializeField] public float WaitTime { get; private set; }

0
BlueWater/Assets/02.Scripts/WayPoint.cs.meta → BlueWater/Assets/02.Scripts/WayPointInfo.cs.meta
View File

14
BlueWater/Assets/03.Images/SpineTest/NPC/clean.meta Normal file
View File

@ -0,0 +1,14 @@
fileFormatVersion: 2
<<<<<<<< HEAD:BlueWater/Assets/New Terrain.asset.meta
guid: 5e78ff65d842eed45bf77d23ca78cd13
NativeFormatImporter:
========
guid: 14c71f1c3921e024bbc929757a2cdad4
folderAsset: yes
DefaultImporter:
>>>>>>>> 8dbc1078d (씬 99타이쿤 추가작업(애니메이션)):BlueWater/Assets/03.Images/SpineTest/NPC/clean.meta
externalObjects: {}
mainObjectFileID: 15600000
userData:
assetBundleName:
assetBundleVariant:

46
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.atlas.txt Normal file
View File

@ -0,0 +1,46 @@
02_character.png
size:1958,1366
filter:Linear,Linear
Arm_L
bounds:429,662,427,479
rotate:90
Arm_R
bounds:910,662,427,478
rotate:90
Body
bounds:709,2,573,832
rotate:90
Body_back
bounds:1390,577,566,427
Body_up
bounds:2,1255,109,285
rotate:90
Eye
bounds:2,174,705,486
L
bounds:2,716,374,425
rotate:90
Leg_L
bounds:289,1092,272,558
rotate:90
Leg_R
bounds:849,1091,273,558
rotate:90
R
bounds:1409,1006,358,371
rotate:90
02_character_2.png
size:1340,1272
filter:Linear,Linear
Back_hair
bounds:2,2,1336,1268
02_character_3.png
size:2007,1019
filter:Linear,Linear
Face
bounds:1126,114,903,879
rotate:90
Hair
bounds:2,2,1122,1015

7
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.atlas.txt.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 337672b8637f6e449bca70f0ca66ebbc
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 414 KiB

114
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 7bdc94d8169c3784f99e20ff284112db
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.skel.bytes Normal file
View File

Binary file not shown.

7
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.skel.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 3734f6a774f815d4f8d55bf6ac4ad308
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

46
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character.mat Normal file
View File

@ -0,0 +1,46 @@
%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: 02_character_02_character
m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7bdc94d8169c3784f99e20ff284112db, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _DoubleSidedLighting: 0
- _LightAffectsAdditive: 0
- _ReceiveShadows: 0
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _TintBlack: 0
- _ZWrite: 0
m_Colors:
- _Black: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character.mat.meta Normal file
View File

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

46
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character_2.mat Normal file
View File

@ -0,0 +1,46 @@
%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: 02_character_02_character_2
m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 17a547c98117e674f9e4ff4be12401dc, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _DoubleSidedLighting: 0
- _LightAffectsAdditive: 0
- _ReceiveShadows: 0
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _TintBlack: 0
- _ZWrite: 0
m_Colors:
- _Black: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character_2.mat.meta Normal file
View File

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

46
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character_3.mat Normal file
View File

@ -0,0 +1,46 @@
%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: 02_character_02_character_3
m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: d00dea284945bfe4fb7f1d2ce8067463, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _DoubleSidedLighting: 0
- _LightAffectsAdditive: 0
- _ReceiveShadows: 0
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _TintBlack: 0
- _ZWrite: 0
m_Colors:
- _Black: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_02_character_3.mat.meta Normal file
View File

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

BIN
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_2.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 101 KiB

114
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_2.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 17a547c98117e674f9e4ff4be12401dc
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_3.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 280 KiB

114
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_3.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: d00dea284945bfe4fb7f1d2ce8067463
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

21
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_Atlas.asset Normal file
View File

@ -0,0 +1,21 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: a6b194f808b1af6499c93410e504af42, type: 3}
m_Name: 02_character_Atlas
m_EditorClassIdentifier:
textureLoadingMode: 0
onDemandTextureLoader: {fileID: 0}
atlasFile: {fileID: 4900000, guid: 337672b8637f6e449bca70f0ca66ebbc, type: 3}
materials:
- {fileID: 2100000, guid: a2b5c14eb3faeda42bd66621cda61534, type: 2}
- {fileID: 2100000, guid: 518159fecabaa4e41b2e1d35e795a325, type: 2}
- {fileID: 2100000, guid: b6b3b4d5d43470947aca8dae7b5aa1ff, type: 2}

8
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_Atlas.asset.meta Normal file
View File

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

31
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_SkeletonData.asset Normal file
View File

@ -0,0 +1,31 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: f1b3b4b945939a54ea0b23d3396115fb, type: 3}
m_Name: 02_character_SkeletonData
m_EditorClassIdentifier:
atlasAssets:
- {fileID: 11400000, guid: a503d2b30b26ec143892d6e15c968375, type: 2}
scale: 0.01
skeletonJSON: {fileID: 4900000, guid: 3734f6a774f815d4f8d55bf6ac4ad308, type: 3}
isUpgradingBlendModeMaterials: 0
blendModeMaterials:
requiresBlendModeMaterials: 0
applyAdditiveMaterial: 1
additiveMaterials: []
multiplyMaterials: []
screenMaterials: []
skeletonDataModifiers: []
fromAnimation: []
toAnimation: []
duration: []
defaultMix: 0.2
controller: {fileID: 0}

8
BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character_SkeletonData.asset.meta Normal file
View File

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

BIN
BlueWater/Assets/03.Images/Tycoon/Cleaningbroom.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 299 KiB

114
BlueWater/Assets/03.Images/Tycoon/Cleaningbroom.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 1e45b3d1984641044b43b9b4b351eb58
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/03.Images/Tycoon/Foods/ChimeraStew_success.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.3 MiB

114
BlueWater/Assets/03.Images/Tycoon/Foods/ChimeraStew_success.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 6a2353075f1914d44b0290ca256c8224
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

137
BlueWater/Assets/03.Images/Tycoon/Foods/Materials/ChimeraStew_success.mat Normal file
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: ChimeraStew_success
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: 6a2353075f1914d44b0290ca256c8224, 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: 6a2353075f1914d44b0290ca256c8224, 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 &6000024782925739656
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

8
BlueWater/Assets/03.Images/Tycoon/Foods/Materials/ChimeraStew_success.mat.meta Normal file
View File

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

137
BlueWater/Assets/03.Images/Tycoon/Foods/Materials/potato+OnionStew_success_spicy.mat Normal file
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: potato+OnionStew_success_spicy
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: 2f7ce0647405a3145998f289184ba9c1, 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: 2f7ce0647405a3145998f289184ba9c1, 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 &796927296236085201
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

8
BlueWater/Assets/03.Images/Tycoon/Foods/Materials/potato+OnionStew_success_spicy.mat.meta Normal file
View File

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

BIN
BlueWater/Assets/03.Images/Tycoon/Foods/potato+OnionStew_success_spicy.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 MiB

114
BlueWater/Assets/03.Images/Tycoon/Foods/potato+OnionStew_success_spicy.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 2f7ce0647405a3145998f289184ba9c1
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

137
BlueWater/Assets/03.Images/Tycoon/Materials/Cleaningbroom.mat Normal file
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: Cleaningbroom
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: 1e45b3d1984641044b43b9b4b351eb58, 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: 1e45b3d1984641044b43b9b4b351eb58, 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 &5500507067013584430
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

8
BlueWater/Assets/03.Images/Tycoon/Materials/Cleaningbroom.mat.meta Normal file
View File

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

137
BlueWater/Assets/03.Images/Tycoon/Materials/ship_obj_to01_512.mat Normal file
View File

@ -0,0 +1,137 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6652142001060863116
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: ship_obj_to01_512
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: 0c6b128cce9cead4bacb136d7d6865d0, 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: 0c6b128cce9cead4bacb136d7d6865d0, 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

8
BlueWater/Assets/03.Images/Tycoon/Materials/ship_obj_to01_512.mat.meta Normal file
View File

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

BIN
BlueWater/Assets/03.Images/Tycoon/ship_obj_to01_512.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 84 KiB

114
BlueWater/Assets/03.Images/Tycoon/ship_obj_to01_512.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 0c6b128cce9cead4bacb136d7d6865d0
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
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: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

2
BlueWater/Assets/03.Materials/Tycoon/OceanWater.mat
View File

@ -146,7 +146,7 @@ Material:
- _CausticsOn: 0
- _CausticsSpeed: 0.1
- _CausticsTiling: 0.5
- _ColorAbsorption: 0.01
- _ColorAbsorption: 0.03
- _CrossPan_IntersectionOn: 0
- _Cull: 0
- _Cutoff: 0.5

139
BlueWater/Assets/05.Prefabs/Boids/VisualSmallFishBoids.prefab Normal file
View File

@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2066924941115021418
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.y
value: -10
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1800824703194841433, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: m_Name
value: VisualSmallFishBoids
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: fishSpot
value:
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidCount
value: 100
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: boidPrefab
value:
objectReference: {fileID: 5402562142639805275, guid: c6911733874ec6645aa30548164bb1fb,
type: 3}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: showWaterEffect
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <CohesionWeight>k__BackingField
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 5146900491857106217, guid: f228040d76c9217409284544f353da47,
type: 3}
propertyPath: <RandomSpeedRange>k__BackingField.y
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 2873048866372186192, guid: f228040d76c9217409284544f353da47, type: 3}
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
insertIndex: -1
addedObject: {fileID: 7313990944056702472}
m_SourcePrefab: {fileID: 100100000, guid: f228040d76c9217409284544f353da47, type: 3}
--- !u!1 &2569349039409732607 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4541625270423798677, guid: f228040d76c9217409284544f353da47,
type: 3}
m_PrefabInstance: {fileID: 2066924941115021418}
m_PrefabAsset: {fileID: 0}
--- !u!95 &7313990944056702472
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2569349039409732607}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 1
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0

7
BlueWater/Assets/05.Prefabs/Boids/VisualSmallFishBoids.prefab.meta Normal file
View File

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

11540
BlueWater/Assets/05.Prefabs/Characters/Enemies/PirateShip.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/Characters/Enemies/PirateShip.prefab.meta Normal file
View File

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

71
BlueWater/Assets/05.Prefabs/Characters/Players/ShipPlayer.prefab
View File

@ -5471,7 +5471,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8780450860930567142
Transform:
@ -10610,12 +10610,13 @@ GameObject:
m_Component:
- component: {fileID: 7773911348870221902}
- component: {fileID: 5050991741956807937}
- component: {fileID: 3589425228496357775}
m_Layer: 0
m_Name: Cannon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7773911348870221902
Transform:
@ -10647,14 +10648,56 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 3e8c36fe9172849798f9c4fd87b77ec7, type: 3}
m_Name:
m_EditorClassIdentifier:
playerInput: {fileID: 8801751669966394771}
projectileObject: {fileID: 128572, guid: 8d387b0f65dfa4cdc965c4b56216e120, type: 3}
visualLook: {fileID: 8780450860930567142}
launchTransform: {fileID: 8113728070962989305}
predictedLine: {fileID: 5794552822649783368}
hitMarker: {fileID: 5951017876843886146, guid: 0eef5d11a5bdac248b2d16d733fd357c,
type: 3}
directionIndicator: {fileID: 0}
instantiateObjects: {fileID: 0}
<LaunchCooldown>k__BackingField: 1
damage: 20
distanceCoefficient: 50
launchType: 1
launchSpeed: 40
launchAngle: 20
isUsingPredictLine: 1
lineMaxPoint: 200
lineInterval: 0.025
rayDistance: 100
hitLayer:
serializedVersion: 2
m_Bits: 2105368
<IsReloading>k__BackingField: 0
onHitAction:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 3589425228496357775}
m_TargetAssemblyTypeName: BlueWaterProject.CannonController, Assembly-CSharp
m_MethodName: HitAction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &3589425228496357775
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4610911148032566083}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 18cbbf3c14017be4d990dd008561a7ea, type: 3}
m_Name:
m_EditorClassIdentifier:
cannon: {fileID: 5050991741956807937}
playerInput: {fileID: 8801751669966394771}
launchProcessBar:
<Obj>k__BackingField: {fileID: 0}
<Fill>k__BackingField: {fileID: 0}
@ -10662,22 +10705,9 @@ MonoBehaviour:
<ReloadSlider>k__BackingField: {fileID: 0}
<ShakeDuration>k__BackingField: 0
<ShakePower>k__BackingField: 0
instantiateObjects: {fileID: 0}
gaugeChargingTime: 1
launchCooldown: 1
distanceCoefficient: 40
launchType: 1
launchSpeed: 40
launchAngle: 10
isUsingPredictLine: 1
lineMaxPoint: 200
lineInterval: 0.025
randomCatch: {x: 1, y: 3}
randomCatch: {x: 1, y: 4}
mouseRayDistance: 500
rayDistance: 100
hitLayer:
serializedVersion: 2
m_Bits: 2105368
waterLayer:
serializedVersion: 2
m_Bits: 16
@ -10688,7 +10718,6 @@ MonoBehaviour:
cameraShakeDuration: 0.3
isLaunchMode: 0
isCharging: 0
isReloading: 0
chargingGauge: 0
previousGauge: 0
--- !u!1 &5908813642164490040
@ -11400,6 +11429,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
playerInput: {fileID: 8801751669966394771}
rb: {fileID: 2658728570364772279}
rayfireRigids: []
maxSpeed: 20
acceleration: 20
deceleration: 10
@ -11410,9 +11440,6 @@ MonoBehaviour:
<MaxHp>k__BackingField: 100
<CurrentHp>k__BackingField: 100
<Strength>k__BackingField: 500
waterLayer:
serializedVersion: 2
m_Bits: 16
groundLayer:
serializedVersion: 2
m_Bits: 8

3
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for URP.unitypackage.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon.meta
View File

@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: 3643c0d76ec153646b1203880bfb64ed
guid: 28902a18b5f06654abac02f8f9a53abf
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeExplosionFire.prefab → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeExplosionFire.prefab
View File

7
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeExplosionFire.prefab.meta Normal file
View File

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

14409
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeMissileFire.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeMissileFire.prefab.meta Normal file
View File

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

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeMuzzleFire.prefab → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeMuzzleFire.prefab
View File

7
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/GrenadeMuzzleFire.prefab.meta Normal file
View File

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

14851
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/PirateGrenadeFireOBJ.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PirateCannon/PirateGrenadeFireOBJ.prefab.meta Normal file
View File

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

3
BlueWater/Assets/Distant Lands/Cozy Weather/Custom Render Pipelines/Import for Buto Integration.unitypackage.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon.meta
View File

@ -1,5 +1,6 @@
fileFormatVersion: 2
guid: f5789d13135b86645a366dac6583d1cd
guid: d32a0931a497e444884aefe13d37eadd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:

24242
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeExplosionFire.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeExplosionFire.prefab.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeExplosionFire.prefab.meta
View File

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeMissileFire.prefab → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeMissileFire.prefab
View File

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeMissileFire.prefab.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeMissileFire.prefab.meta
View File

19318
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeMuzzleFire.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeMuzzleFire.prefab.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/GrenadeMuzzleFire.prefab.meta
View File

4
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/PlayerGrenadeFireOBJ.prefab
View File

@ -13,7 +13,7 @@ GameObject:
- component: {fileID: 5479992}
- component: {fileID: 7590616447448401593}
m_Layer: 25
m_Name: GrenadeFireOBJ
m_Name: PlayerGrenadeFireOBJ
m_TagString: Missile
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -104,7 +104,7 @@ MonoBehaviour:
- impactParticle: {fileID: 180702, guid: c77dffb15f639694ea8f1002f0c966cf, type: 3}
layer:
serializedVersion: 2
m_Bits: 2105864
m_Bits: 2105352
projectileParticle: {fileID: 1258406917094090, guid: ee54236328d3fd94a89d479e38f9f112,
type: 3}
muzzleParticle: {fileID: 1509306094841910, guid: 7026fe0f1c7efa648b9b3c4662359062,

0
BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/GrenadeFireOBJ.prefab.meta → BlueWater/Assets/05.Prefabs/Particles/GrenadeFire/PlayerCannon/PlayerGrenadeFireOBJ.prefab.meta
View File

BIN
BlueWater/Assets/05.Prefabs/Terrains/FallTerrain01.asset
View File

Binary file not shown.

22
BlueWater/Assets/05.Prefabs/Terrains/OceanTerrainPalette.asset Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: c509dbaa7b6f416409e3195321a2187e, type: 3}
m_Name: OceanTerrainPalette
m_EditorClassIdentifier:
PaletteLayers:
- {fileID: 8574412962073106934, guid: fb10c5ba31482e44c97ef49a902d5170, type: 2}
- {fileID: 8574412962073106934, guid: ba9d148503605aa488995df4b6cd4b2c, type: 2}
- {fileID: 8574412962073106934, guid: 4e22988483dec4149974aaebc4f4c362, type: 2}
- {fileID: 8574412962073106934, guid: e10e46033aca09a4b8f983fde1c28361, type: 2}
- {fileID: 8574412962073106934, guid: 0a91496b0c3de2e49a580f98003c6146, type: 2}
- {fileID: 8574412962073106934, guid: 1349924bb24b512499d766944910b6b8, type: 2}
- {fileID: 8574412962073106934, guid: d19b180459ae08a4eb78845b24b8f973, type: 2}

13
BlueWater/Assets/05.Prefabs/Terrains/OceanTerrainPalette.asset.meta Normal file
View File

@ -0,0 +1,13 @@
fileFormatVersion: 2
<<<<<<<< HEAD:BlueWater/Assets/05.Prefabs/Terrains/OceanTerrainPalette.asset.meta
guid: 7a3d519fa6f34364bb88cb5c8e1d3688
NativeFormatImporter:
========
guid: 945b3e5c0f2ded2499020ffe9c9e1af4
TextScriptImporter:
>>>>>>>> 8dbc1078d (씬 99타이쿤 추가작업(애니메이션)):BlueWater/Assets/03.Images/SpineTest/NPC/clean/02_character.skel.bytes.meta
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/05.Prefabs/Terrains/SnowTerrain01.asset
View File

Binary file not shown.

8
BlueWater/Assets/07-1.Spine/Characters/03.meta Normal file
View File

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

77
BlueWater/Assets/07-1.Spine/Characters/03/02_character.atlas.txt Normal file
View File

@ -0,0 +1,77 @@
02_character.png
size:2012,1672
filter:Linear,Linear
skin02/Arm_L
bounds:1500,968,427,479
rotate:90
skin02/Arm_R
bounds:2,593,427,478
rotate:90
skin02/Body_back
bounds:482,549,566,427
skin02/Body_up
bounds:2,1561,109,285
rotate:90
skin02/Eye
bounds:2,61,705,486
skin02/L
bounds:375,1022,374,425
rotate:90
skin02/Leg_L
bounds:289,1398,272,558
rotate:90
skin02/Leg_R
bounds:1409,1397,273,558
rotate:90
skin02/R
bounds:2,1038,358,371
rotate:90
skin03/Arm_L
bounds:1050,539,427,479
rotate:90
skin03/Arm_R
bounds:1531,539,427,479
rotate:90
skin03/Eye
bounds:802,978,696,417
skin03/Leg_L
bounds:849,1398,272,558
rotate:90
skin03/Leg_R
bounds:849,1398,272,558
rotate:90
skin03/R
bounds:709,2,535,856
rotate:90
02_character_2.png
size:1794,1392
filter:Linear,Linear
skin02/Body
bounds:2,817,573,832
rotate:90
skin03/Body
bounds:2,209,606,660
rotate:90
skin03/Hair
bounds:664,2,1128,811
skin03/L
bounds:836,815,575,836
rotate:90
02_character_3.png
size:1340,1272
filter:Linear,Linear
skin02/Back_hair
bounds:2,2,1336,1268
02_character_4.png
size:2001,1764
filter:Linear,Linear
skin02/Face
bounds:1019,2,903,879
skin02/Hair
bounds:2,640,1122,1015
rotate:90
skin03/Face
bounds:1019,883,980,879

7
BlueWater/Assets/07-1.Spine/Characters/03/02_character.atlas.txt.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1a52451db6628924586cd23dff81aa5d
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/07-1.Spine/Characters/03/02_character.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 614 KiB

114
BlueWater/Assets/07-1.Spine/Characters/03/02_character.png.meta Normal file
View File

@ -0,0 +1,114 @@
fileFormatVersion: 2
guid: 71d2a339d893ecc4fbf3d440658afa0c
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
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: 1
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: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 0
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 1
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
BlueWater/Assets/07-1.Spine/Characters/03/02_character.skel.bytes Normal file
View File

Binary file not shown.

7
BlueWater/Assets/07-1.Spine/Characters/03/02_character.skel.bytes.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: dfaf4ed5124f2cd45acb8b9c149b8fbb
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

46
BlueWater/Assets/07-1.Spine/Characters/03/02_character_02_character.mat Normal file
View File

@ -0,0 +1,46 @@
%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: 02_character_02_character
m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 71d2a339d893ecc4fbf3d440658afa0c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _DoubleSidedLighting: 0
- _LightAffectsAdditive: 0
- _ReceiveShadows: 0
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _TintBlack: 0
- _ZWrite: 0
m_Colors:
- _Black: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
BlueWater/Assets/07-1.Spine/Characters/03/02_character_02_character.mat.meta Normal file
View File

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

46
BlueWater/Assets/07-1.Spine/Characters/03/02_character_02_character_2.mat Normal file
View File

@ -0,0 +1,46 @@
%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: 02_character_02_character_2
m_Shader: {fileID: 4800000, guid: b77e51f117177954ea863bdb422344fb, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords:
- _STRAIGHT_ALPHA_INPUT
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _MainTex:
m_Texture: {fileID: 2800000, guid: 11127c5a4fbcc2c4f98bb3ffae6111c0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Cutoff: 0.1
- _DoubleSidedLighting: 0
- _LightAffectsAdditive: 0
- _ReceiveShadows: 0
- _StencilComp: 8
- _StencilRef: 1
- _StraightAlphaInput: 1
- _TintBlack: 0
- _ZWrite: 0
m_Colors:
- _Black: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

8
BlueWater/Assets/07-1.Spine/Characters/03/02_character_02_character_2.mat.meta Normal file
View File

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

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