Merge branch 'main' of 121.165.94.243:capers/bluewater into NTG
This commit is contained in:
commit
ecb6f47713
@ -760,6 +760,11 @@ MonoBehaviour:
|
|||||||
type: 3}
|
type: 3}
|
||||||
boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3}
|
boat: {fileID: 2987405546353765599, guid: 96173da392e9a408d9aea814b4cfe00e, type: 3}
|
||||||
assaultCard: {fileID: 729135456}
|
assaultCard: {fileID: 729135456}
|
||||||
|
cardType:
|
||||||
|
- {fileID: 21300000, guid: 550b6170d3e5c4cf885cf56fa1df8f6b, type: 3}
|
||||||
|
- {fileID: 21300000, guid: fa70a195a66db4c7fb6180f4205a06b1, type: 3}
|
||||||
|
- {fileID: 21300000, guid: d7aae5ed9e4924be4ac2fe09b2f729a9, type: 3}
|
||||||
|
- {fileID: 21300000, guid: 9180a011ac08440f89deb0b7aa2820f2, type: 3}
|
||||||
--- !u!4 &107190135
|
--- !u!4 &107190135
|
||||||
Transform:
|
Transform:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -13454,7 +13459,7 @@ Transform:
|
|||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 1871370245}
|
m_GameObject: {fileID: 1871370245}
|
||||||
serializedVersion: 2
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0.6764068, y: -0, z: -0, w: 0.7365283}
|
m_LocalRotation: {x: 0.67640686, y: -0.000000029802319, z: -0, w: 0.7365282}
|
||||||
m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001}
|
m_LocalPosition: {x: -0.0000002384187, y: 120, z: -10.000001}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
@ -14789,7 +14794,7 @@ MonoBehaviour:
|
|||||||
m_Script: {fileID: 11500000, guid: 06c19c0e062e84c169aca3af92060883, type: 3}
|
m_Script: {fileID: 11500000, guid: 06c19c0e062e84c169aca3af92060883, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
uiAnimator: {fileID: 332484094}
|
_persistent: 0
|
||||||
--- !u!1001 &2117062064
|
--- !u!1001 &2117062064
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.AI;
|
using UnityEngine.AI;
|
||||||
|
using UnityEngine.Animations;
|
||||||
using UnityEngine.UI;
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class Boat : MonoBehaviour
|
public class Boat : MonoBehaviour
|
||||||
@ -11,7 +12,10 @@ public class Boat : MonoBehaviour
|
|||||||
private LineRenderer lineRenderer;
|
private LineRenderer lineRenderer;
|
||||||
private GameObject spot; //도착지점 표시 이미지
|
private GameObject spot; //도착지점 표시 이미지
|
||||||
private Coroutine draw; //경로 그리기 코루틴
|
private Coroutine draw; //경로 그리기 코루틴
|
||||||
private Sprite typeCardSprite;
|
|
||||||
|
private Transform typeCard;
|
||||||
|
public SpriteRenderer TypeCardSprite { get; private set; }
|
||||||
|
private LookAtConstraint typeCardLookAtConstraint;
|
||||||
|
|
||||||
public Vector3 target { get; set; }
|
public Vector3 target { get; set; }
|
||||||
|
|
||||||
@ -28,7 +32,9 @@ public class Boat : MonoBehaviour
|
|||||||
lineRenderer.enabled = false;
|
lineRenderer.enabled = false;
|
||||||
|
|
||||||
spot = Instantiate(DataManager.Inst.mouseSpot);
|
spot = Instantiate(DataManager.Inst.mouseSpot);
|
||||||
typeCardSprite = transform.Find("TypeCard").GetComponent<SpriteRenderer>().sprite;
|
typeCard = transform.Find("TypeCard");
|
||||||
|
TypeCardSprite = typeCard.GetComponent<SpriteRenderer>();
|
||||||
|
typeCardLookAtConstraint = typeCard.GetComponent<LookAtConstraint>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
@ -40,6 +46,15 @@ public class Boat : MonoBehaviour
|
|||||||
|
|
||||||
if (draw != null) StopCoroutine(draw);
|
if (draw != null) StopCoroutine(draw);
|
||||||
draw = StartCoroutine(DrawPath());
|
draw = StartCoroutine(DrawPath());
|
||||||
|
|
||||||
|
typeCardLookAtConstraint.SetSources(new List<ConstraintSource>
|
||||||
|
{
|
||||||
|
new ConstraintSource
|
||||||
|
{
|
||||||
|
sourceTransform = Camera.main.transform,
|
||||||
|
weight = 1
|
||||||
|
}
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Update()
|
private void Update()
|
||||||
|
@ -3,6 +3,7 @@ using System.Collections;
|
|||||||
using Sirenix.OdinInspector;
|
using Sirenix.OdinInspector;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using UnityEngine.EventSystems;
|
using UnityEngine.EventSystems;
|
||||||
|
using UnityEngine.UI;
|
||||||
|
|
||||||
public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler
|
public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, IPointerUpHandler
|
||||||
{
|
{
|
||||||
@ -11,21 +12,24 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
|
|||||||
private CanvasGroup canvasGroup;
|
private CanvasGroup canvasGroup;
|
||||||
private GameObject border;
|
private GameObject border;
|
||||||
|
|
||||||
|
[Title("Child Object")]
|
||||||
|
private Image typeImage;
|
||||||
|
|
||||||
[InfoBox("카드가 작아지는 속도 입니다. 높을수록 천천히 작아집니다.")] [Range(0f, 1000f)]
|
[InfoBox("카드가 작아지는 속도 입니다. 높을수록 천천히 작아집니다.")] [Range(0f, 1000f)]
|
||||||
public float maxDistance = 500f;
|
public float maxDistance = 500f;
|
||||||
|
|
||||||
private Coroutine scaleDown;
|
private Coroutine scaleDown;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
border = transform.Find("Border").gameObject;
|
border = transform.Find("Border").gameObject;
|
||||||
|
typeImage = transform.Find("Type").GetComponent<Image>();
|
||||||
}
|
}
|
||||||
|
|
||||||
private void Start()
|
private void Start()
|
||||||
{
|
{
|
||||||
canvasGroup = GetComponent<CanvasGroup>();
|
canvasGroup = GetComponent<CanvasGroup>();
|
||||||
|
typeImage.sprite = DataManager.Inst.cardType[UnityEngine.Random.Range(0, DataManager.Inst.cardType.Length)];
|
||||||
}
|
}
|
||||||
|
|
||||||
public void OnPointerDown(PointerEventData eventData)
|
public void OnPointerDown(PointerEventData eventData)
|
||||||
@ -87,6 +91,7 @@ public class DraggableCard : MonoBehaviour, IPointerDownHandler, IDragHandler, I
|
|||||||
Quaternion.identity);
|
Quaternion.identity);
|
||||||
|
|
||||||
var boat = obj.GetComponent<Boat>();
|
var boat = obj.GetComponent<Boat>();
|
||||||
|
boat.TypeCardSprite.sprite = typeImage.sprite;
|
||||||
boat.target = hit.point;
|
boat.target = hit.point;
|
||||||
boat.OnLanded += GameManager.Inst.testPrint;
|
boat.OnLanded += GameManager.Inst.testPrint;
|
||||||
|
|
||||||
|
@ -62,6 +62,15 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
""processors"": """",
|
""processors"": """",
|
||||||
""interactions"": ""Hold(duration=1)"",
|
""interactions"": ""Hold(duration=1)"",
|
||||||
""initialStateCheck"": false
|
""initialStateCheck"": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": ""Zkey"",
|
||||||
|
""type"": ""Button"",
|
||||||
|
""id"": ""548e1aff-2de9-4dcc-8fe3-6c20ee0e74d4"",
|
||||||
|
""expectedControlType"": ""Button"",
|
||||||
|
""processors"": """",
|
||||||
|
""interactions"": """",
|
||||||
|
""initialStateCheck"": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
""bindings"": [
|
""bindings"": [
|
||||||
@ -152,6 +161,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
""action"": ""InteractionHold"",
|
""action"": ""InteractionHold"",
|
||||||
""isComposite"": false,
|
""isComposite"": false,
|
||||||
""isPartOfComposite"": false
|
""isPartOfComposite"": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
""name"": """",
|
||||||
|
""id"": ""3db50dad-5cf1-4778-a8a6-27a83398045b"",
|
||||||
|
""path"": ""<Keyboard>/z"",
|
||||||
|
""interactions"": """",
|
||||||
|
""processors"": """",
|
||||||
|
""groups"": ""Keyboard"",
|
||||||
|
""action"": ""Zkey"",
|
||||||
|
""isComposite"": false,
|
||||||
|
""isPartOfComposite"": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
@ -288,6 +308,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
m_Player_AssaultMode = m_Player.FindAction("AssaultMode", throwIfNotFound: true);
|
m_Player_AssaultMode = m_Player.FindAction("AssaultMode", throwIfNotFound: true);
|
||||||
m_Player_Interaction = m_Player.FindAction("Interaction", throwIfNotFound: true);
|
m_Player_Interaction = m_Player.FindAction("Interaction", throwIfNotFound: true);
|
||||||
m_Player_InteractionHold = m_Player.FindAction("InteractionHold", throwIfNotFound: true);
|
m_Player_InteractionHold = m_Player.FindAction("InteractionHold", throwIfNotFound: true);
|
||||||
|
m_Player_Zkey = m_Player.FindAction("Zkey", throwIfNotFound: true);
|
||||||
// Camera
|
// Camera
|
||||||
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
|
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
|
||||||
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
|
m_Camera_Zoom = m_Camera.FindAction("Zoom", throwIfNotFound: true);
|
||||||
@ -361,6 +382,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
private readonly InputAction m_Player_AssaultMode;
|
private readonly InputAction m_Player_AssaultMode;
|
||||||
private readonly InputAction m_Player_Interaction;
|
private readonly InputAction m_Player_Interaction;
|
||||||
private readonly InputAction m_Player_InteractionHold;
|
private readonly InputAction m_Player_InteractionHold;
|
||||||
|
private readonly InputAction m_Player_Zkey;
|
||||||
public struct PlayerActions
|
public struct PlayerActions
|
||||||
{
|
{
|
||||||
private @BlueWater m_Wrapper;
|
private @BlueWater m_Wrapper;
|
||||||
@ -369,6 +391,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
public InputAction @AssaultMode => m_Wrapper.m_Player_AssaultMode;
|
public InputAction @AssaultMode => m_Wrapper.m_Player_AssaultMode;
|
||||||
public InputAction @Interaction => m_Wrapper.m_Player_Interaction;
|
public InputAction @Interaction => m_Wrapper.m_Player_Interaction;
|
||||||
public InputAction @InteractionHold => m_Wrapper.m_Player_InteractionHold;
|
public InputAction @InteractionHold => m_Wrapper.m_Player_InteractionHold;
|
||||||
|
public InputAction @Zkey => m_Wrapper.m_Player_Zkey;
|
||||||
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
||||||
public void Enable() { Get().Enable(); }
|
public void Enable() { Get().Enable(); }
|
||||||
public void Disable() { Get().Disable(); }
|
public void Disable() { Get().Disable(); }
|
||||||
@ -390,6 +413,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
@InteractionHold.started += instance.OnInteractionHold;
|
@InteractionHold.started += instance.OnInteractionHold;
|
||||||
@InteractionHold.performed += instance.OnInteractionHold;
|
@InteractionHold.performed += instance.OnInteractionHold;
|
||||||
@InteractionHold.canceled += instance.OnInteractionHold;
|
@InteractionHold.canceled += instance.OnInteractionHold;
|
||||||
|
@Zkey.started += instance.OnZkey;
|
||||||
|
@Zkey.performed += instance.OnZkey;
|
||||||
|
@Zkey.canceled += instance.OnZkey;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void UnregisterCallbacks(IPlayerActions instance)
|
private void UnregisterCallbacks(IPlayerActions instance)
|
||||||
@ -406,6 +432,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
@InteractionHold.started -= instance.OnInteractionHold;
|
@InteractionHold.started -= instance.OnInteractionHold;
|
||||||
@InteractionHold.performed -= instance.OnInteractionHold;
|
@InteractionHold.performed -= instance.OnInteractionHold;
|
||||||
@InteractionHold.canceled -= instance.OnInteractionHold;
|
@InteractionHold.canceled -= instance.OnInteractionHold;
|
||||||
|
@Zkey.started -= instance.OnZkey;
|
||||||
|
@Zkey.performed -= instance.OnZkey;
|
||||||
|
@Zkey.canceled -= instance.OnZkey;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveCallbacks(IPlayerActions instance)
|
public void RemoveCallbacks(IPlayerActions instance)
|
||||||
@ -546,6 +575,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
|||||||
void OnAssaultMode(InputAction.CallbackContext context);
|
void OnAssaultMode(InputAction.CallbackContext context);
|
||||||
void OnInteraction(InputAction.CallbackContext context);
|
void OnInteraction(InputAction.CallbackContext context);
|
||||||
void OnInteractionHold(InputAction.CallbackContext context);
|
void OnInteractionHold(InputAction.CallbackContext context);
|
||||||
|
void OnZkey(InputAction.CallbackContext context);
|
||||||
}
|
}
|
||||||
public interface ICameraActions
|
public interface ICameraActions
|
||||||
{
|
{
|
||||||
|
@ -40,6 +40,15 @@
|
|||||||
"processors": "",
|
"processors": "",
|
||||||
"interactions": "Hold(duration=1)",
|
"interactions": "Hold(duration=1)",
|
||||||
"initialStateCheck": false
|
"initialStateCheck": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "Zkey",
|
||||||
|
"type": "Button",
|
||||||
|
"id": "548e1aff-2de9-4dcc-8fe3-6c20ee0e74d4",
|
||||||
|
"expectedControlType": "Button",
|
||||||
|
"processors": "",
|
||||||
|
"interactions": "",
|
||||||
|
"initialStateCheck": false
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"bindings": [
|
"bindings": [
|
||||||
@ -130,6 +139,17 @@
|
|||||||
"action": "InteractionHold",
|
"action": "InteractionHold",
|
||||||
"isComposite": false,
|
"isComposite": false,
|
||||||
"isPartOfComposite": false
|
"isPartOfComposite": false
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"name": "",
|
||||||
|
"id": "3db50dad-5cf1-4778-a8a6-27a83398045b",
|
||||||
|
"path": "<Keyboard>/z",
|
||||||
|
"interactions": "",
|
||||||
|
"processors": "",
|
||||||
|
"groups": "Keyboard",
|
||||||
|
"action": "Zkey",
|
||||||
|
"isComposite": false,
|
||||||
|
"isPartOfComposite": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
@ -1,5 +1,6 @@
|
|||||||
using System.Collections;
|
using System.Collections;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
|
using Sirenix.OdinInspector;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class DataManager : Singleton<DataManager>
|
public class DataManager : Singleton<DataManager>
|
||||||
@ -7,4 +8,7 @@ public class DataManager : Singleton<DataManager>
|
|||||||
public GameObject mouseSpot;
|
public GameObject mouseSpot;
|
||||||
public GameObject boat;
|
public GameObject boat;
|
||||||
public GameObject assaultCard;
|
public GameObject assaultCard;
|
||||||
|
|
||||||
|
[Title("Sprites")]
|
||||||
|
public Sprite[] cardType;
|
||||||
}
|
}
|
@ -8,15 +8,9 @@ using UnityEngine;
|
|||||||
|
|
||||||
public class GameManager : Singleton<GameManager>
|
public class GameManager : Singleton<GameManager>
|
||||||
{
|
{
|
||||||
[Title("Manager")]
|
|
||||||
public DataManager DataManager { get; private set; }
|
|
||||||
|
|
||||||
[Title("Controller")]
|
[Title("Controller")]
|
||||||
public CameraController CameraController { get; private set; }
|
public CameraController CameraController { get; private set; }
|
||||||
public UiController UiController { get; private set; }
|
|
||||||
|
|
||||||
public Player player;
|
public Player player;
|
||||||
|
|
||||||
public List<Boat> boats = new List<Boat>(10);
|
public List<Boat> boats = new List<Boat>(10);
|
||||||
|
|
||||||
[Range(0f, 1f)]
|
[Range(0f, 1f)]
|
||||||
@ -24,11 +18,7 @@ public class GameManager : Singleton<GameManager>
|
|||||||
|
|
||||||
private void Init()
|
private void Init()
|
||||||
{
|
{
|
||||||
DataManager = FindObjectOfType<DataManager>();
|
|
||||||
|
|
||||||
CameraController = FindObjectOfType<CameraController>();
|
CameraController = FindObjectOfType<CameraController>();
|
||||||
UiController = FindObjectOfType<UiController>();
|
|
||||||
|
|
||||||
player = FindObjectOfType<Player>();
|
player = FindObjectOfType<Player>();
|
||||||
}
|
}
|
||||||
protected override void OnAwake()
|
protected override void OnAwake()
|
||||||
|
@ -1,11 +0,0 @@
|
|||||||
using System;
|
|
||||||
using System.Collections;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using Doozy.Runtime.Reactor.Animations;
|
|
||||||
using Doozy.Runtime.Reactor.Animators;
|
|
||||||
using UnityEngine;
|
|
||||||
|
|
||||||
public class UiController : MonoBehaviour
|
|
||||||
{
|
|
||||||
public UIAnimator uiAnimator;
|
|
||||||
}
|
|
28
BlueWater/Assets/02.Scripts/UiManager.cs
Normal file
28
BlueWater/Assets/02.Scripts/UiManager.cs
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
using System;
|
||||||
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using Doozy.Runtime.Reactor.Animations;
|
||||||
|
using Doozy.Runtime.Reactor.Animators;
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class UiManager : Singleton<UiManager>
|
||||||
|
{
|
||||||
|
private Transform cardLayoutGroup;
|
||||||
|
public UIAnimator CardLayoutGroupAnimator { get; set; }
|
||||||
|
|
||||||
|
private void Init()
|
||||||
|
{
|
||||||
|
cardLayoutGroup = transform.Find("CardLayoutGroup");
|
||||||
|
CardLayoutGroupAnimator = cardLayoutGroup.GetComponent<UIAnimator>();
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void OnAwake()
|
||||||
|
{
|
||||||
|
Init();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void AddCard()
|
||||||
|
{
|
||||||
|
Instantiate(DataManager.Inst.assaultCard, cardLayoutGroup);
|
||||||
|
}
|
||||||
|
}
|
@ -30,7 +30,6 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
[Tooltip("캐릭터의 이동 속도")]
|
[Tooltip("캐릭터의 이동 속도")]
|
||||||
public float characterSpeed = 10f;
|
public float characterSpeed = 10f;
|
||||||
|
|
||||||
|
|
||||||
public bool IsAssaultMode { get; set; }
|
public bool IsAssaultMode { get; set; }
|
||||||
public bool IsInShipMode { get; set; }
|
public bool IsInShipMode { get; set; }
|
||||||
public bool IsdredgeMode { get; set; }
|
public bool IsdredgeMode { get; set; }
|
||||||
@ -41,6 +40,8 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
rb = GetComponent<Rigidbody>();
|
rb = GetComponent<Rigidbody>();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#region Unity Function
|
||||||
|
|
||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
Init();
|
Init();
|
||||||
@ -60,6 +61,8 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endregion
|
||||||
|
|
||||||
#region Movement
|
#region Movement
|
||||||
|
|
||||||
@ -108,7 +111,7 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
private void SwitchToDredgeMode()
|
private void SwitchToDredgeMode()
|
||||||
{
|
{
|
||||||
GameManager.Inst.CameraController.CamDredgeMode();
|
GameManager.Inst.CameraController.CamDredgeMode();
|
||||||
GameManager.Inst.UiController.uiAnimator.Reverse();
|
UiManager.Inst.CardLayoutGroupAnimator.Reverse();
|
||||||
IsAssaultMode = false;
|
IsAssaultMode = false;
|
||||||
IsdredgeMode = true;
|
IsdredgeMode = true;
|
||||||
}
|
}
|
||||||
@ -116,7 +119,7 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
private void SwitchToAssaultMode()
|
private void SwitchToAssaultMode()
|
||||||
{
|
{
|
||||||
GameManager.Inst.CameraController.CamAssaultMode();
|
GameManager.Inst.CameraController.CamAssaultMode();
|
||||||
GameManager.Inst.UiController.uiAnimator.Play();
|
UiManager.Inst.CardLayoutGroupAnimator.Play();
|
||||||
IsAssaultMode = true;
|
IsAssaultMode = true;
|
||||||
IsdredgeMode = false;
|
IsdredgeMode = false;
|
||||||
}
|
}
|
||||||
@ -149,5 +152,10 @@ namespace _02.Scripts.WaterAndShip
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
|
private void OnZkey(InputValue value)
|
||||||
|
{
|
||||||
|
UiManager.Inst.AddCard();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
BIN
BlueWater/Assets/03.Images/Axe.png
Normal file
BIN
BlueWater/Assets/03.Images/Axe.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 26 KiB |
104
BlueWater/Assets/03.Images/Axe.png.meta
Normal file
104
BlueWater/Assets/03.Images/Axe.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: fa70a195a66db4c7fb6180f4205a06b1
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
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
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
BlueWater/Assets/03.Images/BowAndArrow.png
Normal file
BIN
BlueWater/Assets/03.Images/BowAndArrow.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 28 KiB |
104
BlueWater/Assets/03.Images/BowAndArrow.png.meta
Normal file
104
BlueWater/Assets/03.Images/BowAndArrow.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 550b6170d3e5c4cf885cf56fa1df8f6b
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
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
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
BlueWater/Assets/03.Images/Spear.png
Normal file
BIN
BlueWater/Assets/03.Images/Spear.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
104
BlueWater/Assets/03.Images/Spear.png.meta
Normal file
104
BlueWater/Assets/03.Images/Spear.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d7aae5ed9e4924be4ac2fe09b2f729a9
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
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
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
BIN
BlueWater/Assets/03.Images/Sword.png
Normal file
BIN
BlueWater/Assets/03.Images/Sword.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 16 KiB |
104
BlueWater/Assets/03.Images/Sword.png.meta
Normal file
104
BlueWater/Assets/03.Images/Sword.png.meta
Normal file
@ -0,0 +1,104 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9180a011ac08440f89deb0b7aa2820f2
|
||||||
|
TextureImporter:
|
||||||
|
internalIDToNameTable: []
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 11
|
||||||
|
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
|
||||||
|
isReadable: 0
|
||||||
|
streamingMipmaps: 0
|
||||||
|
streamingMipmapsPriority: 0
|
||||||
|
grayScaleToAlpha: 0
|
||||||
|
generateCubemap: 6
|
||||||
|
cubemapConvolution: 0
|
||||||
|
seamlessCubemap: 0
|
||||||
|
textureFormat: 1
|
||||||
|
maxTextureSize: 2048
|
||||||
|
textureSettings:
|
||||||
|
serializedVersion: 2
|
||||||
|
filterMode: -1
|
||||||
|
aniso: -1
|
||||||
|
mipBias: -100
|
||||||
|
wrapU: 1
|
||||||
|
wrapV: 1
|
||||||
|
wrapW: 1
|
||||||
|
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
|
||||||
|
maxTextureSizeSet: 0
|
||||||
|
compressionQualitySet: 0
|
||||||
|
textureFormatSet: 0
|
||||||
|
applyGammaDecoding: 0
|
||||||
|
platformSettings:
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: DefaultTexturePlatform
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
- serializedVersion: 3
|
||||||
|
buildTarget: Standalone
|
||||||
|
maxTextureSize: 2048
|
||||||
|
resizeAlgorithm: 0
|
||||||
|
textureFormat: -1
|
||||||
|
textureCompression: 0
|
||||||
|
compressionQuality: 50
|
||||||
|
crunchedCompression: 0
|
||||||
|
allowsAlphaSplitting: 0
|
||||||
|
overridden: 0
|
||||||
|
androidETC2FallbackOverride: 0
|
||||||
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||||
|
spriteSheet:
|
||||||
|
serializedVersion: 2
|
||||||
|
sprites: []
|
||||||
|
outline: []
|
||||||
|
physicsShape: []
|
||||||
|
bones: []
|
||||||
|
spriteID: 5e97eb03825dee720800000000000000
|
||||||
|
internalID: 0
|
||||||
|
vertices: []
|
||||||
|
indices:
|
||||||
|
edges: []
|
||||||
|
weights: []
|
||||||
|
secondaryTextures: []
|
||||||
|
spritePackingTag:
|
||||||
|
pSDRemoveMatte: 0
|
||||||
|
pSDShowRemoveMatteOption: 0
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
Loading…
Reference in New Issue
Block a user