Merge remote-tracking branch 'origin/main'
# Conflicts: # BlueWater/ProjectSettings/DynamicsManager.asset
This commit is contained in:
IDMhan
commit
e164f39bab
Binary file not shown.
@ -1,5 +1,6 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 078b8f13a17171b49892ad10426d5af0
|
||||
guid: 0d2f9ae90bf27654b9950aea040f0191
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
File diff suppressed because it is too large
Load Diff
BIN
BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset
Normal file
BIN
BlueWater/Assets/01.Scenes/02.Ocean/NavMesh-Water Object.asset
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1d6d589a2ce0c4e7c96e54c2effb8b63
|
||||
guid: 33e399d90365b9d4c979ca3993b66866
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 23800000
|
||||
@ -171,6 +171,15 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
""interactions"": """",
|
||||
""initialStateCheck"": false
|
||||
},
|
||||
{
|
||||
""name"": ""ShiftKey"",
|
||||
""type"": ""Button"",
|
||||
""id"": ""6e363e5e-d384-4b7e-a9df-91159f5523ad"",
|
||||
""expectedControlType"": ""Button"",
|
||||
""processors"": """",
|
||||
""interactions"": """",
|
||||
""initialStateCheck"": false
|
||||
},
|
||||
{
|
||||
""name"": ""BuildMode"",
|
||||
""type"": ""Button"",
|
||||
@ -413,6 +422,17 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": false
|
||||
},
|
||||
{
|
||||
""name"": """",
|
||||
""id"": ""8d33ba7e-c3f4-4c6d-bd6a-11a48f13fdb6"",
|
||||
""path"": ""<Keyboard>/shift"",
|
||||
""interactions"": """",
|
||||
""processors"": """",
|
||||
""groups"": ""Keyboard&Mouse"",
|
||||
""action"": ""ShiftKey"",
|
||||
""isComposite"": false,
|
||||
""isPartOfComposite"": false
|
||||
},
|
||||
{
|
||||
""name"": """",
|
||||
""id"": ""3d467a6e-a464-4bbb-b64f-e3317989fb87"",
|
||||
@ -602,6 +622,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
m_Player_UseSkill = m_Player.FindAction("UseSkill", throwIfNotFound: true);
|
||||
m_Player_Mouse0 = m_Player.FindAction("Mouse0", throwIfNotFound: true);
|
||||
m_Player_Mouse1 = m_Player.FindAction("Mouse1", throwIfNotFound: true);
|
||||
m_Player_ShiftKey = m_Player.FindAction("ShiftKey", throwIfNotFound: true);
|
||||
m_Player_BuildMode = m_Player.FindAction("BuildMode", throwIfNotFound: true);
|
||||
// Camera
|
||||
m_Camera = asset.FindActionMap("Camera", throwIfNotFound: true);
|
||||
@ -689,6 +710,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
private readonly InputAction m_Player_UseSkill;
|
||||
private readonly InputAction m_Player_Mouse0;
|
||||
private readonly InputAction m_Player_Mouse1;
|
||||
private readonly InputAction m_Player_ShiftKey;
|
||||
private readonly InputAction m_Player_BuildMode;
|
||||
public struct PlayerActions
|
||||
{
|
||||
@ -710,6 +732,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
public InputAction @UseSkill => m_Wrapper.m_Player_UseSkill;
|
||||
public InputAction @Mouse0 => m_Wrapper.m_Player_Mouse0;
|
||||
public InputAction @Mouse1 => m_Wrapper.m_Player_Mouse1;
|
||||
public InputAction @ShiftKey => m_Wrapper.m_Player_ShiftKey;
|
||||
public InputAction @BuildMode => m_Wrapper.m_Player_BuildMode;
|
||||
public InputActionMap Get() { return m_Wrapper.m_Player; }
|
||||
public void Enable() { Get().Enable(); }
|
||||
@ -768,6 +791,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
@Mouse1.started += instance.OnMouse1;
|
||||
@Mouse1.performed += instance.OnMouse1;
|
||||
@Mouse1.canceled += instance.OnMouse1;
|
||||
@ShiftKey.started += instance.OnShiftKey;
|
||||
@ShiftKey.performed += instance.OnShiftKey;
|
||||
@ShiftKey.canceled += instance.OnShiftKey;
|
||||
@BuildMode.started += instance.OnBuildMode;
|
||||
@BuildMode.performed += instance.OnBuildMode;
|
||||
@BuildMode.canceled += instance.OnBuildMode;
|
||||
@ -823,6 +849,9 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
@Mouse1.started -= instance.OnMouse1;
|
||||
@Mouse1.performed -= instance.OnMouse1;
|
||||
@Mouse1.canceled -= instance.OnMouse1;
|
||||
@ShiftKey.started -= instance.OnShiftKey;
|
||||
@ShiftKey.performed -= instance.OnShiftKey;
|
||||
@ShiftKey.canceled -= instance.OnShiftKey;
|
||||
@BuildMode.started -= instance.OnBuildMode;
|
||||
@BuildMode.performed -= instance.OnBuildMode;
|
||||
@BuildMode.canceled -= instance.OnBuildMode;
|
||||
@ -995,6 +1024,7 @@ public partial class @BlueWater: IInputActionCollection2, IDisposable
|
||||
void OnUseSkill(InputAction.CallbackContext context);
|
||||
void OnMouse0(InputAction.CallbackContext context);
|
||||
void OnMouse1(InputAction.CallbackContext context);
|
||||
void OnShiftKey(InputAction.CallbackContext context);
|
||||
void OnBuildMode(InputAction.CallbackContext context);
|
||||
}
|
||||
public interface ICameraActions
|
||||
|
||||
@ -149,6 +149,15 @@
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "ShiftKey",
|
||||
"type": "Button",
|
||||
"id": "6e363e5e-d384-4b7e-a9df-91159f5523ad",
|
||||
"expectedControlType": "Button",
|
||||
"processors": "",
|
||||
"interactions": "",
|
||||
"initialStateCheck": false
|
||||
},
|
||||
{
|
||||
"name": "BuildMode",
|
||||
"type": "Button",
|
||||
@ -391,6 +400,17 @@
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "8d33ba7e-c3f4-4c6d-bd6a-11a48f13fdb6",
|
||||
"path": "<Keyboard>/shift",
|
||||
"interactions": "",
|
||||
"processors": "",
|
||||
"groups": "Keyboard&Mouse",
|
||||
"action": "ShiftKey",
|
||||
"isComposite": false,
|
||||
"isPartOfComposite": false
|
||||
},
|
||||
{
|
||||
"name": "",
|
||||
"id": "3d467a6e-a464-4bbb-b64f-e3317989fb87",
|
||||
|
||||
@ -7,16 +7,26 @@ using UnityEngine.InputSystem;
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
[SelectionBase]
|
||||
public class ShipPlayer : Player
|
||||
public class ShipPlayer : MonoBehaviour, IDestructible
|
||||
{
|
||||
[Title("초기화 방식")]
|
||||
[SerializeField] private bool autoInit = true;
|
||||
|
||||
[Title("쉽의 기본 설정")]
|
||||
[Tooltip("최대 스피드")] public float maxSpeed = 10f;
|
||||
[Tooltip("가속 수치")] public float acceleration = 2f;
|
||||
[Tooltip("감속 수치")] public float deceleration = 2f;
|
||||
[Tooltip("회전 속도")] public float turnSpeed = 10f;
|
||||
[Tooltip("최대 스피드")]
|
||||
[SerializeField] private float maxSpeed = 10f;
|
||||
[Tooltip("가속 수치")]
|
||||
[SerializeField] private float acceleration = 2f;
|
||||
[Tooltip("감속 수치")]
|
||||
[SerializeField] private float deceleration = 2f;
|
||||
[Tooltip("회전 속도")]
|
||||
[SerializeField] private float turnSpeed = 10f;
|
||||
[Tooltip("배의 최대 체력")]
|
||||
[field: SerializeField] public float MaxHp { get; private set; } = 100;
|
||||
[Tooltip("배의 현재 체력")]
|
||||
[field: SerializeField] public float CurrentHp { get; private set; }
|
||||
[Tooltip("배의 힘(충돌)")]
|
||||
[field: SerializeField] public int Strength { get; set; } = 500;
|
||||
|
||||
[Title("캐논")]
|
||||
[SerializeField] private Cannon cannon;
|
||||
@ -28,19 +38,23 @@ namespace BlueWaterProject
|
||||
[SerializeField] private float chargingGauge;
|
||||
[SerializeField] private float previousGauge;
|
||||
|
||||
// public Rigidbody projectilePrefab;
|
||||
// public Transform launchPoint;
|
||||
// public float timeOfFlight;
|
||||
// public Transform predictedPos;
|
||||
[Title("부스트")]
|
||||
[SerializeField] private float boostPower = 2f;
|
||||
[SerializeField] private float boostMaxTime = 3f;
|
||||
[SerializeField] private float boostRecoveryTime = 1.5f;
|
||||
[SerializeField] private bool isBoosting;
|
||||
|
||||
private PlayerInput playerInput;
|
||||
private Rigidbody rb;
|
||||
private GameObject directionIndicator;
|
||||
|
||||
[SerializeField] private LayerMask waterLayer;
|
||||
private Vector2 movementInput;
|
||||
|
||||
[Button("셋팅 초기화")]
|
||||
private void Init()
|
||||
{
|
||||
playerInput = GetComponent<PlayerInput>();
|
||||
rb = GetComponent<Rigidbody>();
|
||||
playerInput = GetComponent<PlayerInput>();
|
||||
cannon = transform.Find("Cannon").GetComponent<Cannon>();
|
||||
@ -49,49 +63,52 @@ namespace BlueWaterProject
|
||||
directionIndicator.SetActive(false);
|
||||
|
||||
waterLayer = LayerMask.GetMask("Water");
|
||||
|
||||
SetCurrentHp(MaxHp);
|
||||
}
|
||||
|
||||
#region Unity Function
|
||||
|
||||
protected override void Awake()
|
||||
private void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
||||
if (autoInit)
|
||||
{
|
||||
Init();
|
||||
}
|
||||
}
|
||||
|
||||
protected override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
|
||||
playerInput.actions.FindAction("Mouse0").started += _ => ChargeCannon();
|
||||
playerInput.actions.FindAction("Mouse0").canceled += _ => FireCannon();
|
||||
playerInput.actions.FindAction("Mouse1").started += _ => ToggleFireMode();
|
||||
}
|
||||
|
||||
protected override void OnDisable()
|
||||
private void OnEnable()
|
||||
{
|
||||
playerInput.actions.FindAction("Mouse0").started += _ => ChargeCannon();
|
||||
playerInput.actions.FindAction("Mouse0").canceled += _ => FireCannon();
|
||||
playerInput.actions.FindAction("Mouse1").started += _ => ToggleFireMode();
|
||||
playerInput.actions.FindAction("ShiftKey").started += _ => ShipBoost();
|
||||
playerInput.actions.FindAction("ShiftKey").canceled += _ => ShipStopBoost();
|
||||
}
|
||||
|
||||
protected override void Start()
|
||||
private void OnDisable()
|
||||
{
|
||||
playerInput.actions.FindAction("Mouse0").started -= _ => ChargeCannon();
|
||||
playerInput.actions.FindAction("Mouse0").canceled -= _ => FireCannon();
|
||||
playerInput.actions.FindAction("Mouse1").started -= _ => ToggleFireMode();
|
||||
playerInput.actions.FindAction("ShiftKey").started -= _ => ShipBoost();
|
||||
playerInput.actions.FindAction("ShiftKey").canceled -= _ => ShipStopBoost();
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected override void FixedUpdate()
|
||||
private void FixedUpdate()
|
||||
{
|
||||
HandleMovement();
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
private void Update()
|
||||
{
|
||||
HandleFireCannon();
|
||||
HandleBoost();
|
||||
}
|
||||
|
||||
#endregion
|
||||
@ -100,16 +117,37 @@ namespace BlueWaterProject
|
||||
|
||||
private void MoveShipPlayer()
|
||||
{
|
||||
var desiredVelocity = transform.forward * (movementInput.y * maxSpeed);
|
||||
var speedChange = (movementInput.y != 0 ? acceleration : deceleration) * Time.fixedDeltaTime;
|
||||
rb.velocity = Vector3.MoveTowards(rb.velocity, desiredVelocity, speedChange);
|
||||
// var desiredVelocity = transform.forward * (movementInput.y * maxSpeed);
|
||||
// var speedChange = (movementInput.y != 0 ? acceleration : deceleration) * Time.fixedDeltaTime;
|
||||
// rb.velocity = Vector3.MoveTowards(rb.velocity, desiredVelocity, speedChange);
|
||||
|
||||
var speedChange = 0f;
|
||||
Vector3 targetVelocity;
|
||||
if (movementInput == Vector2.zero)
|
||||
{
|
||||
speedChange = deceleration * Time.fixedDeltaTime;
|
||||
targetVelocity = Vector3.zero;
|
||||
}
|
||||
else
|
||||
{
|
||||
var boost = isBoosting ? boostPower : 1f;
|
||||
var moveDirection = new Vector3(movementInput.x, 0, movementInput.y).normalized * (maxSpeed * boost);
|
||||
speedChange = acceleration * boost * Time.fixedDeltaTime;
|
||||
targetVelocity = moveDirection;
|
||||
}
|
||||
rb.velocity = Vector3.MoveTowards(rb.velocity, targetVelocity, speedChange);
|
||||
}
|
||||
|
||||
private void RotatePlayer()
|
||||
{
|
||||
var turn = movementInput.x;
|
||||
var turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f);
|
||||
rb.MoveRotation(rb.rotation * turnRotation);
|
||||
// var turn = movementInput.x;
|
||||
// var turnRotation = Quaternion.Euler(0f, turn * turnSpeed, 0f);
|
||||
// rb.MoveRotation(rb.rotation * turnRotation);
|
||||
|
||||
if (rb.velocity == Vector3.zero) return;
|
||||
|
||||
var targetRotation = Quaternion.LookRotation(rb.velocity.normalized, Vector3.up);
|
||||
rb.rotation = Quaternion.Slerp(rb.rotation, targetRotation, Time.fixedDeltaTime * turnSpeed);
|
||||
}
|
||||
|
||||
private void HandleMovement()
|
||||
@ -155,10 +193,31 @@ namespace BlueWaterProject
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(chargingGauge);
|
||||
}
|
||||
|
||||
private void HandleBoost()
|
||||
{
|
||||
if (isBoosting)
|
||||
{
|
||||
UiManager.Inst.OceanUi.ShipBoostSlider.value += Time.deltaTime * (1f / boostMaxTime);
|
||||
if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f)
|
||||
{
|
||||
ShipStopBoost();
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
UiManager.Inst.OceanUi.ShipBoostSlider.value -= Time.deltaTime * (1f / boostRecoveryTime);
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region Interaction Key
|
||||
|
||||
public virtual void OnMove(InputValue value) // WASD
|
||||
{
|
||||
movementInput = value.Get<Vector2>();
|
||||
}
|
||||
|
||||
private void OnTargeting(InputValue value) //Q
|
||||
{
|
||||
|
||||
@ -200,7 +259,7 @@ namespace BlueWaterProject
|
||||
|
||||
if (isReloading)
|
||||
{
|
||||
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeSliderCoroutine());
|
||||
StartCoroutine(UiManager.Inst.OceanUi.ProcessBar.ShakeProcessBarCoroutine());
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -232,7 +291,13 @@ namespace BlueWaterProject
|
||||
|
||||
if (!isFireMode)
|
||||
{
|
||||
chargingCannon = false;
|
||||
chargingGauge = 0f;
|
||||
previousGauge = chargingGauge;
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetFillAmount(0f);
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(previousGauge * -360f);
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetRotateZ(0f);
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetSliderValue(0f);
|
||||
}
|
||||
}
|
||||
|
||||
@ -254,6 +319,50 @@ namespace BlueWaterProject
|
||||
UiManager.Inst.OceanUi.ProcessBar.SetActiveReloadSlider(false);
|
||||
}
|
||||
|
||||
private void ShipBoost()
|
||||
{
|
||||
if (UiManager.Inst.OceanUi.ShipBoostSlider.value >= 1f)
|
||||
{
|
||||
isBoosting = false;
|
||||
}
|
||||
else
|
||||
{
|
||||
isBoosting = true;
|
||||
}
|
||||
}
|
||||
|
||||
private void ShipStopBoost()
|
||||
{
|
||||
if (!isBoosting) return;
|
||||
|
||||
isBoosting = false;
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
#region IDamageable
|
||||
|
||||
public void TakeDamage(float attackerPower, Vector3? attackPos = null)
|
||||
{
|
||||
var changeHp = Mathf.Max(CurrentHp - attackerPower, 0f);
|
||||
|
||||
SetCurrentHp(changeHp);
|
||||
|
||||
if (CurrentHp == 0f)
|
||||
{
|
||||
Die();
|
||||
}
|
||||
|
||||
print("오브젝트 충돌 - 현재 체력 : " + CurrentHp);
|
||||
}
|
||||
|
||||
public void Die()
|
||||
{
|
||||
print("배 파괴 - 현재 체력 : " + CurrentHp);
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public void SetCurrentHp(float value) => CurrentHp = value;
|
||||
}
|
||||
}
|
||||
88
BlueWater/Assets/02.Scripts/DestructiveObject.cs
Normal file
88
BlueWater/Assets/02.Scripts/DestructiveObject.cs
Normal file
@ -0,0 +1,88 @@
|
||||
using RayFire;
|
||||
using Sirenix.OdinInspector;
|
||||
using UnityEngine;
|
||||
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
public class DestructiveObject : MonoBehaviour
|
||||
{
|
||||
[Title("초기화 방식")]
|
||||
[SerializeField] private bool autoInit = true;
|
||||
|
||||
[Title("기본 설정")]
|
||||
[field: SerializeField] public int Strength { get; private set; } = 100;
|
||||
[SerializeField] private float power = 10f;
|
||||
[SerializeField] private float damageCooldown = 2f;
|
||||
[SerializeField] private bool isHitting;
|
||||
|
||||
[SerializeField] private RayfireRigid rayfire;
|
||||
[SerializeField] private Rigidbody rb;
|
||||
|
||||
[Button("셋팅 초기화")]
|
||||
private void Init()
|
||||
{
|
||||
rayfire = GetComponent<RayfireRigid>();
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (autoInit)
|
||||
{
|
||||
Init();
|
||||
}
|
||||
}
|
||||
|
||||
private void Start()
|
||||
{
|
||||
rb = GetComponent<Rigidbody>();
|
||||
|
||||
rb.isKinematic = true;
|
||||
}
|
||||
|
||||
private void OnCollisionEnter(Collision other)
|
||||
{
|
||||
if (other.collider.CompareTag("ShipPlayer"))
|
||||
{
|
||||
var iDestructible = other.collider.GetComponent<IDestructible>();
|
||||
var otherStrength = iDestructible.Strength;
|
||||
|
||||
if (otherStrength > Strength)
|
||||
{
|
||||
DestroyObject();
|
||||
}
|
||||
else if (otherStrength < Strength)
|
||||
{
|
||||
if (isHitting) return;
|
||||
|
||||
Hit(iDestructible);
|
||||
}
|
||||
else
|
||||
{
|
||||
DestroyObject();
|
||||
Hit(iDestructible);
|
||||
}
|
||||
}
|
||||
else if (other.collider.CompareTag("Missile"))
|
||||
{
|
||||
DestroyObject();
|
||||
}
|
||||
}
|
||||
|
||||
private void DestroyObject()
|
||||
{
|
||||
rb.isKinematic = false;
|
||||
rayfire.Demolish();
|
||||
}
|
||||
|
||||
private void Hit(IDestructible iDestructible)
|
||||
{
|
||||
isHitting = true;
|
||||
iDestructible.TakeDamage(power);
|
||||
|
||||
if (!gameObject.activeSelf) return;
|
||||
|
||||
StartCoroutine(Utils.CoolDown(damageCooldown, () => isHitting = false));
|
||||
}
|
||||
}
|
||||
}
|
||||
11
BlueWater/Assets/02.Scripts/DestructiveObject.cs.meta
Normal file
11
BlueWater/Assets/02.Scripts/DestructiveObject.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9b69f7e57a6e2a641936534835f324ea
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
10
BlueWater/Assets/02.Scripts/Interface/IDestructible.cs
Normal file
10
BlueWater/Assets/02.Scripts/Interface/IDestructible.cs
Normal file
@ -0,0 +1,10 @@
|
||||
using UnityEngine;
|
||||
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
public interface IDestructible : IDamageable
|
||||
{
|
||||
public int Strength { get; set; }
|
||||
}
|
||||
}
|
||||
11
BlueWater/Assets/02.Scripts/Interface/IDestructible.cs.meta
Normal file
11
BlueWater/Assets/02.Scripts/Interface/IDestructible.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 56fa2f33a534b3046933e9b2dc37bcee
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -8,6 +8,8 @@ using Random = UnityEngine.Random;
|
||||
// ReSharper disable once CheckNamespace
|
||||
namespace BlueWaterProject
|
||||
{
|
||||
#region ProcessBar Class
|
||||
|
||||
[Serializable]
|
||||
public class ProcessBar
|
||||
{
|
||||
@ -39,34 +41,37 @@ namespace BlueWaterProject
|
||||
public void SetRotateZ(float value) => PreviousGaugeLine.rotation = Quaternion.Euler(0f, 0f, value);
|
||||
public void SetActiveReloadSlider(bool value) => ReloadSlider.gameObject.SetActive(value);
|
||||
public void SetSliderValue(float value) => ReloadSlider.value = value;
|
||||
public IEnumerator ShakeSliderCoroutine()
|
||||
public IEnumerator ShakeProcessBarCoroutine()
|
||||
{
|
||||
if (isShaking) yield break;
|
||||
|
||||
isShaking = true;
|
||||
reloadingAttackSound.Play();
|
||||
var time = 0f;
|
||||
var sliderOriginalPos = ReloadSlider.transform.localPosition;
|
||||
var processBarOriginalPos = Obj.transform.localPosition;
|
||||
|
||||
while (time < ShakeDuration)
|
||||
{
|
||||
if (!ReloadSlider.gameObject.activeSelf)
|
||||
if (!Obj.gameObject.activeSelf)
|
||||
{
|
||||
ReloadSlider.transform.localPosition = sliderOriginalPos;
|
||||
Obj.transform.localPosition = processBarOriginalPos;
|
||||
isShaking = false;
|
||||
yield break;
|
||||
}
|
||||
|
||||
time += Time.deltaTime;
|
||||
var shakeAmount = Random.Range(-1f, 1f) * ShakePower;
|
||||
ReloadSlider.transform.localPosition = new Vector3(sliderOriginalPos.x + shakeAmount, sliderOriginalPos.y, sliderOriginalPos.z);
|
||||
var processBarLocalPos = Obj.transform.localPosition;
|
||||
Obj.transform.localPosition = new Vector3(processBarLocalPos.x + shakeAmount, processBarLocalPos.y, processBarLocalPos.z);
|
||||
yield return null;
|
||||
}
|
||||
ReloadSlider.transform.localPosition = sliderOriginalPos;
|
||||
Obj.transform.localPosition = processBarOriginalPos;
|
||||
isShaking = false;
|
||||
}
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
public class OceanUi : MonoBehaviour
|
||||
{
|
||||
[Title("초기화 방식")]
|
||||
@ -74,11 +79,33 @@ namespace BlueWaterProject
|
||||
|
||||
[field: Title("UI")]
|
||||
[field: SerializeField] public ProcessBar ProcessBar { get; set; }
|
||||
[field: SerializeField] public Image CannonFill { get; set; }
|
||||
[SerializeField] private Vector3 processBarOffset = Vector3.zero;
|
||||
|
||||
[field: SerializeField] public Slider ShipBoostSlider { get; set; }
|
||||
|
||||
private Canvas canvas;
|
||||
|
||||
[Button("셋팅 초기화")]
|
||||
private void Init()
|
||||
{
|
||||
canvas = GetComponent<Canvas>();
|
||||
if (!canvas)
|
||||
{
|
||||
Debug.LogError("canvas is null error");
|
||||
return;
|
||||
}
|
||||
|
||||
var processBar = canvas.transform.Find("ProcessBar").gameObject;
|
||||
var fill = processBar.transform.Find("Fill").GetComponent<Image>();
|
||||
var previousGaugeLine = processBar.transform.Find("PreviousGaugeLine").transform;
|
||||
var reloadSlider = canvas.transform.Find("ReloadSlider").GetComponent<Slider>();
|
||||
ProcessBar = new ProcessBar(processBar, fill, previousGaugeLine, reloadSlider);
|
||||
ProcessBar.SetActiveReloadSlider(false);
|
||||
|
||||
ShipBoostSlider = canvas.transform.Find("ShipBoostSlider").GetComponent<Slider>();
|
||||
ShipBoostSlider.value = 0f;
|
||||
}
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
if (autoInit)
|
||||
@ -99,23 +126,5 @@ namespace BlueWaterProject
|
||||
ProcessBar.SetPosition(result);
|
||||
}
|
||||
}
|
||||
|
||||
[Button("셋팅 초기화")]
|
||||
private void Init()
|
||||
{
|
||||
canvas = GetComponent<Canvas>();
|
||||
if (!canvas)
|
||||
{
|
||||
Debug.LogError("canvas is null error");
|
||||
return;
|
||||
}
|
||||
|
||||
var processBar = canvas.transform.Find("ProcessBar").gameObject;
|
||||
var fill = processBar.transform.Find("Fill").GetComponent<Image>();
|
||||
var previousGaugeLine = processBar.transform.Find("PreviousGaugeLine").transform;
|
||||
var reloadSlider = processBar.transform.Find("ReloadSlider").GetComponent<Slider>();
|
||||
ProcessBar = new ProcessBar(processBar, fill, previousGaugeLine, reloadSlider);
|
||||
ProcessBar.SetActiveReloadSlider(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -12,7 +12,7 @@ GameObject:
|
||||
- component: {fileID: 13576440}
|
||||
- component: {fileID: 5479992}
|
||||
- component: {fileID: 11464288}
|
||||
m_Layer: 0
|
||||
m_Layer: 25
|
||||
m_Name: GrenadeFireOBJ
|
||||
m_TagString: Missile
|
||||
m_Icon: {fileID: 0}
|
||||
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f5789d13135b86645a366dac6583d1cd
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3643c0d76ec153646b1203880bfb64ed
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 697b6e7dea1fde146b7e3e5cf3ed9e9f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f9406a33814af9c47b352e77f079d798
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9aacf6f3043624194bb6f6fe9a580786
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,14 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b1d738c46034bc244bd356692577373c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 147990
|
||||
packageName: Dynamic Water Physics 2
|
||||
packageVersion: 2.21
|
||||
assetPath: Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/Mirror.unitypackage
|
||||
uploadId: 628762
|
||||
@ -1,14 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2d6d5d59d45ce8a4784ba6c47984a23e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
AssetOrigin:
|
||||
serializedVersion: 1
|
||||
productId: 147990
|
||||
packageName: Dynamic Water Physics 2
|
||||
packageVersion: 2.21
|
||||
assetPath: Assets/NWH/Dynamic Water Physics 2/OptionalPackages/Multiplayer/PUN2.unitypackage
|
||||
uploadId: 628762
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 560a88da2bbc70140bed167f0ba7fe37
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: fb01be13d6e88ca488dda82150319bfc
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 117dcc671050f5247bd8743b91ecaab7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4d9b575363cdb56408d92f7d7f0e5216
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 171c5051d845c4545a6679cdcb9e8290
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e381f1e638a8aec4dbd9a7be673b56e2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 01db744855bbae74481522d48fd63008
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e5f625ae60b99fe4ab78d44cfb58ce5a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b606e558541a7b14593ea370c1a31da1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c13a7e89fcc1f5544b4debda9d682854
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9d6eeb26838ae2140a98c7b012c07610
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 46615cbdbe482664aaf8d3fe2af274c8
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 92b78aa6c7b02924c907a69383e7722f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 169dbd692ce7b8a4083e3e77421ce8d0
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9a785472f49cbc0419f4e80050360f8a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: acc7135a62c70bb40bfd196dcc0dbf58
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 43b92591c923d1543bc95a9b89918a6c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c1d290c89eb9a146a0c3fc3c5d97639
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79d6a8f7106f5a949afdf0f9fce6e5c9
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5db5e6540b70aa44a8b8f0be7cbc03a4
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b81586c5bf3938042babe319ccb6b693
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 29400b82342c15b44bebd36e5f253c7a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e3dca3dc2724503479b532ec6f801f2f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5a3da110bff34d54eb93d1c3c7755741
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 590bfaf71ac68024e96342bd38a2e799
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 89c6283ed4a7a914db4ed32d9fe4be1b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2133c1709cbeab043b2c0d4a09f8c560
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 61a9883a71fe42f4cb3a2538927c5b54
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 107656dc7c8decd4b98ddacdb4c63d9c
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 69578b34b0b99fd408db1f26e709204b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 890975c726da4f447a9fdbb24e0ac5a6
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1977e46ddf171054ba06e70c3a17b562
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d04dae1efd4c20f42801fa99bfb48c71
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f48e38a1694a4a94ba7bfa99b5bb8da7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a760ee77bdfe6fc4fbfeb4e74d81e9ee
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7ac1fca502db8634ca8a220957ce0efe
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03276c81a3b7e1f4f8b9a2c42d29ccb5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4c2fe1e05f53ce540a7e6629e37e62ba
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 41dc081f41d06ad4cb3a976e3bc784ff
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7224afe475473f5479a4be84354c0ffe
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6566ea9453ea9a54c8adda4ce157bfe5
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8a6eaa4e4e356664da332e906c4116ca
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d78d339535406c443be8ab962fe3faed
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 6556a12f622b9f84a87c93e43a05c57a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7adde0d8ab9d11c4f8958df473963096
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2e0d514b37da90b43aca77d71d4ea274
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f73b81d6a28009a4d8a6cfa24e4f6670
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 14eb0de10b56d7d48aa47c34c085763a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bab8f8e2fd66cc94eb0381c12da4f8a1
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 853d51cc63a44614b8aa108c20970d53
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0acaab50ea80e2740907f9fb8e96d5cb
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 00d3be9741969ee4abb41a0d36893d12
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a84c2fae02ab66e4bb10f4b632b4e59f
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ff46b33770bc0e04da5553db516b2791
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d4762985b08cf424d8a389bd106e9c41
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 82f4200e470c7a2459f54ef829fd130b
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8f7926653749bc042b66acaf162cb653
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d8244e47333fea34cabbe75f30b489cd
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a60eb26401f5d2e40a3f8ad3a0cdd2ae
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d20f46daec1cff04b8767c37cbc64dfd
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1e0bc8e64ca5a204ab01fcb065ad3ea4
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0439b345dc19afc4e9e38a45964c21d2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2f034bb78093baf41a5b14693eefb6ba
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 37a76039173f99b4fac971349e64b845
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 12f5d0647e98dad4cba5773dbfe617ee
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: cfa06a72ad668b64e84eb67a6653c27a
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5f372c15f48325e4da788631806fbd37
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d48ea718ba1476a4baa5cd9e66f6ed78
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 21b40e7d71233864788700238fab175d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44688b79fc3aa6a44b5c47a92a453722
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c6b5601000159b44594b95b58dc95e5e
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1f67bb1f7a0ccac4bacceb5680482ca2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d418d21b145ca9e4289690cca70d800d
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ba01c8813d9d8e645a60034600445394
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 373fa280b9df46f45901d7ac3fea3beb
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d0b0bdbd9366c9e4fba085f618ca54ba
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c59e446cf466a424daed6859d731bc80
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 494657561b44a1c489255e7049d56ad7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@ -1,7 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0bfa1827c30ff98418b3b36047505a15
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user