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

#37 Npc Conversation, order action

Browse Source
This commit is contained in:
IDMhan 2023-10-23 12:12:13 +09:00
parent 153e78dfd1
commit e0cda7cd42
35 changed files with 273289 additions and 10513 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9896
BlueWater/Assets/01.Scenes/02.Main.unity
View File

File diff suppressed because it is too large Load Diff

2
BlueWater/Assets/02.Scripts/AssaultMode/DraggableCard.cs
View File

@ -95,7 +95,7 @@ namespace BlueWaterProject
if (!Physics.Raycast(ray, out hit)) return false;
if (!hit.collider.CompareTag("Ground")) return false;
Destroy(gameObject);
var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.shipPlayer.transform.position,
var obj = Instantiate(DataManager.Inst.boat, GameManager.Inst.ShipPlayer.transform.position,
Quaternion.identity);
var boat = obj.GetComponent<Boat>();

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

@ -82,7 +82,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""initialStateCheck"": false
},
{
""name"": ""InteractionE"",
""name"": ""Cancel"",
""type"": ""Button"",
""id"": ""c8a82170-8a07-4432-b22f-9ec40486ed27"",
""expectedControlType"": ""Button"",
@ -116,6 +116,15 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""CancelHold"",
""type"": ""Button"",
""id"": ""b5508379-f9b3-45f9-ba2e-c16fb67bb36a"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": ""Hold(duration=1)"",
""initialStateCheck"": false
}
],
""bindings"": [
@ -188,7 +197,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
{
""name"": """",
""id"": ""334d8c88-f0ee-43d9-b62d-a1fdbd1bc338"",
""path"": ""<Keyboard>/f"",
""path"": ""<Keyboard>/e"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -199,7 +208,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
{
""name"": """",
""id"": ""df7a5259-c313-4b14-9cca-9e1acfc0a31a"",
""path"": ""<Keyboard>/f"",
""path"": ""<Keyboard>/e"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
@ -232,11 +241,11 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
{
""name"": """",
""id"": ""f3c7c6ff-93c4-4bfe-9039-804d7c340f52"",
""path"": ""<Keyboard>/e"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""InteractionE"",
""action"": ""Cancel"",
""isComposite"": false,
""isPartOfComposite"": false
},
@ -272,6 +281,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
""action"": ""SpawnInIsladnPlayer"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""3e2f42b7-0dd3-4c8b-bdd5-9be3254465c0"",
""path"": ""<Keyboard>/f"",
""interactions"": """",
""processors"": """",
""groups"": ""Keyboard&Mouse"",
""action"": ""CancelHold"",
""isComposite"": false,
""isPartOfComposite"": false
}
]
},
@ -441,10 +461,11 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
m_Player_InteractionHold = m_Player.FindAction("InteractionHold", throwIfNotFound: true);
m_Player_Zkey = m_Player.FindAction("Zkey", throwIfNotFound: true);
m_Player_TakeAim = m_Player.FindAction("TakeAim", throwIfNotFound: true);
m_Player_InteractionE = m_Player.FindAction("InteractionE", throwIfNotFound: true);
m_Player_Cancel = m_Player.FindAction("Cancel", throwIfNotFound: true);
m_Player_Targeting = m_Player.FindAction("Targeting", throwIfNotFound: true);
m_Player_TargetingHold = m_Player.FindAction("TargetingHold", throwIfNotFound: true);
m_Player_SpawnInIsladnPlayer = m_Player.FindAction("SpawnInIsladnPlayer", throwIfNotFound: true);
m_Player_CancelHold = m_Player.FindAction("CancelHold", throwIfNotFound: true);
// Camera
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
@ -521,10 +542,11 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
private readonly InputAction m_Player_InteractionHold;
private readonly InputAction m_Player_Zkey;
private readonly InputAction m_Player_TakeAim;
private readonly InputAction m_Player_InteractionE;
private readonly InputAction m_Player_Cancel;
private readonly InputAction m_Player_Targeting;
private readonly InputAction m_Player_TargetingHold;
private readonly InputAction m_Player_SpawnInIsladnPlayer;
private readonly InputAction m_Player_CancelHold;
public struct PlayerActions
{
private @BlueWater m_Wrapper;
@ -535,10 +557,11 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
public InputAction @InteractionHold => m_Wrapper.m_Player_InteractionHold;
public InputAction @Zkey => m_Wrapper.m_Player_Zkey;
public InputAction @TakeAim => m_Wrapper.m_Player_TakeAim;
public InputAction @InteractionE => m_Wrapper.m_Player_InteractionE;
public InputAction @Cancel => m_Wrapper.m_Player_Cancel;
public InputAction @Targeting => m_Wrapper.m_Player_Targeting;
public InputAction @TargetingHold => m_Wrapper.m_Player_TargetingHold;
public InputAction @SpawnInIsladnPlayer => m_Wrapper.m_Player_SpawnInIsladnPlayer;
public InputAction @CancelHold => m_Wrapper.m_Player_CancelHold;
public InputActionMap Get() { return m_Wrapper.m_Player; }
public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); }
@ -566,9 +589,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@TakeAim.started += instance.OnTakeAim;
@TakeAim.performed += instance.OnTakeAim;
@TakeAim.canceled += instance.OnTakeAim;
@InteractionE.started += instance.OnInteractionE;
@InteractionE.performed += instance.OnInteractionE;
@InteractionE.canceled += instance.OnInteractionE;
@Cancel.started += instance.OnCancel;
@Cancel.performed += instance.OnCancel;
@Cancel.canceled += instance.OnCancel;
@Targeting.started += instance.OnTargeting;
@Targeting.performed += instance.OnTargeting;
@Targeting.canceled += instance.OnTargeting;
@ -578,6 +601,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@SpawnInIsladnPlayer.started += instance.OnSpawnInIsladnPlayer;
@SpawnInIsladnPlayer.performed += instance.OnSpawnInIsladnPlayer;
@SpawnInIsladnPlayer.canceled += instance.OnSpawnInIsladnPlayer;
@CancelHold.started += instance.OnCancelHold;
@CancelHold.performed += instance.OnCancelHold;
@CancelHold.canceled += instance.OnCancelHold;
}
private void UnregisterCallbacks(IPlayerActions instance)
@ -600,9 +626,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@TakeAim.started -= instance.OnTakeAim;
@TakeAim.performed -= instance.OnTakeAim;
@TakeAim.canceled -= instance.OnTakeAim;
@InteractionE.started -= instance.OnInteractionE;
@InteractionE.performed -= instance.OnInteractionE;
@InteractionE.canceled -= instance.OnInteractionE;
@Cancel.started -= instance.OnCancel;
@Cancel.performed -= instance.OnCancel;
@Cancel.canceled -= instance.OnCancel;
@Targeting.started -= instance.OnTargeting;
@Targeting.performed -= instance.OnTargeting;
@Targeting.canceled -= instance.OnTargeting;
@ -612,6 +638,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
@SpawnInIsladnPlayer.started -= instance.OnSpawnInIsladnPlayer;
@SpawnInIsladnPlayer.performed -= instance.OnSpawnInIsladnPlayer;
@SpawnInIsladnPlayer.canceled -= instance.OnSpawnInIsladnPlayer;
@CancelHold.started -= instance.OnCancelHold;
@CancelHold.performed -= instance.OnCancelHold;
@CancelHold.canceled -= instance.OnCancelHold;
}
public void RemoveCallbacks(IPlayerActions instance)
@ -771,10 +800,11 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
void OnInteractionHold(InputAction.CallbackContext context);
void OnZkey(InputAction.CallbackContext context);
void OnTakeAim(InputAction.CallbackContext context);
void OnInteractionE(InputAction.CallbackContext context);
void OnCancel(InputAction.CallbackContext context);
void OnTargeting(InputAction.CallbackContext context);
void OnTargetingHold(InputAction.CallbackContext context);
void OnSpawnInIsladnPlayer(InputAction.CallbackContext context);
void OnCancelHold(InputAction.CallbackContext context);
}
public interface ICameraActions
{

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

@ -60,7 +60,7 @@
"initialStateCheck": false
},
{
"name": "InteractionE",
"name": "Cancel",
"type": "Button",
"id": "c8a82170-8a07-4432-b22f-9ec40486ed27",
"expectedControlType": "Button",
@ -94,6 +94,15 @@
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "CancelHold",
"type": "Button",
"id": "b5508379-f9b3-45f9-ba2e-c16fb67bb36a",
"expectedControlType": "Button",
"processors": "",
"interactions": "Hold(duration=1)",
"initialStateCheck": false
}
],
"bindings": [
@ -166,7 +175,7 @@
{
"name": "",
"id": "334d8c88-f0ee-43d9-b62d-a1fdbd1bc338",
"path": "<Keyboard>/f",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -177,7 +186,7 @@
{
"name": "",
"id": "df7a5259-c313-4b14-9cca-9e1acfc0a31a",
"path": "<Keyboard>/f",
"path": "<Keyboard>/e",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
@ -210,11 +219,11 @@
{
"name": "",
"id": "f3c7c6ff-93c4-4bfe-9039-804d7c340f52",
"path": "<Keyboard>/e",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "InteractionE",
"action": "Cancel",
"isComposite": false,
"isPartOfComposite": false
},
@ -250,6 +259,17 @@
"action": "SpawnInIsladnPlayer",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3e2f42b7-0dd3-4c8b-bdd5-9be3254465c0",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": "Keyboard&Mouse",
"action": "CancelHold",
"isComposite": false,
"isPartOfComposite": false
}
]
},

54
BlueWater/Assets/02.Scripts/CameraController.cs
View File

@ -19,9 +19,8 @@ namespace BlueWaterProject
[Range(0,1000)]
public int rotateSpeed = 10;
private Coroutine currentCoroutine;
[Required("습격모드 카메라를 넣어주세요.")]
[field: SerializeField] public CinemachineFreeLook AssaultCam { get; set; }
[field: SerializeField] public CinemachineFreeLook InIslandCam { get; set; }
[Required("보트갑판 카메라를 넣어주세요.")]
public CinemachineVirtualCamera shipDeckCam;
@ -56,7 +55,7 @@ namespace BlueWaterProject
public void CamAssaultMode()
{
AssaultCam.Priority = 1;
InIslandCam.Priority = 1;
dredgeCam.Priority = 0;
shipDeckCam.Priority = 0;
inShipCam.Priority = 0;
@ -65,7 +64,7 @@ namespace BlueWaterProject
public void CamDredgeMode()
{
dredgeCam.Priority = 1;
AssaultCam.Priority = 0;
InIslandCam.Priority = 0;
shipDeckCam.Priority = 0;
inShipCam.Priority = 0;
}
@ -74,7 +73,7 @@ namespace BlueWaterProject
{
shipDeckCam.Priority = 1;
dredgeCam.Priority = 0;
AssaultCam.Priority = 0;
InIslandCam.Priority = 0;
inShipCam.Priority = 0;
}
@ -82,7 +81,7 @@ namespace BlueWaterProject
{
inShipCam.Priority = 1;
dredgeCam.Priority = 0;
AssaultCam.Priority = 0;
InIslandCam.Priority = 0;
shipDeckCam.Priority = 0;
}
@ -93,8 +92,8 @@ namespace BlueWaterProject
Vector3 newPosition = takeAimCam.transform.position;
newPosition.y += mouseDelta.y * sensitivity;
newPosition.y = Mathf.Clamp(newPosition.y, heightLimits.x, heightLimits.y);
newPosition.x = GameManager.Inst.shipPlayer.transform.position.x;
newPosition.z = GameManager.Inst.shipPlayer.transform.position.z;
newPosition.x = GameManager.Inst.ShipPlayer.transform.position.x;
newPosition.z = GameManager.Inst.ShipPlayer.transform.position.z;
takeAimCam.transform.position = newPosition;
@ -133,26 +132,26 @@ namespace BlueWaterProject
if (Input.GetMouseButtonDown(1))
{
//AssaultCam의 X Axis의 Speed를 변경
AssaultCam.m_XAxis.m_MaxSpeed = 150;
AssaultCam.m_XAxis.m_InputAxisName = "Mouse X";
InIslandCam.m_XAxis.m_MaxSpeed = 150;
InIslandCam.m_XAxis.m_InputAxisName = "Mouse X";
//AssaultCam의 Y Axis의 Speed를 변경
AssaultCam.m_YAxis.m_MaxSpeed = 2;
AssaultCam.m_YAxis.m_InputAxisName = "Mouse Y";
InIslandCam.m_YAxis.m_MaxSpeed = 2;
InIslandCam.m_YAxis.m_InputAxisName = "Mouse Y";
AssaultCam.m_RecenterToTargetHeading.m_enabled = false;
InIslandCam.m_RecenterToTargetHeading.m_enabled = false;
}
else if (Input.GetMouseButtonUp(1))
{
//AssaultCam의 X Axis의 Speed를 원래대로
AssaultCam.m_XAxis.m_MaxSpeed = 0;
AssaultCam.m_XAxis.m_InputAxisName = "";
InIslandCam.m_XAxis.m_MaxSpeed = 0;
InIslandCam.m_XAxis.m_InputAxisName = "";
//AssaultCam의 Y Axis의 Speed를 원래대로
AssaultCam.m_YAxis.m_MaxSpeed = 0;
AssaultCam.m_YAxis.m_InputAxisName = "";
InIslandCam.m_YAxis.m_MaxSpeed = 0;
InIslandCam.m_YAxis.m_InputAxisName = "";
AssaultCam.m_RecenterToTargetHeading.m_enabled = true;
InIslandCam.m_RecenterToTargetHeading.m_enabled = true;
}
}
@ -197,5 +196,22 @@ namespace BlueWaterProject
transposer.m_FollowOffset = targetOffset; // Lerp가 완료되면 목표 오프셋을 확실히 설정합니다.
}
}
public void ChangeInShipFollowAndLookAt(Transform target)
{
if (!GameManager.Inst.IsInShipMode) return;
inShipCam.Follow = target;
inShipCam.LookAt = target;
inShipCam.GetCinemachineComponent<CinemachineTransposer>().m_FollowOffset = new Vector3(0, 7, -10);
}
public void RestoreInShipFollowAndLookAt()
{
if (!GameManager.Inst.IsInShipMode) return;
var transform1 = GameManager.Inst.InShipPlayer.transform;
inShipCam.Follow = transform1;
inShipCam.LookAt = transform1;
inShipCam.GetCinemachineComponent<CinemachineTransposer>().m_FollowOffset = new Vector3(0, 20, -10);
}
}
}

11
BlueWater/Assets/02.Scripts/Character/Npc/Npc.cs
View File

@ -8,9 +8,16 @@ namespace BlueWaterProject
{
private NpcStateMachine stateMachine;
private NavMeshAgent agent;
private Transform visaualLook;
public Transform[] usuallyPoints;
protected override void Awake()
{
base.Awake();
visaualLook = transform.Find("UnitRoot");
}
protected override void Start()
{
base.Start();
@ -18,7 +25,7 @@ namespace BlueWaterProject
agent = GetComponent<NavMeshAgent>();
stateMachine = gameObject.AddComponent<NpcStateMachine>();
var usuallyPointState = new UsuallyPointState(agent, usuallyPoints);
var usuallyPointState = new UsuallyPointState(agent, usuallyPoints, visaualLook);
stateMachine.ChangeState(usuallyPointState);
}
@ -29,5 +36,7 @@ namespace BlueWaterProject
// 필요하면 플레이어의 명령을 처리하는 로직을 추가
}
}
}

70
BlueWater/Assets/02.Scripts/Character/Player/Type/InShipPlayer.cs
View File

@ -1,4 +1,7 @@
using System.Collections;
using PixelCrushers.DialogueSystem.Wrappers;
using UnityEngine;
using UnityEngine.InputSystem;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -25,8 +28,19 @@ namespace BlueWaterProject
MoveCharacterPlayer();
}
private void OnInteraction(InputValue value)
{
}
private void OnCancel(InputValue value)
{
}
private void MoveCharacterPlayer()
{
if (GameManager.Inst.IsConversation) return;
Vector3 movement;
if (GameManager.Inst.IsShipDeckMode)
@ -51,8 +65,62 @@ namespace BlueWaterProject
public void GotoShipDeck()
{
var point = GameManager.Inst.shipPlayer.transform.Find("TeleportPoint");
var point = GameManager.Inst.ShipPlayer.transform.Find("TeleportPoint");
transform.position = point.position;
}
public void StartConversation(Transform target)
{
GameManager.Inst.IsConversation = true;
GameManager.Inst.CameraController.ChangeInShipFollowAndLookAt(target);
var targetPosition = target.position;
var playerPosition = transform.position;
var directionToTarget = (targetPosition - playerPosition).normalized;
// 캐릭터가 NPC의 왼쪽 또는 오른쪽에 있는지 확인합니다.
var crossProduct = Vector3.Cross(directionToTarget, transform.forward).y;
// 캐릭터가 NPC의 왼쪽에 있는 경우
if (crossProduct > 0)
{
var desiredPosition = targetPosition + (target.right * -2f);
// 장애물 감지 및 이동 경로 조정 로직을 추가합니다.
// ...
StartCoroutine(MoveCharacterToPosition(desiredPosition));
}
// 캐릭터가 NPC의 오른쪽에 있는 경우
else
{
var desiredPosition = targetPosition + (target.right * 2f);
// 장애물 감지 및 이동 경로 조정 로직을 추가합니다.
// ...
StartCoroutine(MoveCharacterToPosition(desiredPosition));
}
}
private IEnumerator MoveCharacterToPosition(Vector3 position)
{
var elapsedTime = 0f;
var duration = 1f; // 이동에 걸리는 시간 (초)
var startingPosition = transform.position;
while (elapsedTime < duration)
{
transform.position = Vector3.Lerp(startingPosition, position, elapsedTime / duration);
elapsedTime += Time.deltaTime;
yield return null;
}
transform.position = position;
}
public void EndConversation()
{
GameManager.Inst.IsConversation = false;
GameManager.Inst.CameraController.RestoreInShipFollowAndLookAt();
}
}
}

11
BlueWater/Assets/02.Scripts/GameManager.cs
View File

@ -4,6 +4,7 @@ using Sirenix.OdinInspector;
using Unity.VisualScripting;
using UnityEngine;
using UnityEngine.InputSystem;
using UnityEngine.Serialization;
// ReSharper disable once CheckNamespace
namespace BlueWaterProject
@ -13,10 +14,12 @@ namespace BlueWaterProject
{
[field: Title("Controller")]
public CameraController CameraController { get; private set; }
public ShipPlayer shipPlayer;
public List<Boat> boats = new(10);
[field: Title("Player")]
public ShipPlayer ShipPlayer { get; private set; }
[field: Required("BlueWater Player Input Action을 넣어주세요.")]
[field: SerializeField] public InputActionAsset PlayerAction { get; private set; }
public InShipPlayer InShipPlayer { get; private set; }
public InIslandPlayer InIslandPlayer { get; set; }
[field: Required("Viking Prefab을 넣어주세요.")]
[field: SerializeField] public GameObject InIslandPlayerPrefab { get; set; }
@ -33,12 +36,14 @@ namespace BlueWaterProject
[field: SerializeField] public bool IsTakeAim { get; set; }
[field: SerializeField] public bool IsAssaultMode { get; set; }
[field: SerializeField] public bool IsShipDeckMode { get; set; }
[field: SerializeField] public bool IsConversation { get; set; }
[field: SerializeField] public GlobalValue.PlayerMode CurrentPlayerMode { get; set; }
private void Init()
{
CameraController = FindAnyObjectByType<CameraController>();
shipPlayer = FindAnyObjectByType<ShipPlayer>();
ShipPlayer = FindAnyObjectByType<ShipPlayer>();
InShipPlayer = FindAnyObjectByType<InShipPlayer>();
}
protected override void OnAwake()
{

10
BlueWater/Assets/02.Scripts/IslandInfo.cs
View File

@ -49,11 +49,11 @@ namespace BlueWaterProject
{
foreach (Transform house in houses)
{
if (!house.CompareTag("House") || !house.gameObject.activeSelf) continue;
var houseInfo = house.GetComponent<HouseInfo>();
houseInfo.SetIslandInfo(this);
HouseList.Add(houseInfo.transform);
// if (!house.CompareTag("House") || !house.gameObject.activeSelf) continue;
//
// var houseInfo = house.GetComponent<HouseInfo>();
// houseInfo.SetIslandInfo(this);
// HouseList.Add(houseInfo.transform);
}
}

9
BlueWater/Assets/02.Scripts/Npc/UsuallyPointState.cs
View File

@ -14,17 +14,20 @@ namespace BlueWaterProject
private Vector3 localScale;
private float waitTime = 5f;
private bool isWaiting = false;
private Transform visualLook;
public UsuallyPointState(NavMeshAgent agent, Transform[] usuallyPoints)
public UsuallyPointState(NavMeshAgent agent, Transform[] usuallyPoints, Transform visualLook)
{
this.agent = agent;
this.usuallyPoints = usuallyPoints;
this.visualLook = visualLook;
}
public void OnEnter(NpcStateMachine npcStateMachine)
{
agent.updateRotation = false;
localScale = agent.transform.localScale;
//localScale = agent.transform.localScale;
localScale = visualLook.localScale;
lastPosition = agent.transform.position;
GoToNextPoint();
}
@ -41,7 +44,7 @@ namespace BlueWaterProject
localScale.x = Mathf.Abs(localScale.x);
}
agent.transform.localScale = localScale;
visualLook.localScale = localScale;
lastPosition = agent.transform.position;
if (!agent.pathPending && agent.remainingDistance < 1f)

2
BlueWater/Assets/02.Scripts/Player/Canon.cs
View File

@ -36,7 +36,7 @@ namespace BlueWaterProject
private void Update()
{
if (!GameManager.Inst.shipPlayer.IsTargeting) return;
if (!GameManager.Inst.ShipPlayer.IsTargeting) return;
if(!radarTargetUI.gameObject.activeInHierarchy && !isReloading)
StartCoroutine(ReloadCoroutine());
}

13
BlueWater/Assets/02.Scripts/Player/ShipPlayer.cs
View File

@ -151,20 +151,21 @@ namespace BlueWaterProject
UiManager.Inst.RadarUIOnOff(IsTargeting);
}
private void OnInteractionE(InputValue value) //E
private void OnCancel(InputValue value) //F
{
if (IsTargeting) UiManager.Inst.CheckRadarOverlap();
}
private void OnInteraction(InputValue value) //F
private void OnInteraction(InputValue value) //E
{
if (IsTargeting) UiManager.Inst.CheckRadarOverlap();
if (!IsIslandInteraction) return;
GameManager.Inst.SwitchAssaultMode(true);
UiManager.Inst.DefaultInteractionOnOff(false);
StopShipMovement();
}
private void OnInteractionHold(InputValue value) //F Hold
private void OnInteractionHold(InputValue value) //E Hold
{
GameManager.Inst.SwitchInShipMode(!GameManager.Inst.IsInShipMode);
}
@ -264,8 +265,8 @@ namespace BlueWaterProject
var islandInfo = hit.transform.parent.parent.GetComponent<IslandInfo>();
if (GameManager.Inst.CameraController.AssaultCam != islandInfo.IslandCam)
GameManager.Inst.CameraController.AssaultCam = islandInfo.IslandCam;
if (GameManager.Inst.CameraController.InIslandCam != islandInfo.IslandCam)
GameManager.Inst.CameraController.InIslandCam = islandInfo.IslandCam;
// 박스가 Ground 레이어에 닿았을 때 빨간색으로 표시
Debug.DrawRay(transform.position, dir * rayLength, Color.red);

4
BlueWater/Assets/02.Scripts/SpawnController.cs
View File

@ -76,9 +76,9 @@ namespace BlueWaterProject
playerInput.defaultActionMap = PLAYER_NAME;
if (GameManager.Inst.shipPlayer != null)
if (GameManager.Inst.ShipPlayer != null)
{
GameManager.Inst.shipPlayer.GetComponent<PlayerInput>().enabled = false;
GameManager.Inst.ShipPlayer.GetComponent<PlayerInput>().enabled = false;
}
playerInput.SwitchCurrentActionMap(PLAYER_NAME);

8
BlueWater/Assets/02.Scripts/Ui/UiManager.cs
View File

@ -98,13 +98,13 @@ namespace BlueWaterProject
{
if (RadarTargetUis.Count == 0)
{
for (var i = 0; i < GameManager.Inst.shipPlayer.Canons.Count; i++)
for (var i = 0; i < GameManager.Inst.ShipPlayer.Canons.Count; i++)
{
var obj = Instantiate(DataManager.Inst.radarTargetUi, radarTargets);
var radarTargetUi = obj.GetComponent<RadarTargetUI>();
radarTargetUi.RadarTargetInit(Random.Range(0f, 360f), Random.Range(0.1f, 0.2f));
RadarTargetUis.Add(radarTargetUi);
GameManager.Inst.shipPlayer.Canons[i].radarTargetUI = radarTargetUi;
GameManager.Inst.ShipPlayer.Canons[i].radarTargetUI = radarTargetUi;
}
}
else
@ -123,7 +123,7 @@ namespace BlueWaterProject
for (var i = 0; i < RadarTargetUis.Count; i++)
{
var radarTargetUI = RadarTargetUis[i];
var canon = GameManager.Inst.shipPlayer.Canons[i];
var canon = GameManager.Inst.ShipPlayer.Canons[i];
var startAngle = radarTargetUI.RotationZ - radarTargetUI.Image.fillAmount * 180f;
var endAngle = radarTargetUI.RotationZ + radarTargetUI.Image.fillAmount * 180f;
@ -144,7 +144,7 @@ namespace BlueWaterProject
{
enemyTarget = target;
if (enemyTarget != null && GameManager.Inst.shipPlayer.IsTargeting)
if (enemyTarget != null && GameManager.Inst.ShipPlayer.IsTargeting)
{
Vector3 screenPos = GameManager.Inst.CameraController.MainCam.WorldToScreenPoint(enemyTarget.position);

261181
BlueWater/Assets/04.Fonts/Warhaven_OTF_Bold SDF.asset
View File

File diff suppressed because one or more lines are too long

2
BlueWater/Assets/05.Prefabs/Characters/Npcs/NPC_sailors.prefab
View File

@ -3368,7 +3368,7 @@ GameObject:
m_Component:
- component: {fileID: 3760717387732628255}
- component: {fileID: 3978974184644466455}
m_Layer: 5
m_Layer: 17
m_Name: NPC_sailors
m_TagString: Untagged
m_Icon: {fileID: 0}

2
BlueWater/Assets/05.Prefabs/Characters/Players/Skull_King.prefab
View File

@ -3121,7 +3121,7 @@ GameObject:
m_Component:
- component: {fileID: 4980758164501340593}
- component: {fileID: 273024894308053401}
m_Layer: 5
m_Layer: 0
m_Name: Skull_King
m_TagString: Untagged
m_Icon: {fileID: 0}

2
BlueWater/Assets/05.Prefabs/Characters/Players/TenTen.prefab
View File

@ -3199,7 +3199,7 @@ GameObject:
m_Component:
- component: {fileID: 3406431702509732489}
- component: {fileID: 7160616224672410}
m_Layer: 5
m_Layer: 0
m_Name: TenTen
m_TagString: Untagged
m_Icon: {fileID: 0}

2
BlueWater/Assets/05.Prefabs/Characters/Players/Viking.prefab
View File

@ -1685,7 +1685,7 @@ GameObject:
m_Component:
- component: {fileID: 895707786071648807}
- component: {fileID: 2790053813834214194}
m_Layer: 8
m_Layer: 0
m_Name: Viking
m_TagString: Untagged
m_Icon: {fileID: 0}

464
BlueWater/Assets/05.Prefabs/Ui/BarkUi.prefab Normal file
View File

@ -0,0 +1,464 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &120746
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22431650}
- component: {fileID: 22275116}
- component: {fileID: 11472486}
- component: {fileID: 11453556}
- component: {fileID: 11485008}
m_Layer: 5
m_Name: Main Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22431650
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120746}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 22400914}
m_Father: {fileID: 22465722}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &22275116
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120746}
m_CullTransparentMesh: 0
--- !u!114 &11472486
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120746}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.392}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &11453556
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
m_Name:
m_EditorClassIdentifier:
m_HorizontalFit: 0
m_VerticalFit: 2
--- !u!114 &11485008
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 120746}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 7
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &135794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22465722}
- component: {fileID: 22328728}
- component: {fileID: 11475372}
- component: {fileID: 11485334}
- component: {fileID: 11453294}
m_Layer: 5
m_Name: BarkUi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22465722
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135794}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.005, y: 0.005, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 22431650}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1024, y: 1024}
m_Pivot: {x: 0.5, y: 0}
--- !u!223 &22328728
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135794}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 1
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!114 &11475372
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreReversedGraphics: 1
m_BlockingObjects: 0
m_BlockingMask:
serializedVersion: 2
m_Bits: 9791
--- !u!114 &11485334
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: daa6cb7825d05f04bbb53a7e77ecea90, type: 3}
m_Name:
m_EditorClassIdentifier:
m_yAxisOnly: 0
m_rotate180: 0
--- !u!114 &11453294
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 35b689d0205d778479b0dac3b159c3b4, type: 3}
m_Name:
m_EditorClassIdentifier:
canvasGroup: {fileID: 22506366}
barkText:
m_uiText: {fileID: 11445092}
m_textMeshProUGUI: {fileID: 0}
nameText:
m_uiText: {fileID: 0}
m_textMeshProUGUI: {fileID: 0}
includeName: 0
portraitImage: {fileID: 0}
showPortraitImage: 0
doneTime: 77.669
animationTransitions:
showTrigger: Show
hideTrigger: Hide
duration: 4
keepInView: 0
waitUntilSequenceEnds: 0
cancelWaitUntilSequenceEndsIfReplacingBark: 0
waitForContinueButton: 0
textDisplaySetting: 0
--- !u!1 &135938
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22400914}
- component: {fileID: 22268878}
- component: {fileID: 11430388}
- component: {fileID: 11471340}
- component: {fileID: 22506366}
- component: {fileID: 9550094}
m_Layer: 5
m_Name: Bubble Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22400914
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 22451302}
m_Father: {fileID: 22431650}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &22268878
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_CullTransparentMesh: 0
--- !u!114 &11430388
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: b7f09c3867e11ae4cb69aeb93463acd6, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &11471340
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 59f8146938fff824cb5fd77236b75775, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 24
m_Right: 24
m_Top: 16
m_Bottom: 64
m_ChildAlignment: 4
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 1
m_ChildControlHeight: 1
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!225 &22506366
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!95 &9550094
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135938}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 62b8011547f389344ba48f87b2ada51c, type: 2}
m_CullingMode: 0
m_UpdateMode: 2
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &144376
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 22451302}
- component: {fileID: 22264950}
- component: {fileID: 11445092}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &22451302
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144376}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 22400914}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &22264950
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144376}
m_CullTransparentMesh: 0
--- !u!114 &11445092
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 144376}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 32
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\uC800 \uC758\uC0C1\uC740 \uBB50\uC57C? \uBCC0\uD0DC\uC0C8\uB07C\uC778\uAC00?"

2
BlueWater/Assets/05.Prefabs/Ui/Mobile Standard Dialogue UI.prefab.meta → BlueWater/Assets/05.Prefabs/Ui/BarkUi.prefab.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 5145364176a8f4bb2840d69c76fe556b
guid: ff94d1886129247ff9d17486e5e2fda8
PrefabImporter:
externalObjects: {}
userData:

939
BlueWater/Assets/05.Prefabs/Ui/Mobile Standard Dialogue UI.prefab → BlueWater/Assets/05.Prefabs/Ui/DialogueUi.prefab
View File

File diff suppressed because it is too large Load Diff

7
BlueWater/Assets/05.Prefabs/Ui/DialogueUi.prefab.meta Normal file
View File

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

20
BlueWater/Assets/05.Prefabs/Ui/Basic Standard UI Selector Elements.prefab → BlueWater/Assets/05.Prefabs/Ui/SelectorUi.prefab
View File

@ -95,7 +95,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &22451644
RectTransform:
m_ObjectHideFlags: 0
@ -170,7 +170,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &22416348
RectTransform:
m_ObjectHideFlags: 0
@ -361,7 +361,7 @@ GameObject:
- component: {fileID: 11421968}
- component: {fileID: 11455538}
m_Layer: 5
m_Name: Basic Standard UI Selector Elements
m_Name: SelectorUi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -751,8 +751,9 @@ MonoBehaviour:
m_Calls: []
m_text: F
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 3a63ea49b1e704b5f88ff13d52dca9a2, type: 2}
m_sharedMaterial: {fileID: 2356238409700980164, guid: 3a63ea49b1e704b5f88ff13d52dca9a2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -954,7 +955,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 128.5668, y: 0}
m_AnchoredPosition: {x: 138.4768, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0}
--- !u!222 &3528888407018854663
@ -1091,7 +1092,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 136.10861, y: 0}
m_AnchoredPosition: {x: 146.0186, y: 0}
m_SizeDelta: {x: 0, y: 50.0182}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4715641497317726623
@ -1124,8 +1125,9 @@ MonoBehaviour:
m_Calls: []
m_text: Assault
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: 3a63ea49b1e704b5f88ff13d52dca9a2, type: 2}
m_sharedMaterial: {fileID: 2356238409700980164, guid: 3a63ea49b1e704b5f88ff13d52dca9a2,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []

0
BlueWater/Assets/05.Prefabs/Ui/Basic Standard UI Selector Elements.prefab.meta → BlueWater/Assets/05.Prefabs/Ui/SelectorUi.prefab.meta
View File

597
BlueWater/Assets/BlueWater Dialogue Database (Auto-Backup).asset
View File

@ -66,13 +66,14 @@ MonoBehaviour:
- title: Name
value: Npc1
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value:
value: "\uD63C\uC790 \uC9C0\uAEC4\uC774\uAE30\uB9CC \uD558\uB294 \uD14C\uC2A4\uD2B8
\uB178\uC6081"
type: 0
typeString: CustomFieldType_Text
- title: IsPlayer
@ -82,7 +83,7 @@ MonoBehaviour:
- title: Display Name
value: "\uD560\uC9D3\uC5C6\uB294\uC560"
type: 0
typeString:
typeString: CustomFieldType_Text
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
alternatePortraits: []
@ -108,7 +109,51 @@ MonoBehaviour:
- title: Display Name
value: "\uC5D4\uC9C4"
type: 0
typeString:
typeString: CustomFieldType_Text
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
alternatePortraits: []
spritePortraits: []
- id: 4
fields:
- title: Name
value: Npc2
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value: "\uB300\uD654\uAC00\uB2A5\uD55C \uD14C\uC2A4\uD2B8 \uB178\uC6082"
type: 0
typeString: CustomFieldType_Text
- title: IsPlayer
value: False
type: 2
typeString: CustomFieldType_Boolean
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
alternatePortraits: []
spritePortraits: []
- id: 5
fields:
- title: Name
value: Deck
type: 0
typeString: CustomFieldType_Text
- title: Pictures
value: '[]'
type: 3
typeString: CustomFieldType_Files
- title: Description
value: "\uAC11\uD310\uC73C\uB85C \uAC00\uC790 \uD14C\uC2A4\uD2B8"
type: 0
typeString: CustomFieldType_Text
- title: IsPlayer
value: False
type: 2
typeString: CustomFieldType_Boolean
portrait: {fileID: 0}
spritePortrait: {fileID: 0}
alternatePortraits: []
@ -233,6 +278,12 @@ MonoBehaviour:
destinationDialogueID: 3
isConnector: 0
priority: 2
- originConversationID: 1
originDialogueID: 0
destinationConversationID: 1
destinationDialogueID: 4
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
@ -391,9 +442,58 @@ MonoBehaviour:
y: 130
width: 160
height: 30
- id: 4
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC544\uB2C8 \uBB50\uAC00 \uADF8\uB807\uAC8C \uBD88\uB9CC\uC774\uC57C"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 1
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 203.72444
y: 183.91914
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 22.464348, y: 0}
canvasZoom: 1.0014999
canvasScrollPosition: {x: 4.1611395, y: 1.0632658}
canvasZoom: 1.0055002
- id: 2
fields:
- title: Title
@ -547,6 +647,489 @@ MonoBehaviour:
entryGroups: []
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 1
- id: 3
fields:
- title: Title
value: Npc2 Talk
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
overrideSettings:
useOverrides: 0
overrideSubtitleSettings: 0
showNPCSubtitlesDuringLine: 1
showNPCSubtitlesWithResponses: 1
showPCSubtitlesDuringLine: 0
skipPCSubtitleAfterResponseMenu: 0
subtitleCharsPerSecond: 30
minSubtitleSeconds: 2
continueButton: 0
overrideSequenceSettings: 0
defaultSequence:
defaultPlayerSequence:
defaultResponseMenuSequence:
overrideInputSettings: 0
alwaysForceResponseMenu: 1
includeInvalidEntries: 0
responseTimeout: 0
emTagForOldResponses: 0
emTagForInvalidResponses: 0
cancelSubtitle:
key: 27
buttonName:
cancelConversation:
key: 27
buttonName:
nodeColor:
dialogueEntries:
- id: 0
fields:
- title: Title
value: START
type: 0
typeString:
- title: Description
value:
type: 0
typeString:
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString:
- title: Dialogue Text
value:
type: 0
typeString:
- title: Sequence
value: None()
type: 0
typeString:
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 0
destinationConversationID: 3
destinationDialogueID: 1
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 176
y: 28
width: 160
height: 30
- id: 1
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uBC25 \uC880 \uC8FC\uC138\uC694"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 1
destinationConversationID: 3
destinationDialogueID: 2
isConnector: 0
priority: 2
- originConversationID: 3
originDialogueID: 1
destinationConversationID: 3
destinationDialogueID: 6
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 178.03632
y: 78.99951
width: 160
height: 30
- id: 2
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: ".... \uB3C8\uC774 \uC5C6\uC5B4"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 2
destinationConversationID: 3
destinationDialogueID: 3
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 97.33128
y: 129.99849
width: 160
height: 30
- id: 3
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uADF8\uB7FC \uC220\uC774\uB77C\uB3C4 \uC8FC\uC138\uC694"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 3
destinationConversationID: 3
destinationDialogueID: 4
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 176
y: 178
width: 160
height: 30
- id: 4
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uADF8\uAC83\uB3C4 \uC5C6\uC5B4"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 4
destinationConversationID: 3
destinationDialogueID: 5
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 176
y: 228
width: 160
height: 30
- id: 5
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uADF8\uB7FC \uC8FD\uC5B4"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 176
y: 278
width: 160
height: 30
- id: 6
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uB108\uC5D0\uAC8C \uC4F8 \uB3C8\uC740 \uC5C6\uB2E4"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 6
destinationConversationID: 3
destinationDialogueID: 7
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 317.21945
y: 126.98236
width: 160
height: 30
- id: 7
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uACB0\uD22C\uB97C \uC2E0\uCCAD\uD55C\uB2E4 \u3145\u3142"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 440.26535
y: 185.05093
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 0.99149966
syncInfo:
syncActors: 0
syncItems: 0
@ -562,4 +1145,4 @@ MonoBehaviour:
Item","value":"False","type":2,"typeString":"CustomFieldType_Boolean"}],"locationFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"variableFields":[{"title":"Name","value":"","type":0,"typeString":""},{"title":"Initial
Value","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""}],"conversationFields":[{"title":"Title","value":"","type":0,"typeString":""},{"title":"Description","value":"","type":0,"typeString":""},{"title":"Actor","value":"0","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"0","type":5,"typeString":"CustomFieldType_Actor"}],"dialogueEntryFields":[{"title":"Title","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Description","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Actor","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Conversant","value":"","type":5,"typeString":"CustomFieldType_Actor"},{"title":"Menu
Text","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Dialogue
Text","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Sequence","value":"","type":0,"typeString":"CustomFieldType_Text"}],"actorPrimaryFieldTitles":[],"itemPrimaryFieldTitles":[],"questPrimaryFieldTitles":[],"locationPrimaryFieldTitles":[],"variablePrimaryFieldTitles":[],"conversationPrimaryFieldTitles":[],"dialogueEntryPrimaryFieldTitles":[],"npcLineColor":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"pcLineColor":{"r":0.0,"g":0.0,"b":1.0,"a":1.0},"repeatLineColor":{"r":0.5,"g":0.5,"b":0.5,"a":1.0}}'
Text","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"Sequence","value":"","type":0,"typeString":"CustomFieldType_Text"},{"title":"en","value":"","type":4,"typeString":"CustomFieldType_Localization"}],"actorPrimaryFieldTitles":[],"itemPrimaryFieldTitles":[],"questPrimaryFieldTitles":[],"locationPrimaryFieldTitles":[],"variablePrimaryFieldTitles":[],"conversationPrimaryFieldTitles":[],"dialogueEntryPrimaryFieldTitles":[],"npcLineColor":{"r":1.0,"g":0.0,"b":0.0,"a":1.0},"pcLineColor":{"r":0.0,"g":0.0,"b":1.0,"a":1.0},"repeatLineColor":{"r":0.5,"g":0.5,"b":0.5,"a":1.0}}'

2
BlueWater/Assets/BlueWater Dialogue Database (Auto-Backup).asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 99210d4cb1d1946e994ee411721a7baf
guid: 63cd8eb61b95c445888b27b8e11e2d71
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

140
BlueWater/Assets/BlueWater Dialogue Database.asset
View File

@ -300,11 +300,11 @@ MonoBehaviour:
- title: Title
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
@ -316,15 +316,15 @@ MonoBehaviour:
- title: Menu Text
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC528\uBC1C \uB208\uCE58 \uC8FC\uB294 \uAC74\uAC00?"
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString:
typeString: CustomFieldType_Text
conversationID: 1
isRoot: 0
isGroup: 0
@ -349,11 +349,11 @@ MonoBehaviour:
- title: Title
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Actor
value: 2
type: 5
@ -365,15 +365,15 @@ MonoBehaviour:
- title: Menu Text
value:
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uC800 \uC758\uC0C1\uC740 \uBB50\uC57C? \uBCC0\uD0DC\uC0C8\uB07C\uC778\uAC00?"
type: 0
typeString:
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString:
typeString: CustomFieldType_Text
conversationID: 1
isRoot: 0
isGroup: 0
@ -492,8 +492,8 @@ MonoBehaviour:
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 5.938433, y: 2.2538037}
canvasZoom: 1.0124998
canvasScrollPosition: {x: 4.1611395, y: 1.0632658}
canvasZoom: 1.0055002
- id: 2
fields:
- title: Title
@ -792,6 +792,12 @@ MonoBehaviour:
destinationDialogueID: 2
isConnector: 0
priority: 2
- originConversationID: 3
originDialogueID: 1
destinationConversationID: 3
destinationDialogueID: 6
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
@ -854,7 +860,7 @@ MonoBehaviour:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 176
x: 97.33128
y: 129.99849
width: 160
height: 30
@ -1017,9 +1023,113 @@ MonoBehaviour:
y: 278
width: 160
height: 30
- id: 6
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uB108\uC5D0\uAC8C \uC4F8 \uB3C8\uC740 \uC5C6\uB2E4"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks:
- originConversationID: 3
originDialogueID: 6
destinationConversationID: 3
destinationDialogueID: 7
isConnector: 0
priority: 2
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 317.21945
y: 126.98236
width: 160
height: 30
- id: 7
fields:
- title: Title
value:
type: 0
typeString: CustomFieldType_Text
- title: Description
value:
type: 0
typeString: CustomFieldType_Text
- title: Actor
value: 4
type: 5
typeString: CustomFieldType_Actor
- title: Conversant
value: 1
type: 5
typeString: CustomFieldType_Actor
- title: Menu Text
value:
type: 0
typeString: CustomFieldType_Text
- title: Dialogue Text
value: "\uACB0\uD22C\uB97C \uC2E0\uCCAD\uD55C\uB2E4 \u3145\u3142"
type: 0
typeString: CustomFieldType_Text
- title: Sequence
value:
type: 0
typeString: CustomFieldType_Text
conversationID: 3
isRoot: 0
isGroup: 0
nodeColor:
delaySimStatus: 0
falseConditionAction: Block
conditionPriority: 2
outgoingLinks: []
conditionsString:
userScript:
onExecute:
m_PersistentCalls:
m_Calls: []
canvasRect:
serializedVersion: 2
x: 440.26535
y: 185.05093
width: 160
height: 30
entryGroups: []
canvasScrollPosition: {x: 37.533394, y: 0}
canvasZoom: 1.1104999
canvasScrollPosition: {x: 0, y: 0}
canvasZoom: 0.99149966
syncInfo:
syncActors: 0
syncItems: 0

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Extra/Typewriter Sound - Package.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 560a88da2bbc70140bed167f0ba7fe37
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/PlayMaker - Integration.unitypackage.meta Normal file
View File

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

7
BlueWater/Assets/Plugins/Febucci/Text Animator/Integrations/Visual Scripting - Integration.unitypackage.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 117dcc671050f5247bd8743b91ecaab7
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
BlueWater/Assets/Plugins/Pixel Crushers/Dialogue System/Prefabs/Standard UI Prefabs/Pro/Mobile/Mobile Standard Dialogue UI.prefab
View File

@ -584,8 +584,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 614.5, y: 0}
m_SizeDelta: {x: 957, y: 0}
m_AnchoredPosition: {x: 818, y: 0}
m_SizeDelta: {x: 1364, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &22223862
CanvasRenderer:
@ -2783,8 +2783,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 614.5, y: 0}
m_SizeDelta: {x: 957, y: 0}
m_AnchoredPosition: {x: 818, y: 0}
m_SizeDelta: {x: 1364, y: 0}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &22294970
CanvasRenderer:

2
BlueWater/ProjectSettings/DynamicsManager.asset
View File

@ -17,7 +17,7 @@ PhysicsManager:
m_EnableAdaptiveForce: 0
m_ClothInterCollisionDistance: 0.1
m_ClothInterCollisionStiffness: 0.2
m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826200008022000000000000000000008222000000000000000000000000000080000000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000
m_LayerCollisionMatrix: 0000000000000000000000000026020000000000000000000000000000000000000000000826220008022000000000000000000008222000000000000000000000000000080200000000000000000000000000000026000000000000000000000000000000000000000000000000000000000000000000000000000000000000
m_SimulationMode: 0
m_AutoSyncTransforms: 0
m_ReuseCollisionCallbacks: 0

70
BlueWater/ProjectSettings/Packages/com.unity.probuilder/Settings.json
View File

@ -35,6 +35,76 @@
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "experimental.enabled",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.toolbarIconGUI",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.showEditorNotifications",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.showSceneInfo",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.stripProBuilderScriptsOnBuild",
"value": "{\"m_Value\":true}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "editor.autoRecalculateCollisions",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "mesh.meshColliderIsConvex",
"value": "{\"m_Value\":false}"
},
{
"type": "System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "mesh.newShapesSnapToGrid",
"value": "{\"m_Value\":true}"
},
{
"type": "UnityEngine.ProBuilder.UnwrapParameters, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "lightmapping.defaultLightmapUnwrapParameters",
"value": "{\"m_Value\":{\"m_HardAngle\":88.0,\"m_PackMargin\":20.0,\"m_AngleError\":8.0,\"m_AreaError\":15.0}}"
},
{
"type": "System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
"key": "uv.uvEditorGridSnapIncrement",
"value": "{\"m_Value\":0.125}"
},
{
"type": "UnityEngine.Material, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.userMaterial",
"value": "{\"m_Value\":{\"instanceID\":0}}"
},
{
"type": "UnityEditor.StaticEditorFlags, UnityEditor.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.defaultStaticEditorFlags",
"value": "{\"m_Value\":0}"
},
{
"type": "UnityEngine.ProBuilder.PivotLocation, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.newShapePivotLocation",
"value": "{\"m_Value\":1}"
},
{
"type": "UnityEngine.Rendering.ShadowCastingMode, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.shadowCastingMode",
"value": "{\"m_Value\":1}"
},
{
"type": "UnityEngine.ProBuilder.ColliderType, Unity.ProBuilder, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null",
"key": "mesh.newShapeColliderType",
"value": "{\"m_Value\":2}"
}
]
}

10161
BlueWater/mono_crash.26c0b0da72.0.json Normal file
View File

File diff suppressed because it is too large Load Diff