#25, #26 아이템 직접 획득 방식 추가 및 선형적인 맵 구조 변경

+ Item관련 Excel, Json, So 수정
+ DropItemTable 로직 수정
+ 아이템 프리팹에서 Enable Interaction 체크하면 직접 룻팅, 해제하면 자동 룻팅
+ 체력회복 아이템 추가
+ 개발자 메뉴 상호작용 "F1" 키를 통해 접근 가능
+ 보스 맵은 마법진을 상호작용하면 보스전 시작
+ 맵 안에서 교전 중일 때, 투명 벽 쉐이더 추가
+ 맵 마다의 통로를 통해서 이동 가능
+ 선형적인 맵 구조에 맞게 리소스 및 위치 수정
+ 타이틀 화면으로 이동할 때 나타나는 오류 수정(CombatUiManager OnDisable 싱글톤 문제)

Closes #25, #26
This commit is contained in:
Nam Tae Gun 2024-06-22 07:11:53 +09:00
parent 87aa509cfc
commit 7fb0da5888
153 changed files with 12870 additions and 5864 deletions

View File

@ -788,13 +788,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 545850347}
serializedVersion: 2
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013}
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1634548838}
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 40, y: 0, z: 0}
--- !u!114 &545850349
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1336,8 +1336,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873223985}
serializedVersion: 2
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalPosition: {x: -2, y: 20.000006, z: -36.080013}
m_LocalRotation: {x: 0.3420201, y: 0, z: 0, w: 0.9396927}
m_LocalPosition: {x: -2, y: 25.711502, z: -32.08078}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,21 @@
using System;
using UnityEngine;
namespace BlueWater
{
[Serializable]
public class CharacterData
{
[field: SerializeField]
public int CharacterIdx { get; set; }
[field: SerializeField]
public string Name { get; set; }
public CharacterData(int characterIdx, string name)
{
CharacterIdx = characterIdx;
Name = name;
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 68764a07c47f7254cba8e62068805491

View File

@ -14,6 +14,9 @@ namespace BlueWater.Enemies.Bosses
[field: SerializeField]
public string DisplayName { get; private set; }
[field: SerializeField]
public int CharacterIdx { get; private set; }
[field: SerializeField]
public int MaxHealthPoint { get; private set; }

View File

@ -1,4 +1,5 @@
using BlueWater.Interfaces;
using BlueWater.Items;
using BlueWater.Maps;
using UnityEngine;
@ -76,7 +77,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros
public override void Initialize()
{
BossHealthPoint.Initialize(true, RhinocerosData.MaxHealthPoint,
RhinocerosData.DisplayName, BossMapController.ParticleInstantiateLocation);
RhinocerosData.DisplayName, BossMapController.ParticleInstanceLocation);
BossSkillController.Initialize(BossData.SkillDataList);
SetMoveSpeed(RhinocerosData.MoveSpeed);
StopMove();
@ -98,7 +99,9 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros
}
AnimationController.SetAnimationTrigger("isDead");
BossMapController.MapClear();
ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position);
BossMapController.ClearMap();
}
private void FlipVisualLook()

View File

@ -140,7 +140,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
Target = GameManager.Instance.CurrentCombatPlayer.GetComponent<Collider>();
BossHealthPoint.Initialize(false, BossData.MaxHealthPoint,
BossData.DisplayName, BossMapController.ParticleInstantiateLocation);
BossData.DisplayName, BossMapController.ParticleInstanceLocation);
BossHealthPoint.OnDead += HandleDie;
BossSkillController.Initialize(BossData.SkillDataList);

View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using BlueWater.Interfaces;
using BlueWater.Items;
using BlueWater.Maps;
using Sirenix.OdinInspector;
using UnityEngine;
@ -102,7 +103,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
public override void Initialize()
{
BossHealthPoint.Initialize(true, SandMoleData.MaxHealthPoint,
SandMoleData.DisplayName, SandMoleMapController.ParticleInstantiateLocation);
SandMoleData.DisplayName, SandMoleMapController.ParticleInstanceLocation);
BossHealthPoint.OnHealthChanged += SummonMiniSandMole;
BossSkillController.Initialize(BossData.SkillDataList);
SetMoveSpeed(SandMoleData.MoveSpeed);
@ -125,7 +126,8 @@ namespace BlueWater.Enemies.Bosses.SandMole
}
AnimationController.SetAnimationTrigger("isDead");
SandMoleMapController.MapClear();
ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position);
SandMoleMapController.ClearMap();
}
private void SummonMiniSandMole(int currentHp)

View File

@ -1,3 +1,4 @@
using BlueWater.Items;
using BlueWater.Maps;
using BlueWater.Uis;
using UnityEngine;
@ -44,7 +45,7 @@ namespace BlueWater.Enemies.Bosses.TitanSlime
MaxCoolDown = TitanSlimeState.RandomCooldown.y;
BossHealthPoint.Initialize(TitanSlimeState.HasRabbit, TitanSlimeState.MaxHp,
TitanSlimeData.DisplayName, _titanSlimeMapController.ParticleInstantiateLocation);
TitanSlimeData.DisplayName, _titanSlimeMapController.ParticleInstanceLocation);
BossSkillController.Initialize(BossData.SkillDataList);
BehaviorTree.EnableBehavior();
@ -69,13 +70,14 @@ namespace BlueWater.Enemies.Bosses.TitanSlime
if (TitanSlimeState.Level == 4 && TitanSlimeState.HasRabbit)
{
_titanSlimeMapController.MapClear();
ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position);
_titanSlimeMapController.ClearMap();
return;
}
if (TitanSlimeState.Level <= 4)
{
EnemyManager.Instance.SpawnSplitSlimes(transform.position, TitanSlimeState.Level + 1,
TitanSlimeState.HasRabbit, _titanSlimeMapController.EnemyInstantiateLocation);
TitanSlimeState.HasRabbit, _titanSlimeMapController.EnemyInstanceLocation);
}
Destroy(gameObject);
}

View File

@ -21,7 +21,7 @@ namespace BlueWater.Enemies.Bosses.TitanSlime
private void Start()
{
_titanSlimeAttackedParticle = GetComponent<ParticleSystem>();
_instantiateLocation = FindAnyObjectByType<TitanSlimeMapController>().ParticleInstantiateLocation;
_instantiateLocation = FindAnyObjectByType<TitanSlimeMapController>().ParticleInstanceLocation;
_collisionEvents = new List<ParticleCollisionEvent>();
}

View File

@ -1,5 +1,8 @@
using System;
using System.Collections.Generic;
using BlueWater.Interfaces;
using BlueWater.Uis;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.InputSystem;
@ -14,6 +17,16 @@ namespace BlueWater.Players.Combat
// Components
[SerializeField]
private PlayerInput _playerInput;
[SerializeField]
protected float InteractionRadius = 2f;
[SerializeField]
private Vector3 _interactionUiOffset = new(0f, 1.5f, 0f);
private List<IPlayerInteraction> _playerInteractions = new();
private IPlayerInteraction _closestInteraction;
private IPlayerInteraction _previousInteraction;
// Events
public event Action<Vector2> OnMoveInputReceived;
@ -33,6 +46,25 @@ namespace BlueWater.Players.Combat
Initialize();
}
private void Update()
{
_closestInteraction = GetClosestInteraction();
if (_closestInteraction != null)
{
_closestInteraction.ShowInteractionUi();
if (_previousInteraction != null && _closestInteraction != _previousInteraction)
{
_previousInteraction.HideInteractionUi();
}
_previousInteraction = _closestInteraction;
}
else
{
_previousInteraction?.HideInteractionUi();
_previousInteraction = null;
}
}
// Initialize methods
#region Initialize methods
@ -99,6 +131,14 @@ namespace BlueWater.Players.Combat
}
}
public void OnInteraction(InputAction.CallbackContext context)
{
if (context.performed)
{
_closestInteraction?.Interaction();
}
}
public void OnOpenItemInventory(InputAction.CallbackContext context)
{
if (context.performed)
@ -125,6 +165,14 @@ namespace BlueWater.Players.Combat
}
}
public void OnOpenDevelopMenu(InputAction.CallbackContext context)
{
if (context.performed)
{
CombatUiManager.Instance.DevelopMenuPopupUi.Open(CombatUiManager.Instance.PopupUiList);
}
}
public void OnCancel(InputAction.CallbackContext context)
{
if (context.performed)
@ -149,5 +197,37 @@ namespace BlueWater.Players.Combat
}
#endregion
// Methods
#region Methods
public void RegisterPlayerInteraction(IPlayerInteraction playerInteraction)
{
Utils.RegisterList(_playerInteractions, playerInteraction);
}
public void UnregisterPlayerInteraction(IPlayerInteraction playerInteraction)
{
Utils.UnregisterList(_playerInteractions, playerInteraction);
}
private IPlayerInteraction GetClosestInteraction()
{
IPlayerInteraction closestInteraction = null;
var closestDistance = float.MaxValue;
foreach (var interaction in _playerInteractions)
{
var distance = Vector3.Distance(transform.position, interaction.Transform.position);
if (distance > InteractionRadius || distance >= closestDistance) continue;
closestDistance = distance;
closestInteraction = interaction;
}
return closestInteraction;
}
#endregion
}
}

View File

@ -86,7 +86,7 @@ namespace BlueWater.Players.Combat
foreach (var element in ItemSlotList)
{
var elementWeight = ItemManager.Instance.ItemDictionary[element.Idx].Weight;
var elementWeight = ItemManager.Instance.GetItemDataByIdx(element.Idx).Weight;
CurrentTotalWeight += elementWeight * element.Count;
}
@ -104,12 +104,12 @@ namespace BlueWater.Players.Combat
break;
case InventorySortingType.Name:
ItemSlotList.Sort((x, y) =>
string.Compare(ItemManager.Instance.ItemDictionary[x.Idx].Name,
ItemManager.Instance.ItemDictionary[y.Idx].Name, StringComparison.Ordinal));
string.Compare(ItemManager.Instance.GetItemDataByIdx(x.Idx).Name,
ItemManager.Instance.GetItemDataByIdx(y.Idx).Name, StringComparison.Ordinal));
break;
case InventorySortingType.Category:
ItemSlotList.Sort((x, y) =>
ItemManager.Instance.ItemDictionary[x.Idx].Category.CompareTo(ItemManager.Instance.ItemDictionary[y.Idx].Category));
ItemManager.Instance.GetItemDataByIdx(x.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.Idx).Category));
break;
case InventorySortingType.Count:
ItemSlotList.Sort((x, y) => y.Count.CompareTo(x.Count));

View File

@ -32,6 +32,7 @@ namespace BlueWater.Players
private WaitForSeconds _flashWhiteWaitTime;
private Coroutine _flashWhiteCoroutine;
private Coroutine _damageIntervalCoroutine;
private bool _isQuitting;
// Hashes
private static readonly int _isHitHash = Shader.PropertyToID("_IsHit");
@ -53,13 +54,17 @@ namespace BlueWater.Players
_flashWhiteWaitTime = new WaitForSeconds(InvincibilityDuration * 0.1f);
SetCurrentHealthPoint(MaxHealthPoint);
}
private void OnApplicationQuit()
{
_isQuitting = true;
}
private void OnDestroy()
{
if (CombatUiManager.Instance && CombatUiManager.Instance.PlayerHealthPointUi)
{
OnHealthChanged -= CombatUiManager.Instance.PlayerHealthPointUi.SetCurrentHealthPoint;
}
if (_isQuitting) return;
OnHealthChanged -= CombatUiManager.Instance.PlayerHealthPointUi.SetCurrentHealthPoint;
}
// Initialize methods
@ -75,8 +80,9 @@ namespace BlueWater.Players
// Methods
public void SetCurrentHealthPoint(int changedHealthPoint)
{
CurrentHealthPoint = changedHealthPoint;
OnHealthChanged?.Invoke(changedHealthPoint);
var newChangedHealthPoint = Mathf.Clamp(changedHealthPoint, 0, MaxHealthPoint);
CurrentHealthPoint = newChangedHealthPoint;
OnHealthChanged?.Invoke(newChangedHealthPoint);
if (CurrentHealthPoint <= 2)
{

View File

@ -1,3 +1,5 @@
using System;
using System.Collections;
using Sirenix.OdinInspector;
using Spine.Unity;
using UnityEngine;
@ -16,7 +18,7 @@ namespace BlueWater.Players
// Variables
[SerializeField]
private string _initialSkinName;
private string _initialSkinName = "default";
#endregion
@ -75,6 +77,70 @@ namespace BlueWater.Players
_animationState.Apply(_skeletonAnimation.Skeleton);
}
public bool IsComparingCurrentAnimation(string animationName, int trackIndex = 0)
{
if (!_skeletonAnimation || _animationState == null) return false;
var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation;
return currentAnimation != null && currentAnimation.Name == animationName;
}
public IEnumerator WaitForAnimationToRun(string animationName, Action<bool> onSuccess, float timeout = 2f)
{
var elapsedTime = 0f;
while (!IsComparingCurrentAnimation(animationName))
{
elapsedTime += Time.deltaTime;
yield return null;
if (elapsedTime > timeout)
{
Debug.Log("Timeout waiting for animation state: " + animationName);
onSuccess?.Invoke(false);
yield break;
}
}
onSuccess?.Invoke(true);
}
public void SetCurrentAnimationSpeed(float targetDuration, int trackIndex = 0)
{
if (!_skeletonAnimation || _animationState == null) return;
var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation;
if (currentAnimation != null)
{
var animationLength = currentAnimation.Duration;
_animationState.TimeScale = animationLength / targetDuration;
}
}
public float GetCurrentAnimationNormalizedTime(int trackIndex = 0)
{
if (!_skeletonAnimation || _animationState == null) return 0f;
var currentTrackEntry = _animationState.GetCurrent(trackIndex);
if (currentTrackEntry != null)
{
return currentTrackEntry.TrackTime / currentTrackEntry.Animation.Duration;
}
return 0f;
}
public float GetCurrentAnimationLength(int trackIndex = 0)
{
if (!_skeletonAnimation || _animationState == null) return 0f;
var currentAnimation = _animationState.GetCurrent(trackIndex)?.Animation;
return currentAnimation != null ? currentAnimation.Duration : 0f;
}
public void ResetAnimationSpeed()
{
if (!_skeletonAnimation || _animationState == null) return;
_animationState.TimeScale = 1f;
}
#endregion
}
}

View File

@ -7,11 +7,9 @@ namespace BlueWater
public enum SaveStage
{
None = 0,
FirstTutorial,
SecondTutorial,
TitanSlime,
Rhinoceros,
SandMole
TitanSlime = 3,
Rhinoceros = 4,
SandMole = 5
}
public class DataManager : Singleton<DataManager>

View File

@ -15,8 +15,7 @@ namespace BlueWater.Editors
private enum DataType
{
None = 0,
ItemTable,
ItemDropTable
ItemDataTable
}
private string _jsonFilePath = "Assets/Resources/Json/FileName";
@ -67,12 +66,9 @@ namespace BlueWater.Editors
EditorUtility.DisplayDialog("경고 메세지", "데이터 타입이 None인지 확인해주세요.", "확인");
Debug.LogError("데이터 타입이 None인지 확인해주세요.");
return;
case DataType.ItemTable:
case DataType.ItemDataTable:
LoadData<ItemData, ItemDataSo>();
break;
case DataType.ItemDropTable:
LoadData<ItemDropTable, ItemDropTableSo>();
break;
default:
EditorUtility.DisplayDialog("경고 메세지", "데이터 타입이 제대로 설정되어있는지 확인해주세요.", "OK");
Debug.LogError("데이터 타입이 제대로 설정되어있는지 확인해주세요.");

View File

@ -13,7 +13,7 @@ namespace BlueWater
private Material _transparentMaterial;
[SerializeField, Range(0f, 1f), ShowIf("@IsFadeable")]
private float _transparency = 0.5f;
private float _transparency;
[SerializeField, Range(0f, 2f), ShowIf("@IsFadeable")]
private float _fadeDuration = 0.5f;

View File

@ -0,0 +1,14 @@
using UnityEngine;
namespace BlueWater.Interfaces
{
public interface IPlayerInteraction
{
Transform Transform { get; }
bool EnableInteraction { get; }
void Interaction();
void ShowInteractionUi();
void HideInteractionUi();
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 423859f99172a734686693a503b83b95
timeCreated: 1716899052

View File

@ -0,0 +1,21 @@
using System;
using UnityEngine;
namespace BlueWater.Items
{
[Serializable]
public class DropItem
{
[field: SerializeField]
public int ItemIdx { get; set; }
[field: SerializeField]
public int DropRate { get; set; }
[field: SerializeField]
public int QuantityMin { get; set; }
[field: SerializeField]
public int QuantityMax { get; set; }
}
}

View File

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

View File

@ -1,115 +0,0 @@
using System.Collections;
using BlueWater.Players.Combat;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
{
public class DropItemController : MonoBehaviour
{
[Title("컴포넌트")]
[SerializeField]
private Rigidbody _rigidbody;
[SerializeField]
private Collider _collider;
[SerializeField]
private SpriteRenderer _spriteRenderer;
[Title("자동 파괴")]
[SerializeField]
private bool _useAutoDestroy = true;
[SerializeField, ShowIf("@_useAutoDestroy")]
private float _autoDestroyTime = 30f;
[Title("획득")]
[SerializeField]
private bool _drawGizmos = true;
[SerializeField]
private float _distance = 5f;
[SerializeField]
private float _acquisitionTime = 1f;
private ItemSlot _itemSlot;
private Collider _targetCollider;
private readonly WaitForSeconds _lootCoroutineTime = new(0.5f);
private void OnDrawGizmosSelected()
{
if (!_drawGizmos) return;
Gizmos.DrawWireSphere(transform.position, _distance);
}
private void Start()
{
if (_useAutoDestroy)
{
Destroy(gameObject, _autoDestroyTime);
}
StartCoroutine(LootCoroutine());
}
public void Initialize(ItemSlot itemSlotValue)
{
_itemSlot = itemSlotValue;
if (_spriteRenderer)
{
_spriteRenderer.sprite = ItemManager.Instance.ItemDictionary[_itemSlot.Idx].Sprite;
}
}
private IEnumerator LootCoroutine()
{
while (true)
{
_targetCollider ??= FindAnyObjectByType<CombatPlayer>().GetComponent<Collider>();
if (_targetCollider == null)
{
yield return _lootCoroutineTime;
continue;
}
var targetDistance = Vector3.Distance(_targetCollider.transform.position, transform.position);
if (targetDistance <= _distance) break;
yield return _lootCoroutineTime;
}
if (_rigidbody)
{
_rigidbody.isKinematic = true;
_rigidbody.useGravity = false;
}
if (_collider)
{
_collider.enabled = false;
}
var startPosition = transform.position;
var elapsedTime = 0f;
while (elapsedTime < _acquisitionTime)
{
if (_targetCollider == null)
{
yield break;
}
elapsedTime += Time.deltaTime;
var t = elapsedTime / _acquisitionTime;
t = Mathf.SmoothStep(0f, 1f, t);
transform.parent.position = Vector3.Lerp(startPosition, _targetCollider.bounds.center, t);
yield return null;
}
ItemManager.Instance.Acquire(_itemSlot);
Destroy(gameObject);
}
}
}

View File

@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 76f610d7843c7b64f9925ec3594d7de4

View File

@ -0,0 +1,204 @@
using System.Collections;
using BlueWater.Audios;
using BlueWater.Interfaces;
using BlueWater.Uis;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
{
public class Item : MonoBehaviour, IPlayerInteraction
{
[field: Title("컴포넌트")]
public Transform Transform { get; private set; }
[SerializeField]
protected Rigidbody Rigidbody;
[SerializeField]
protected Collider Collider;
[SerializeField]
protected Transform VisualLook;
[SerializeField]
protected SpriteRenderer SpriteRenderer;
[SerializeField]
protected Canvas Canvas;
[field: Title("드랍 옵션")]
[field: SerializeField, Tooltip("키 입력을 통한 아이템 획득")]
public bool EnableInteraction { get; private set; } = true;
[SerializeField]
protected bool UseAutoDestroy = true;
[SerializeField, ShowIf("@UseAutoDestroy")]
protected float AutoDestroyTime = 30f;
[SerializeField, ShowIf("@!EnableInteraction")]
protected bool DrawGizmos = true;
[SerializeField, ShowIf("@!EnableInteraction")]
protected float Radius = 5f;
[SerializeField, ShowIf("@!EnableInteraction")]
protected float AcquisitionTime = 1f;
[SerializeField]
protected string AcquiredSfxName = "GetItem";
[Title("아이템 데이터")]
[SerializeField]
protected ItemData ItemData;
protected ItemSlot ItemSlot;
protected Collider TargetCollider;
protected Coroutine RootCoroutineInstance;
protected readonly WaitForSeconds LootCoroutineTime = new(0.5f);
private bool _isQuitting;
private void OnDrawGizmosSelected()
{
if (!DrawGizmos) return;
Gizmos.DrawWireSphere(transform.position, Radius);
}
private void Awake()
{
InitializeComponents();
}
private void Start()
{
if (UseAutoDestroy)
{
Destroy(gameObject, AutoDestroyTime);
}
if (EnableInteraction)
{
GameManager.Instance.CurrentCombatPlayer.CombatInput.RegisterPlayerInteraction(this);
}
else
{
Utils.StartUniqueCoroutine(this, ref RootCoroutineInstance, LootCoroutine());
}
}
private void OnApplicationQuit()
{
_isQuitting = true;
}
private void OnDestroy()
{
if (_isQuitting) return;
if (EnableInteraction)
{
GameManager.Instance.CurrentCombatPlayer.CombatInput.UnregisterPlayerInteraction(this);
}
}
public void Initialize(ItemSlot itemSlot)
{
ItemSlot = itemSlot;
ItemData = ItemManager.Instance.GetItemDataByIdx(ItemSlot.Idx);
SpriteRenderer.sprite = ItemData.Sprite;
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
Transform = transform;
Rigidbody = GetComponent<Rigidbody>();
Collider = GetComponent<Collider>();
VisualLook = transform.Find("VisualLook");
SpriteRenderer = VisualLook.GetComponent<SpriteRenderer>();
Canvas = transform.Find("Canvas").GetComponent<Canvas>();
Canvas.GetComponent<Canvas>().worldCamera = Camera.main;
}
protected virtual void OnAcquired()
{
Destroy(gameObject);
AudioManager.Instance.PlaySfx(AcquiredSfxName);
DataManager.Instance.CombatInventory.AddItem(ItemSlot);
CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemData, ItemSlot.Count);
}
private IEnumerator LootCoroutine()
{
while (true)
{
TargetCollider = GameManager.Instance.CurrentCombatPlayer.CharacterCollider;
if (TargetCollider == null)
{
yield return LootCoroutineTime;
continue;
}
var targetDistance = Vector3.Distance(TargetCollider.transform.position, transform.position);
if (targetDistance <= Radius) break;
yield return LootCoroutineTime;
}
if (Rigidbody)
{
Rigidbody.isKinematic = true;
Rigidbody.useGravity = false;
}
if (Collider)
{
Collider.enabled = false;
}
var startPosition = transform.position;
var elapsedTime = 0f;
while (elapsedTime < AcquisitionTime)
{
if (TargetCollider == null)
{
yield break;
}
elapsedTime += Time.deltaTime;
var t = elapsedTime / AcquisitionTime;
t = Mathf.SmoothStep(0f, 1f, t);
transform.position = Vector3.Lerp(startPosition, TargetCollider.bounds.center, t);
yield return null;
}
OnAcquired();
}
public void AddForce(Vector3 force, ForceMode forceMode) => Rigidbody.AddForce(force, forceMode);
public void Interaction()
{
OnAcquired();
}
public void ShowInteractionUi()
{
if (!Canvas) return;
Canvas.gameObject.SetActive(true);
}
public void HideInteractionUi()
{
if (!Canvas) return;
Canvas.gameObject.SetActive(false);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 619bc0c8098f9a841b08d6cf4d9c1e91

View File

@ -1,5 +1,6 @@
using System;
using BlueWater.Interfaces;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
@ -28,28 +29,33 @@ namespace BlueWater.Items
[Serializable]
public class ItemData : IIdx
{
[field: SerializeField, Tooltip("고유 식별 ID")]
[BoxGroup("Json 데이터 영역")]
[field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")]
public int Idx { get; set; }
[field: SerializeField, Tooltip("이름")]
[field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")]
public string Name { get; set; }
[field: SerializeField, Tooltip("아이템 종류")]
[field: SerializeField, Tooltip("아이템 종류"), BoxGroup("Json 데이터 영역")]
public ItemCategory Category { get; set; }
[field: SerializeField, Tooltip("재료 종류")]
[field: SerializeField, Tooltip("재료 종류"), BoxGroup("Json 데이터 영역")]
public ItemType Type { get; set; }
[field: SerializeField, Tooltip("가격")]
[field: SerializeField, Tooltip("가격"), BoxGroup("Json 데이터 영역")]
public int Price { get; set; }
[field: SerializeField, Tooltip("무게")]
[field: SerializeField, Tooltip("무게"), BoxGroup("Json 데이터 영역")]
public int Weight { get; set; }
[field: SerializeField, Tooltip("스프라이트")]
[field: SerializeField, Tooltip("설명"), TextArea(3, 10), BoxGroup("Json 데이터 영역")]
public string Description { get; set; }
[BoxGroup("직접 추가하는 영역")]
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Sprite Sprite { get; set; }
[field: SerializeField, Tooltip("설명"), TextArea(3, 10)]
public string Description { get; set; }
[field: SerializeField, BoxGroup("직접 추가하는 영역")]
public Item ItemPrefab { get; set; }
}
}

View File

@ -1,80 +1,46 @@
using System;
using System.Collections.Generic;
using BlueWater.Interfaces;
using UnityEngine;
using Random = UnityEngine.Random;
namespace BlueWater.Items
{
[Serializable]
public class ItemDropTable : IIdx
public class ItemDropTable
{
[field: SerializeField, Tooltip("드랍 테이블 인덱스")]
public int Idx { get; set; }
[field: SerializeField, Tooltip("드랍 테이블 이름")]
public string Name { get; set; }
[field: SerializeField]
public int ItemIdx1 { get; set; }
public CharacterData CharacterData { get; set; }
// ItemDropTableScriptableObject 클래스에서 생성되기 떄문에 new() 필수
[field: SerializeField]
public int ItemProb1 { get; set; }
[field: SerializeField]
public int ItemMin1 { get; set; }
[field: SerializeField]
public int ItemMax1 { get; set; }
[field: SerializeField]
public int ItemIdx2 { get; set; }
[field: SerializeField]
public int ItemProb2 { get; set; }
[field: SerializeField]
public int ItemMin2 { get; set; }
[field: SerializeField]
public int ItemMax2 { get; set; }
[field: SerializeField]
public int ItemIdx3 { get; set; }
[field: SerializeField]
public int ItemProb3 { get; set; }
[field: SerializeField]
public int ItemMin3 { get; set; }
[field: SerializeField]
public int ItemMax3 { get; set; }
[field: SerializeField]
public int ItemIdx4 { get; set; }
[field: SerializeField]
public int ItemProb4 { get; set; }
[field: SerializeField]
public int ItemMin4 { get; set; }
[field: SerializeField]
public int ItemMax4 { get; set; }
[field: SerializeField, Tooltip("설명"), TextArea(3, 10)]
public string Description { get; set; }
public List<DropItem> DropItems { get; set; } = new();
private List<ItemSlot> _itemSlots;
public ItemDropTable(CharacterData characterData)
{
CharacterData = characterData;
}
public List<ItemSlot> GetDroppedItemList()
{
var newItemSlotList = new List<ItemSlot>();
CheckAndAddItem(newItemSlotList, ItemIdx1, ItemProb1, ItemMin1, ItemMax1);
CheckAndAddItem(newItemSlotList, ItemIdx2, ItemProb2, ItemMin2, ItemMax2);
CheckAndAddItem(newItemSlotList, ItemIdx3, ItemProb3, ItemMin3, ItemMax3);
CheckAndAddItem(newItemSlotList, ItemIdx4, ItemProb4, ItemMin4, ItemMax4);
_itemSlots = new List<ItemSlot>();
return newItemSlotList;
foreach (var element in DropItems)
{
CheckAndAddItem(element);
}
return _itemSlots;
}
private void CheckAndAddItem(List<ItemSlot> itemSlotList, int itemIdx, int probability, int min, int max)
private void CheckAndAddItem(DropItem dropItem)
{
if (itemIdx == 0) return;
var dropChance = Random.Range(0, 101);
if (dropChance > probability) return;
var randomCount = Random.Range(min, max + 1);
itemSlotList.Add(new ItemSlot(itemIdx, randomCount));
if (dropChance > dropItem.DropRate) return;
var randomCount = Random.Range(dropItem.QuantityMin, dropItem.QuantityMax + 1);
_itemSlots.Add(new ItemSlot(dropItem.ItemIdx, randomCount));
}
}
}

View File

@ -1,23 +1,84 @@
using System.Collections.Generic;
using BlueWater.Interfaces;
using System.IO;
using BlueWater.Items;
using Newtonsoft.Json.Linq;
using UnityEditor;
using UnityEngine;
namespace BlueWater.Items
namespace BlueWater
{
[CreateAssetMenu(fileName = "ItemDropTable", menuName = "ScriptableObjects/ItemDropTable")]
public class ItemDropTableSo : ScriptableObject, IDataContainer<ItemDropTable>
public class ItemDropTableSo : ScriptableObject
{
[field: SerializeField]
public List<ItemDropTable> ItemDropTableList { get; private set; }
// public 필수
public List<ItemDropTable> ItemDropTables = new();
private const string ItemDropJsonPath = "Assets/Resources/Json/ItemDropTable.json";
private const string CharacterDataJsonPath = "Assets/Resources/Json/CharacterData.json";
private const string FilePath = "Assets/02.Scripts/ScriptableObject/Item/ItemDropTable.asset";
public List<ItemDropTable> GetData()
[MenuItem("Tools/ItemDropTable ScriptableObject 생성")]
private static void CreateItemDropTable()
{
return ItemDropTableList;
var itemDropJsonContent = File.ReadAllText(ItemDropJsonPath);
var characterDataJsonContent = File.ReadAllText(CharacterDataJsonPath);
var instance = CreateFromJson(itemDropJsonContent, characterDataJsonContent);
AssetDatabase.CreateAsset(instance, FilePath);
AssetDatabase.SaveAssets();
Debug.Log("ItemDropTable ScriptableObject created successfully in ItemDropTableScriptableObject class.");
}
public void SetData(List<ItemDropTable> itemDropTableList)
private static ItemDropTableSo CreateFromJson(string itemDropJsonString, string characterDataJsonString)
{
ItemDropTableList = itemDropTableList;
var itemDropTables = ParseJsonToCharacterDrops(itemDropJsonString, characterDataJsonString);
var instance = CreateInstance<ItemDropTableSo>();
instance.ItemDropTables = itemDropTables;
return instance;
}
private static List<ItemDropTable> ParseJsonToCharacterDrops(string itemDropJsonString, string characterDataJsonString)
{
var newItemDropTables = new List<ItemDropTable>();
var itemDropTables = new Dictionary<int, ItemDropTable>();
var characterDataDictionary = ParseCharacterDataJson(characterDataJsonString);
var jsonArray = JArray.Parse(itemDropJsonString);
foreach (var element in jsonArray)
{
var characterIdx = (int)element["CharacterIdx"];
var dropItem = new DropItem
{
ItemIdx = (int)element["ItemIdx"],
DropRate = (int)element["DropRate"],
QuantityMin = (int)element["QuantityMin"],
QuantityMax = (int)element["QuantityMax"]
};
if (!itemDropTables.ContainsKey(characterIdx))
{
var characterName = characterDataDictionary.GetValueOrDefault(characterIdx, "Unknown");
itemDropTables[characterIdx] = new ItemDropTable(new CharacterData(characterIdx, characterName));
}
itemDropTables[characterIdx].DropItems.Add(dropItem);
}
newItemDropTables.AddRange(itemDropTables.Values);
return newItemDropTables;
}
private static Dictionary<int, string> ParseCharacterDataJson(string characterDataJsonString)
{
var characterDataDictionary = new Dictionary<int, string>();
var jsonArray = JArray.Parse(characterDataJsonString);
foreach (var element in jsonArray)
{
var characterIdx = (int)element["CharacterIdx"];
var name = (string)element["Name"];
characterDataDictionary[characterIdx] = name;
}
return characterDataDictionary;
}
}
}

View File

@ -1,2 +1,2 @@
fileFormatVersion: 2
guid: 027aabcea812200499455b126674dacd
guid: 9b4027f974cd5234690df1b35ca492ac

View File

@ -1,6 +1,4 @@
using System.Collections.Generic;
using BlueWater.Audios;
using BlueWater.Uis;
using Sirenix.OdinInspector;
using UnityEngine;
@ -9,15 +7,15 @@ namespace BlueWater.Items
public class ItemManager : Singleton<ItemManager>
{
[SerializeField, Required]
private GameObject _dropItemControllerPrefab;
private Item _defaultItemPrefab;
[SerializeField, Required]
private ItemDataSo _itemDataSo;
public Dictionary<int, ItemData> ItemDictionary { get; private set; }
private Dictionary<int, ItemData> _itemDictionary;
[SerializeField, Required]
private ItemDropTableSo _itemDropTableSo;
public Dictionary<int, ItemDropTable> ItemDropTableDictionary { get; private set; }
private Dictionary<int, ItemDropTable> _itemDropTableDictionary;
protected override void OnAwake()
{
@ -28,60 +26,62 @@ namespace BlueWater.Items
private void Initialize()
{
ItemDictionary = new Dictionary<int, ItemData>(_itemDataSo.ItemDataList.Count);
_itemDictionary = new Dictionary<int, ItemData>(_itemDataSo.ItemDataList.Count);
foreach (var element in _itemDataSo.ItemDataList)
{
ItemDictionary.TryAdd(element.Idx, element);
_itemDictionary.TryAdd(element.Idx, element);
}
ItemDropTableDictionary = new Dictionary<int, ItemDropTable>(_itemDropTableSo.ItemDropTableList.Count);
foreach (var element in _itemDropTableSo.ItemDropTableList)
_itemDropTableDictionary = new Dictionary<int, ItemDropTable>(_itemDropTableSo.ItemDropTables.Count);
foreach (var element in _itemDropTableSo.ItemDropTables)
{
ItemDropTableDictionary.TryAdd(element.Idx, element);
}
}
public void ItemDrop(int idx, Vector3 dropPosition)
{
var itemDropTable = ItemDropTableDictionary[idx];
var droppedItemList = itemDropTable.GetDroppedItemList();
foreach (var element in droppedItemList)
{
var instantiateItem = Instantiate(_dropItemControllerPrefab, dropPosition, Quaternion.identity);
instantiateItem.GetComponent<DropItemController>().Initialize(element);
_itemDropTableDictionary.TryAdd(element.CharacterData.CharacterIdx, element);
}
}
public void ItemDropRandomPosition(int idx, Vector3 dropPosition)
{
var itemDropTable = ItemDropTableDictionary[idx];
var itemDropTable = GetItemDropTableByIdx(idx);
if (itemDropTable == null) return;
var droppedItemList = itemDropTable.GetDroppedItemList();
foreach (var element in droppedItemList)
{
var newDropPositionX = Random.Range(dropPosition.x - 1f, dropPosition.x + 1f);
var newDropPositionZ = Random.Range(dropPosition.z - 1f, dropPosition.z + 1f);
var newDropPosition = new Vector3(newDropPositionX, dropPosition.y, newDropPositionZ);
var instantiateItem = Instantiate(_dropItemControllerPrefab, newDropPosition, Quaternion.identity);
instantiateItem.GetComponent<DropItemController>().Initialize(element);
instantiateItem.GetComponent<Rigidbody>().AddForce(Vector3.up * 20f, ForceMode.Impulse);
var itemPrefab = _itemDictionary[element.Idx].ItemPrefab;
if (!itemPrefab)
{
itemPrefab = _defaultItemPrefab;
}
var instantiateItem = Instantiate(itemPrefab, newDropPosition, Quaternion.identity);
instantiateItem.Initialize(element);
instantiateItem.AddForce(Vector3.up * 20f, ForceMode.Impulse);
}
}
public void Acquire(ItemSlot itemSlot)
{
AudioManager.Instance.PlaySfx("GetItem");
DataManager.Instance.CombatInventory.AddItem(itemSlot);
CombatUiManager.Instance.ItemLootUi.ShowLootInfoUi(ItemDictionary[itemSlot.Idx], itemSlot.Count);
}
public ItemData GetItemDataByIdx(int idx)
{
if (ItemDictionary.TryGetValue(idx, out var itemData)) return itemData;
if (_itemDictionary.TryGetValue(idx, out var itemData)) return itemData;
Debug.LogError($"{idx}와 일치하는 아이템이 없습니다.");
return null;
}
public ItemDropTable GetItemDropTableByIdx(int idx)
{
if (idx == 0)
{
Debug.Log("ItemDropTable이 비어있습니다.");
return null;
}
if (_itemDropTableDictionary.TryGetValue(idx, out var itemDropTable)) return itemDropTable;
Debug.LogError($"{idx}와 일치하는 아이템이 없습니다.");
return null;
}
}
}

View File

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

View File

@ -0,0 +1,22 @@
using BlueWater.Audios;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Items
{
public class HealingItem : Item
{
[Title("추가 옵션")]
[SerializeField]
private int _healingHealthPoint = 1;
protected override void OnAcquired()
{
Destroy(gameObject);
AudioManager.Instance.PlaySfx(AcquiredSfxName);
var currentCombatPlayer = GameManager.Instance.CurrentCombatPlayer;
var currentHealthPoint = currentCombatPlayer.PlayerHealthPoint.CurrentHealthPoint;
currentCombatPlayer.PlayerHealthPoint.SetCurrentHealthPoint(currentHealthPoint + _healingHealthPoint);
}
}
}

View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: 31ee4bedfcf364843a6f2665bec1c762

View File

@ -3,6 +3,7 @@ using BlueWater.Audios;
using BlueWater.Enemies;
using BlueWater.Enemies.Bosses;
using BlueWater.Uis;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
@ -16,45 +17,111 @@ namespace BlueWater.Maps
[SerializeField]
protected BossType BossType;
[SerializeField, Required]
protected BossMapTrigger BossMapTrigger;
protected override void Start()
{
base.Start();
BossMapTrigger.OnInteractionActive += InitializeMap;
BossMapTrigger.OnInteractionActive += CloseMapEntrances;
}
protected override void OnDestroy()
{
base.OnDestroy();
BossMapTrigger.OnInteractionActive -= InitializeMap;
BossMapTrigger.OnInteractionActive -= CloseMapEntrances;
}
protected override void InitializeComponents()
{
base.InitializeComponents();
BossSpawnTransform = transform.Find("Spawns/BossSpawn");
BossMapTrigger = transform.Find("Props/2D/BossMapTrigger").GetComponent<BossMapTrigger>();
}
public override void InitializeMap()
{
AllDestroyObjects();
if (GameManager.Instance)
{
var player = GameManager.Instance.CurrentCombatPlayer;
if (player)
{
Destroy(player.gameObject);
}
GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnTransform.position);
}
DataManager.Instance.CurrentSaveStage = SaveStage;
if (!string.IsNullOrEmpty(BGMName))
{
AudioManager.Instance.PlayBgm(BGMName);
}
InitializeBoss();
// 보스 override로 추가
Utils.StartUniqueCoroutine(this, ref MapInitializeCoroutineInstance, InitializeMapCoroutine());
}
protected virtual void InitializeBoss()
{
EnemyManager.Instance.InstantiateBoss(BossType, BossSpawnTransform.position, EnemyInstantiateLocation);
EnemyManager.Instance.InstantiateBoss(BossType, BossSpawnTransform.position, EnemyInstanceLocation);
}
public override void MapClear()
public override void ResetMap(bool isHardReset = false)
{
StartCoroutine(nameof(MapClearCoroutine));
DestroyAllObjects();
OpenMapEntrances();
switch (isHardReset)
{
case false when IsCleared:
return;
case true:
IsCleared = false;
break;
}
BossMapTrigger.ResetTrigger();
}
public override void RestartMap()
{
StartCoroutine(RestartMapCoroutine());
}
protected virtual IEnumerator MapClearCoroutine()
public override void ClearMap()
{
IsCleared = true;
StartCoroutine(nameof(ClearMapCoroutine));
}
protected virtual IEnumerator InitializeMapCoroutine()
{
DestroyAllObjects();
DataManager.Instance.CurrentSaveStage = SaveStage;
if (!string.IsNullOrEmpty(BgmName))
{
AudioManager.Instance.PlayBgm(BgmName);
}
CombatUiManager.Instance.FadeInOut(InitializeFadeInOutTime.x, InitializeFadeInOutTime.y);
yield return new WaitForSeconds(InitializeFadeInOutTime.x + InitializeFadeInOutTime.y);
InitializeBoss();
}
protected virtual IEnumerator RestartMapCoroutine()
{
DestroyAllObjects();
DataManager.Instance.CurrentSaveStage = SaveStage;
AudioManager.Instance.StopBgm();
CombatUiManager.Instance.FadeInOut(InitializeFadeInOutTime.x, InitializeFadeInOutTime.y,
new Color(0f, 0f, 0f, 0f), 1f);
yield return new WaitForSeconds(InitializeFadeInOutTime.x);
var currentCombatPlayer = GameManager.Instance.CurrentCombatPlayer;
if (currentCombatPlayer)
{
Destroy(currentCombatPlayer.gameObject);
}
GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnLocation.position, Quaternion.identity);
BossMapTrigger.ResetTrigger();
OpenMapEntrances();
}
protected virtual IEnumerator ClearMapCoroutine()
{
VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
CombatUiManager.Instance.FadeInOut();
CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y);
var elapsedTime = 0f;
while (elapsedTime <= 3f)
@ -62,7 +129,7 @@ namespace BlueWater.Maps
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
AllDestroyEnemy();
DestroyAllEnemies();
VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
elapsedTime = 0f;
@ -72,7 +139,7 @@ namespace BlueWater.Maps
yield return null;
}
CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList);
OpenMapEntrances();
}
}
}

View File

@ -0,0 +1,88 @@
using System;
using System.Collections;
using BlueWater.Players;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Maps
{
public class BossMapTrigger : MonoBehaviour
{
public enum BossMapTriggerAnimation
{
Idle,
Animation
}
[SerializeField]
private SpineController _spineController;
public Action OnInteractionActive;
private Coroutine _bossMapTriggerCoroutineInstance;
private void Awake()
{
InitializeComponents();
}
private void OnTriggerEnter(Collider other)
{
if (!other.CompareTag("Player")) return;
Utils.StartUniqueCoroutine(this, ref _bossMapTriggerCoroutineInstance, BossMapTriggerCoroutine());
}
private void OnTriggerExit(Collider other)
{
if (!other.CompareTag("Player")) return;
if (_bossMapTriggerCoroutineInstance == null) return;
StopCoroutine(_bossMapTriggerCoroutineInstance);
_bossMapTriggerCoroutineInstance = null;
_spineController.PlayAnimation(BossMapTriggerAnimation.Idle.ToString(), true);
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
_spineController = GetComponent<SpineController>();
}
public void ResetTrigger()
{
_spineController.PlayAnimation(BossMapTriggerAnimation.Idle.ToString(), true);
if (_bossMapTriggerCoroutineInstance != null)
{
StopCoroutine(_bossMapTriggerCoroutineInstance);
_bossMapTriggerCoroutineInstance = null;
}
gameObject.SetActive(true);
}
private IEnumerator BossMapTriggerCoroutine()
{
var interactionAnimationName = BossMapTriggerAnimation.Animation.ToString();
_spineController.PlayAnimation(interactionAnimationName, false);
var animationStarted = false;
yield return StartCoroutine(_spineController.WaitForAnimationToRun(interactionAnimationName,
success => animationStarted = success));
if (!animationStarted)
{
yield break;
}
while (_spineController.IsComparingCurrentAnimation(interactionAnimationName)
&& _spineController.GetCurrentAnimationNormalizedTime() <= 1f)
{
yield return null;
}
gameObject.SetActive(false);
OnInteractionActive?.Invoke();
}
}
}

View File

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

View File

@ -15,7 +15,7 @@ namespace BlueWater.Maps
public override void InitializeMap()
{
AllDestroyObjects();
DestroyAllObjects();
if (GameManager.Instance)
{
@ -25,7 +25,7 @@ namespace BlueWater.Maps
Destroy(player.gameObject);
}
GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnTransform.position);
GameManager.Instance.InstantiateCombatPlayer(PlayerSpawnLocation.position);
}
// TODO : Enemy 생성 후 추가
@ -33,10 +33,25 @@ namespace BlueWater.Maps
//InstantiateFieldMinion(enemySpawnTransformList[1].position, magicOrkPrefab);
DataManager.Instance.CurrentSaveStage = SaveStage;
if (!string.IsNullOrEmpty(BGMName))
if (!string.IsNullOrEmpty(BgmName))
{
AudioManager.Instance.PlayBgm(BGMName);
AudioManager.Instance.PlayBgm(BgmName);
}
}
public override void ResetMap(bool isHardReset = false)
{
throw new System.NotImplementedException();
}
public override void RestartMap()
{
throw new System.NotImplementedException();
}
public override void ClearMap()
{
throw new System.NotImplementedException();
}
}
}

View File

@ -1,5 +1,4 @@
using System.Collections;
using BlueWater.Uis;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
@ -10,84 +9,114 @@ namespace BlueWater.Maps
/// 컴포넌트
[Title("컴포넌트")]
[SerializeField, Required]
protected Transform PlayerSpawnTransform;
protected Transform PlayerSpawnLocation;
[SerializeField, Required]
public Transform EnemyInstantiateLocation;
[field: SerializeField, Required]
public Transform EnemyInstanceLocation { get; private set; }
[field: SerializeField]
public Transform ParticleInstantiateLocation { get; private set; }
public Transform ParticleInstanceLocation { get; private set; }
[SerializeField]
protected Transform MapEntranceLocations;
[SerializeField]
protected List<MapEntrance> MapEntrances;
[SerializeField]
protected SaveStage SaveStage;
[SerializeField]
protected string BGMName;
protected string BgmName;
[SerializeField]
protected Vector2 InitializeFadeInOutTime = new(0.2f, 1f);
[SerializeField]
protected Vector2 ClearFadeInOutTime = new(0.2f, 0.3f);
protected Coroutine MapInitializeCoroutineInstance;
protected static bool IsCleared;
private bool _isQuitting;
private void Awake()
{
InitializeComponents();
}
protected virtual void Start()
{
}
protected virtual void OnApplicationQuit()
{
_isQuitting = true;
}
protected virtual void OnDestroy()
{
if (_isQuitting) return;
}
[Button("컴포넌트 초기화")]
protected virtual void InitializeComponents()
{
PlayerSpawnLocation = transform.Find("Spawns/PlayerSpawn");
EnemyInstanceLocation = transform.Find("Enemies");
ParticleInstanceLocation = transform.Find("InstantiateObjects");
MapEntranceLocations = transform.Find("MapEntrances");
var entrancesArray = MapEntranceLocations.GetComponentsInChildren<MapEntrance>();
MapEntrances = new List<MapEntrance>(entrancesArray.Length);
MapEntrances.AddRange(entrancesArray);
}
public abstract void InitializeMap();
// TODO : FieldMinion 생성 후 연결
// protected T InstantiateFieldMinion<T>(Vector3 instantiatePosition, T prefab) where T : FieldMinion
// {
// var instantiateFieldMinion = Instantiate(prefab, instantiatePosition, Quaternion.identity, EnemyInstantiateLocation).GetComponent<T>();
// instantiateFieldMinion.Init(this);
//
// EnemyInstanceList.Add(instantiateFieldMinion.gameObject);
//
// return instantiateFieldMinion;
// }
public void AllDestroyEnemy()
public void OpenMapEntrances()
{
foreach (Transform element in EnemyInstantiateLocation)
foreach (var element in MapEntrances)
{
element.OpenMapEntrance();
}
}
public void CloseMapEntrances()
{
foreach (var element in MapEntrances)
{
element.CloseMapEntrance();
}
}
public void DestroyAllEnemies()
{
foreach (Transform element in EnemyInstanceLocation)
{
Destroy(element.gameObject);
}
}
public void AllDestroyObjects()
public void DestroyAllObjects()
{
foreach (Transform element in EnemyInstantiateLocation)
{
Destroy(element.gameObject);
}
DestroyAllEnemies();
foreach (Transform element in ParticleInstantiateLocation)
foreach (Transform element in ParticleInstanceLocation)
{
Destroy(element.gameObject);
}
}
public virtual void MapClear()
{
if (EnemyInstantiateLocation.childCount <= 0)
{
StartCoroutine(nameof(MapClearCoroutine));
}
}
private IEnumerator MapClearCoroutine()
{
VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
CombatUiManager.Instance.FadeInOut();
var elapsedTime = 0f;
while (elapsedTime <= 3f)
{
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
AllDestroyEnemy();
VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
public void MovePlayer()
{
if (!GameManager.Instance.CurrentCombatPlayer) return;
elapsedTime = 0f;
while (elapsedTime <= 2f)
{
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
MapClear();
GameManager.Instance.CurrentCombatPlayer.transform.position = PlayerSpawnLocation.position;
}
public abstract void ResetMap(bool isHardReset = false);
public abstract void RestartMap();
public abstract void ClearMap();
}
}

View File

@ -0,0 +1,43 @@
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Maps
{
public class MapEntrance : MonoBehaviour
{
[SerializeField]
private Collider _collider;
[SerializeField]
private SpriteRenderer _spriteRenderer;
private void Awake()
{
InitializeComponents();
}
private void Start()
{
OpenMapEntrance();
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
_collider = GetComponent<Collider>();
_spriteRenderer = GetComponentInChildren<SpriteRenderer>();
}
public void OpenMapEntrance()
{
_collider.enabled = false;
_spriteRenderer.enabled = false;
}
public void CloseMapEntrance()
{
_collider.enabled = true;
_spriteRenderer.enabled = true;
}
}
}

View File

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

View File

@ -1,13 +1,12 @@
using System;
using System.Collections.Generic;
using BlueWater.Audios;
using UnityEngine;
namespace BlueWater.Maps
{
public class MapManager : Singleton<MapManager>
{
[field: SerializeField]
public FirstTutorialMapController FirstTutorialMapController { get; private set; }
[field: SerializeField]
public TitanSlimeMapController TitanSlimeMapController { get; private set; }
@ -16,45 +15,74 @@ namespace BlueWater.Maps
[field: SerializeField]
public SandMoleMapController SandMoleMapController { get; private set; }
private List<MapController> _mapControllers;
private MapController _currentMapController;
public void InitializeMap()
protected override void OnAwake()
{
MapController newMapController = null;
switch (DataManager.Instance.CurrentSaveStage)
_mapControllers = new List<MapController>(3)
{
TitanSlimeMapController,
RhinocerosMapController,
SandMoleMapController
};
}
// public void InitializeMap()
// {
// if (_currentMapController != null)
// {
// _currentMapController.AllDestroyObjects();
// }
//
// _currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage);
// if (_currentMapController != null)
// {
// _currentMapController.InitializeMap();
// }
// }
public MapController GetMapController(SaveStage saveStage)
{
switch (saveStage)
{
case SaveStage.None:
break;
case SaveStage.FirstTutorial:
newMapController = FirstTutorialMapController;
break;
case SaveStage.SecondTutorial:
//MapController = FindAnyObjectByType<SecondTutorialMapController>();
break;
return null;
case SaveStage.TitanSlime:
newMapController = TitanSlimeMapController;
break;
return TitanSlimeMapController;
case SaveStage.Rhinoceros:
newMapController = RhinocerosMapController;
break;
return RhinocerosMapController;
case SaveStage.SandMole:
newMapController = SandMoleMapController;
break;
return SandMoleMapController;
default:
throw new ArgumentOutOfRangeException();
}
if (_currentMapController != null)
{
_currentMapController.AllDestroyObjects();
}
}
_currentMapController = newMapController;
public void HardResetAllMaps()
{
foreach (var element in _mapControllers)
{
element.ResetMap(true);
}
AudioManager.Instance.StopBgm();
}
public void CurrentMapRestart()
{
if (_currentMapController != null)
{
_currentMapController.InitializeMap();
_currentMapController.ResetMap();
}
_currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage);
_currentMapController.RestartMap();
}
public void MoveSelectStage(int stage)
{
var moveMapController = GetMapController((SaveStage)stage);
moveMapController.MovePlayer();
}
}
}

View File

@ -0,0 +1,58 @@
using System.Collections;
using BlueWater.Uis;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Maps
{
public class MapPortal : MonoBehaviour
{
[SerializeField]
private Collider _collider;
[SerializeField, Required]
private Transform _targetTransform;
[SerializeField]
private Vector2 _fadeInOutTime = new(1f, 1f);
[SerializeField]
private float _delayAfterFadeIn = 0.5f;
[SerializeField]
private Color _fadeColor = new(0f, 0f, 0f, 0f);
private Coroutine _portalCoroutineInstance;
private void Awake()
{
InitializeComponents();
}
[Button("컴포넌트 초기화")]
private void InitializeComponents()
{
_collider = GetComponent<Collider>();
}
private void OnTriggerEnter(Collider other)
{
if (!other.CompareTag("Player") || !_targetTransform) return;
Utils.StartUniqueCoroutine(this, ref _portalCoroutineInstance, PortalCoroutine(other));
}
private IEnumerator PortalCoroutine(Collider other)
{
PlayerInputKeyManager.Instance.DisableCurrentPlayerInput();
CombatUiManager.Instance.FadeInOut(_fadeInOutTime.x, _fadeInOutTime.y, _fadeColor, _delayAfterFadeIn);
yield return new WaitForSeconds(_fadeInOutTime.x);
other.transform.position = _targetTransform.position;
yield return new WaitForSeconds(_delayAfterFadeIn + _fadeInOutTime.y);
PlayerInputKeyManager.Instance.EnableCurrentPlayerInput();
}
}
}

View File

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

View File

@ -0,0 +1,23 @@
using System;
using UnityEngine;
namespace BlueWater.Maps
{
public class NormalMapTrigger : MonoBehaviour
{
public Action OnPlayerEntrance;
private void OnTriggerEnter(Collider other)
{
if (!other.CompareTag("Player")) return;
gameObject.SetActive(false);
OnPlayerEntrance?.Invoke();
}
public void ResetTrigger()
{
gameObject.SetActive(true);
}
}
}

View File

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

View File

@ -22,10 +22,10 @@ namespace BlueWater.Maps
random2 = Random.Range(0, MiniSandMoleSpawnTransforms.Count);
} while (random2 == random1);
var miniSandMole1 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random1].position, EnemyInstantiateLocation);
var miniSandMole1 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random1].position, EnemyInstanceLocation);
miniSandMole1.Initialize();
var miniSandMole2 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random2].position, EnemyInstantiateLocation);
var miniSandMole2 = EnemyManager.Instance.InstantiateMiniSandMole(MiniSandMoleSpawnTransforms[random2].position, EnemyInstanceLocation);
miniSandMole2.Initialize();
}
}

View File

@ -9,14 +9,14 @@ namespace BlueWater.Maps
{
protected override void InitializeBoss()
{
EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstantiateLocation);
EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstanceLocation);
}
protected override IEnumerator MapClearCoroutine()
protected override IEnumerator ClearMapCoroutine()
{
AllDestroyEnemy();
DestroyAllEnemies();
VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
CombatUiManager.Instance.FadeInOut();
CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y);
var elapsedTime = 0f;
while (elapsedTime <= 3f)
@ -24,7 +24,7 @@ namespace BlueWater.Maps
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
AllDestroyEnemy();
DestroyAllEnemies();
VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
elapsedTime = 0f;
@ -34,7 +34,8 @@ namespace BlueWater.Maps
yield return null;
}
CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList);
OpenMapEntrances();
//CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList);
}
}
}

View File

@ -747,6 +747,15 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "Interaction",
"type": "Button",
"id": "2959a0ad-c73e-43b1-b98e-9917868b2a9a",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "ActivateMainSkill",
"type": "Button",
@ -765,6 +774,15 @@
"interactions": "",
"initialStateCheck": false
},
{
"name": "OpenDevelopMenu",
"type": "Button",
"id": "a5d9ffcb-5c4f-4c6d-8335-9060bbea120a",
"expectedControlType": "",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "OpenItemInventory",
"type": "Button",
@ -864,6 +882,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "7ceb23c4-9187-46a0-af0b-96f4bc80ff62",
"path": "<Keyboard>/f",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "Interaction",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "2f54c74a-af50-485d-ac82-cd34a044f8f8",
@ -886,6 +915,17 @@
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "9cb03036-6749-4f46-a55c-d2167045de8a",
"path": "<Keyboard>/f1",
"interactions": "",
"processors": "",
"groups": ";Keyboard&Mouse",
"action": "OpenDevelopMenu",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "46591849-5c1e-4b83-b490-0a4ad29ed80f",

View File

@ -29,7 +29,7 @@ namespace BlueWater
{
if (_currentPlayerInput && _currentPlayerInput.enabled) return false;
//Debug.Log("CurrentPlayerInput가 할당되지 않았습니다.");
Debug.Log("CurrentPlayerInput가 할당되지 않았습니다.");
return true;
}
@ -56,7 +56,7 @@ namespace BlueWater
public void EnableCurrentPlayerInput()
{
if (IsNullCurrentPlayerInput()) return;
if (!_currentPlayerInput) return;
_currentPlayerInput.enabled = true;
}

View File

@ -54,7 +54,7 @@ namespace BlueWater
{
_sphereCollider.enabled = false;
_startPosition = transform.position;
SpawnLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation;
SpawnLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation;
_hitColliders = new Collider[4];
BasicSetting();

View File

@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
<Name>k__BackingField: Rhinoceros
<DisplayName>k__BackingField: "\uCF54\uBFD4\uC18C"
<CharacterIdx>k__BackingField: 2
<MaxHealthPoint>k__BackingField: 700
<TargetLayer>k__BackingField:
serializedVersion: 2

View File

@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
<Name>k__BackingField: SandMole
<DisplayName>k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0"
<CharacterIdx>k__BackingField: 3
<MaxHealthPoint>k__BackingField: 1000
<TargetLayer>k__BackingField:
serializedVersion: 2

View File

@ -14,6 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
<Name>k__BackingField: TitanSlime
<DisplayName>k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784"
<CharacterIdx>k__BackingField: 1
<MaxHealthPoint>k__BackingField: 0
<TargetLayer>k__BackingField:
serializedVersion: 2

View File

@ -10,7 +10,7 @@ MonoBehaviour:
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f7fe40513dd0a794689cc8a52ddb2f87, type: 3}
m_Name: ItemTable
m_Name: ItemDataTable
m_EditorClassIdentifier:
<ItemDataList>k__BackingField:
- <Idx>k__BackingField: 10101
@ -19,341 +19,402 @@ MonoBehaviour:
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10102
<Name>k__BackingField: "\uACF5\uB8E1 \uACE0\uAE30"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10103
<Name>k__BackingField: "\uB7A8\uACE0\uAE30"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10104
<Name>k__BackingField: "\uB2ED\uACE0\uAE30"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10105
<Name>k__BackingField: "\uBC40\uACE0\uAE30"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10106
<Name>k__BackingField: "\uCF54\uBFD4\uC18C \uBFD4"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10107
<Name>k__BackingField: "\uCF54\uBFD4\uC18C \uB2E4\uB9AC\uC0B4"
<Category>k__BackingField: 1
<Type>k__BackingField: 1
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10201
<Name>k__BackingField: "\uBC31\uC0C1\uC5B4"
<Category>k__BackingField: 1
<Type>k__BackingField: 2
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10202
<Name>k__BackingField: "\uB2C8\uBAA8"
<Category>k__BackingField: 1
<Type>k__BackingField: 2
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10203
<Name>k__BackingField: "\uD574\uD30C\uB9AC"
<Category>k__BackingField: 1
<Type>k__BackingField: 2
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10204
<Name>k__BackingField: "\uAC00\uC624\uB9AC"
<Category>k__BackingField: 1
<Type>k__BackingField: 2
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10205
<Name>k__BackingField: "\uC6B0\uB7ED"
<Category>k__BackingField: 1
<Type>k__BackingField: 2
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10301
<Name>k__BackingField: "\uB370\uC2A4\uB3C4\uC5B4\uC758 \uC54C"
<Category>k__BackingField: 1
<Type>k__BackingField: 3
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10302
<Name>k__BackingField: "\uACF5\uB8E1\uC54C"
<Category>k__BackingField: 1
<Type>k__BackingField: 3
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10401
<Name>k__BackingField: "\uBA54\uB860"
<Category>k__BackingField: 1
<Type>k__BackingField: 4
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10402
<Name>k__BackingField: "\uD1A0\uB9C8\uD1A0"
<Category>k__BackingField: 1
<Type>k__BackingField: 4
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10403
<Name>k__BackingField: "\uC0AC\uACFC"
<Category>k__BackingField: 1
<Type>k__BackingField: 4
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10404
<Name>k__BackingField: "\uB808\uBAAC"
<Category>k__BackingField: 1
<Type>k__BackingField: 4
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10405
<Name>k__BackingField: "\uD1A0\uB9C8\uD1A0"
<Category>k__BackingField: 1
<Type>k__BackingField: 4
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10501
<Name>k__BackingField: "\uB9C8\uB298"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10502
<Name>k__BackingField: "\uC591\uD30C"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10503
<Name>k__BackingField: "\uB300\uD30C"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10504
<Name>k__BackingField: "\uD30C\uC2AC\uB9AC"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10505
<Name>k__BackingField: "\uB2E4\uC2DC\uB9C8"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10506
<Name>k__BackingField: "\uD30C\uD504\uB9AC\uCE74"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10507
<Name>k__BackingField: "\uBC30\uCD94"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10508
<Name>k__BackingField: "\uBE0C\uB85C\uCF5C\uB9AC"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10509
<Name>k__BackingField: "\uAE7B\uC78E"
<Category>k__BackingField: 1
<Type>k__BackingField: 5
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10601
<Name>k__BackingField: "\uC9C4\uC8FC \uC870\uAC1C"
<Category>k__BackingField: 1
<Type>k__BackingField: 6
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10602
<Name>k__BackingField: "\uBC14\uB2E4 \uC870\uAC1C"
<Category>k__BackingField: 1
<Type>k__BackingField: 6
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10603
<Name>k__BackingField: "\uAC70\uB300 \uC870\uAC1C"
<Category>k__BackingField: 1
<Type>k__BackingField: 6
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10701
<Name>k__BackingField: "\uC18C\uAE08"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10702
<Name>k__BackingField: "\uACE0\uCDA7\uAC00\uB8E8"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10703
<Name>k__BackingField: "\uD6C4\uCD94"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10704
<Name>k__BackingField: "\uAC04\uC7A5"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10705
<Name>k__BackingField: "\uBC84\uD130"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 10706
<Name>k__BackingField: "\uC124\uD0D5"
<Category>k__BackingField: 1
<Type>k__BackingField: 7
<Price>k__BackingField: 100
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 20001
<Name>k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uB3D9)"
<Category>k__BackingField: 2
<Type>k__BackingField: 0
<Price>k__BackingField: 500
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 20002
<Name>k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uC740)"
<Category>k__BackingField: 2
<Type>k__BackingField: 0
<Price>k__BackingField: 1000
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 20003
<Name>k__BackingField: "\uBCF4\uBB3C \uC0C1\uC790 (\uAE08)"
<Category>k__BackingField: 2
<Type>k__BackingField: 0
<Price>k__BackingField: 2000
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 20004
<Name>k__BackingField: "\uBBF8\uBBF9"
<Category>k__BackingField: 2
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 100
<Sprite>k__BackingField: {fileID: 0}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 30201
<Name>k__BackingField: "\uCF54\uCF54\uB11B\uAC8C\uC0B4\uC2A4\uD29C"
<Category>k__BackingField: 3
<Type>k__BackingField: 2
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 21300000, guid: 03de9c442181996409543cd79d5bfff3, type: 3}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 40001
<Name>k__BackingField: "\uB9E5\uC8FC"
<Category>k__BackingField: 4
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Sprite>k__BackingField: {fileID: 1484297983, guid: 392baff6d0b9a054fb64806241db3101, type: 3}
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
- <Idx>k__BackingField: 50001
<Name>k__BackingField: "\uD558\uD2B8 \uBC18 \uAC1C"
<Category>k__BackingField: 5
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3}
<ItemPrefab>k__BackingField: {fileID: 8962896418303621511, guid: 0dc7ed0facf2fca4b80244d0d95e2557, type: 3}
- <Idx>k__BackingField: 50002
<Name>k__BackingField: "\uD558\uD2B8 \uD55C \uAC1C"
<Category>k__BackingField: 5
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3}
<ItemPrefab>k__BackingField: {fileID: 8962896418303621511, guid: 66d94bc59db241a4895f8e4fff7ea201, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ec425583030e16d4dacc21b64f467bd1
guid: d7011c71193e95743aa868ca1bea6010
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

View File

@ -9,121 +9,71 @@ MonoBehaviour:
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 027aabcea812200499455b126674dacd, type: 3}
m_Script: {fileID: 11500000, guid: 9b4027f974cd5234690df1b35ca492ac, type: 3}
m_Name: ItemDropTable
m_EditorClassIdentifier:
<ItemDropTableList>k__BackingField:
- <Idx>k__BackingField: 1000001
<Name>k__BackingField: "\uB2C8\uBAA8"
<ItemIdx1>k__BackingField: 10202
<ItemProb1>k__BackingField: 100
<ItemMin1>k__BackingField: 1
<ItemMax1>k__BackingField: 3
<ItemIdx2>k__BackingField: 10701
<ItemProb2>k__BackingField: 80
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 1
<ItemIdx3>k__BackingField: 0
<ItemProb3>k__BackingField: 0
<ItemMin3>k__BackingField: 0
<ItemMax3>k__BackingField: 0
<ItemIdx4>k__BackingField: 0
<ItemProb4>k__BackingField: 0
<ItemMin4>k__BackingField: 0
<ItemMax4>k__BackingField: 0
<Description>k__BackingField:
- <Idx>k__BackingField: 1000002
<Name>k__BackingField: "\uC0C1\uC5B4"
<ItemIdx1>k__BackingField: 10201
<ItemProb1>k__BackingField: 100
<ItemMin1>k__BackingField: 1
<ItemMax1>k__BackingField: 5
<ItemIdx2>k__BackingField: 10702
<ItemProb2>k__BackingField: 70
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 2
<ItemIdx3>k__BackingField: 0
<ItemProb3>k__BackingField: 0
<ItemMin3>k__BackingField: 0
<ItemMax3>k__BackingField: 0
<ItemIdx4>k__BackingField: 0
<ItemProb4>k__BackingField: 0
<ItemMin4>k__BackingField: 0
<ItemMax4>k__BackingField: 0
<Description>k__BackingField:
- <Idx>k__BackingField: 1000003
<Name>k__BackingField: "\uAC00\uC624\uB9AC"
<ItemIdx1>k__BackingField: 10204
<ItemProb1>k__BackingField: 100
<ItemMin1>k__BackingField: 3
<ItemMax1>k__BackingField: 5
<ItemIdx2>k__BackingField: 10703
<ItemProb2>k__BackingField: 50
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 3
<ItemIdx3>k__BackingField: 0
<ItemProb3>k__BackingField: 0
<ItemMin3>k__BackingField: 0
<ItemMax3>k__BackingField: 0
<ItemIdx4>k__BackingField: 0
<ItemProb4>k__BackingField: 0
<ItemMin4>k__BackingField: 0
<ItemMax4>k__BackingField: 0
<Description>k__BackingField:
- <Idx>k__BackingField: 2000001
<Name>k__BackingField: "\uC791\uC740 \uC220\uD1B5"
<ItemIdx1>k__BackingField: 20001
<ItemProb1>k__BackingField: 80
<ItemMin1>k__BackingField: 1
<ItemMax1>k__BackingField: 1
<ItemIdx2>k__BackingField: 20002
<ItemProb2>k__BackingField: 50
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 1
<ItemIdx3>k__BackingField: 0
<ItemProb3>k__BackingField: 0
<ItemMin3>k__BackingField: 0
<ItemMax3>k__BackingField: 0
<ItemIdx4>k__BackingField: 0
<ItemProb4>k__BackingField: 0
<ItemMin4>k__BackingField: 0
<ItemMax4>k__BackingField: 0
<Description>k__BackingField:
- <Idx>k__BackingField: 2000002
<Name>k__BackingField: "\uD070 \uC220\uD1B5"
<ItemIdx1>k__BackingField: 20002
<ItemProb1>k__BackingField: 80
<ItemMin1>k__BackingField: 1
<ItemMax1>k__BackingField: 1
<ItemIdx2>k__BackingField: 20003
<ItemProb2>k__BackingField: 50
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 1
<ItemIdx3>k__BackingField: 0
<ItemProb3>k__BackingField: 0
<ItemMin3>k__BackingField: 0
<ItemMax3>k__BackingField: 0
<ItemIdx4>k__BackingField: 0
<ItemProb4>k__BackingField: 0
<ItemMin4>k__BackingField: 0
<ItemMax4>k__BackingField: 0
<Description>k__BackingField:
- <Idx>k__BackingField: 3000001
<Name>k__BackingField: "\uC624\uD06C"
<ItemIdx1>k__BackingField: 10102
<ItemProb1>k__BackingField: 100
<ItemMin1>k__BackingField: 1
<ItemMax1>k__BackingField: 5
<ItemIdx2>k__BackingField: 20001
<ItemProb2>k__BackingField: 30
<ItemMin2>k__BackingField: 1
<ItemMax2>k__BackingField: 1
<ItemIdx3>k__BackingField: 20002
<ItemProb3>k__BackingField: 20
<ItemMin3>k__BackingField: 1
<ItemMax3>k__BackingField: 1
<ItemIdx4>k__BackingField: 20003
<ItemProb4>k__BackingField: 10
<ItemMin4>k__BackingField: 1
<ItemMax4>k__BackingField: 1
<Description>k__BackingField:
ItemDropTables:
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 1
<Name>k__BackingField: "\uD0C0\uC774\uD0C4 \uC2AC\uB77C\uC784"
<DropItems>k__BackingField:
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50001
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 2
<Name>k__BackingField: "\uCF54\uBFD4\uC18C"
<DropItems>k__BackingField:
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50001
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 3
<Name>k__BackingField: "\uBAA8\uB798 \uB450\uB354\uC9C0"
<DropItems>k__BackingField:
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50001
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <CharacterData>k__BackingField:
<CharacterIdx>k__BackingField: 4
<Name>k__BackingField: "\uC720\uB839 \uC220\uD1B5"
<DropItems>k__BackingField:
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50002
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1
- <ItemIdx>k__BackingField: 50001
<DropRate>k__BackingField: 100
<QuantityMin>k__BackingField: 1
<QuantityMax>k__BackingField: 1

View File

@ -45,7 +45,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills
_rhinoceros = SkillUser.GetComponent<Rhinoceros>();
_animationController = _rhinoceros.AnimationController;
_targetCollider = _rhinoceros.Target;
_particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation;
_particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstanceLocation;
}
_meteorSwingData = (MeteorSwingData)SkillData;
HitColliders = new Collider[4];

View File

@ -46,7 +46,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros.Skills
{
_rhinoceros = SkillUser.GetComponent<Rhinoceros>();
_targetCollider = _rhinoceros.Target;
_particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstantiateLocation;
_particleInstantiateLocation = _rhinoceros.BossMapController.ParticleInstanceLocation;
}
_seismicThrustData = (SeismicThrustData)SkillData;
RaycastHits = new RaycastHit[4];

View File

@ -28,7 +28,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
_animationController = _sandMole.AnimationController;
_userCollider = _sandMole.CharacterCollider;
_targetCollider = _sandMole.Target;
_particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation;
_particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation;
}
_gateOfSpikesData = (GateOfSpikesData)SkillData;
_spikes = new List<Vector3>(_gateOfSpikesData.SpikeCount);

View File

@ -21,7 +21,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
_sandMole = SkillUser.GetComponent<SandMole>();
_animationController = _sandMole.AnimationController;
_targetCollider = _sandMole.Target;
_particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstantiateLocation;
_particleInstantiateLocation = MapManager.Instance.SandMoleMapController.ParticleInstanceLocation;
}
_multiThrowSpikesData = (MultiThrowSpikesData)SkillData;

View File

@ -184,7 +184,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
+ -targetDirection * _singleRollData.RockfallInterval * i
+ Vector3.up * _singleRollData.RockfallSpawnHeight;
spawnPosition += Vector3.Cross(-targetDirection, Vector3.up).normalized * randomSide;
Instantiate(_singleRollData.RockfallPrefab, spawnPosition, Quaternion.identity, _sandMoleMapController.ParticleInstantiateLocation);
Instantiate(_singleRollData.RockfallPrefab, spawnPosition, Quaternion.identity, _sandMoleMapController.ParticleInstanceLocation);
}
}

View File

@ -31,7 +31,7 @@ namespace BlueWater.Enemies.Bosses.SandMole.Skills
_targetCollider = SkillUser.GetComponent<ITarget>().Target;
_userSpriteRenderer = SkillUser.GetComponentInChildren<SpriteRenderer>();
_sandMoleMapController = MapManager.Instance.SandMoleMapController;
_particleInstantiateLocation = _sandMoleMapController.ParticleInstantiateLocation;
_particleInstantiateLocation = _sandMoleMapController.ParticleInstanceLocation;
_centerSpawnTransform = _sandMoleMapController.CenterSpawnTransform;
_spikeBarrageData = (SpikeBarrageData)SkillData;

View File

@ -230,12 +230,12 @@ namespace BlueWater.Items
break;
case InventorySortingType.Name:
_itemSlotUiList.Sort((x, y) =>
string.Compare(ItemManager.Instance.ItemDictionary[x.ItemSlot.Idx].Name,
ItemManager.Instance.ItemDictionary[y.ItemSlot.Idx].Name, StringComparison.Ordinal));
string.Compare(ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Name,
ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Name, StringComparison.Ordinal));
break;
case InventorySortingType.Category:
_itemSlotUiList.Sort((x, y) =>
ItemManager.Instance.ItemDictionary[x.ItemSlot.Idx].Category.CompareTo(ItemManager.Instance.ItemDictionary[y.ItemSlot.Idx].Category));
ItemManager.Instance.GetItemDataByIdx(x.ItemSlot.Idx).Category.CompareTo(ItemManager.Instance.GetItemDataByIdx(y.ItemSlot.Idx).Category));
break;
case InventorySortingType.Count:
_itemSlotUiList.Sort((x, y) => y.ItemSlot.Count.CompareTo(x.ItemSlot.Count));

View File

@ -1,4 +1,3 @@
using System.Collections;
using Sirenix.OdinInspector;
using UnityEngine;
@ -14,6 +13,8 @@ namespace BlueWater.Uis
public class CombatTutorialUi : MonoBehaviour
{
private static bool _isCompletedTutorial;
[SerializeField]
private GameObject _firstTutorialUi;
@ -31,6 +32,8 @@ namespace BlueWater.Uis
public void ShowFirstTutorialUi()
{
if (_isCompletedTutorial) return;
PlayerInputKeyManager.Instance.DisableAllActionMaps();
gameObject.SetActive(true);
_firstTutorialUi.SetActive(true);
@ -61,10 +64,11 @@ namespace BlueWater.Uis
_firstTutorialUi.SetActive(false);
_secondTutorialUi.SetActive(false);
CurrentTutorialState = TutorialState.End;
_isCompletedTutorial = true;
//PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat);
PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.Combat);
//PlayerInputKeyManager.Instance.EnableAllActions();
CombatUiManager.Instance.MoveSelectStage((int)SaveStage.FirstTutorial);
//CombatUiManager.Instance.MoveSelectStage((int)SaveStage.FirstTutorial);
}
}
}

View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using BlueWater.Items;
using BlueWater.Maps;
@ -16,6 +15,9 @@ namespace BlueWater.Uis
[field: SerializeField]
public Canvas MainCanvas { get; private set; }
[field: SerializeField]
public RectTransform MainCanvasRect { get; private set; }
[field: SerializeField]
public CombatSkillUi CombatSkillUi { get; private set; }
@ -43,12 +45,11 @@ namespace BlueWater.Uis
[field: SerializeField]
public CombatTutorialUi CombatTutorialUi { get; private set; }
[field: SerializeField]
public MenuPopupUi DevelopMenuPopupUi { get; private set; }
[SerializeField]
private Image _fadeImage;
[Title("효과")]
[SerializeField]
private Vector2 _fadeInOutDuration = new(0.2f, 0.3f);
public List<PopupUi> PopupUiList { get; private set; }
@ -56,15 +57,12 @@ namespace BlueWater.Uis
{
InitializeComponents();
}
private void OnEnable()
{
PopupUi.OnPopupUiOpenEvent += RegisterPopup;
PopupUi.OnPopupUiCloseEvent += UnregisterPopup;
}
private void Start()
{
PopupUi.OnPopupUiOpenEvent += RegisterPopup;
PopupUi.OnPopupUiCloseEvent += UnregisterPopup;
Invoke(nameof(StartTutorial), 0.1f);
}
@ -73,8 +71,10 @@ namespace BlueWater.Uis
CombatTutorialUi.ShowFirstTutorialUi();
}
private void OnDisable()
private void OnDestroy()
{
if (Quitting) return;
PopupUi.OnPopupUiOpenEvent -= RegisterPopup;
PopupUi.OnPopupUiCloseEvent -= UnregisterPopup;
}
@ -83,6 +83,7 @@ namespace BlueWater.Uis
private void InitializeComponents()
{
MainCanvas = GetComponent<Canvas>();
MainCanvasRect = MainCanvas.GetComponent<RectTransform>();
CombatSkillUi = MainCanvas.transform.Find("CombatSkillUi").GetComponent<CombatSkillUi>();
FieldBossHealthPointUi = MainCanvas.transform.Find("FieldBossHealthPointUi").GetComponent<FieldBossHealthPointUi>();
PlayerHealthPointUi = MainCanvas.transform.Find("PlayerHealthPointUi").GetComponent<PlayerHealthPointUi>();
@ -92,6 +93,7 @@ namespace BlueWater.Uis
ClearPopupUi = MainCanvas.transform.Find("ClearPopupUi").GetComponent<ClearPopupUi>();
CombatMenuPopupUi = MainCanvas.transform.Find("CombatMenuPopupUi").GetComponent<MenuPopupUi>();
CombatTutorialUi = MainCanvas.transform.Find("CombatTutorialUi").GetComponent<CombatTutorialUi>();
DevelopMenuPopupUi = MainCanvas.transform.Find("DevelopMenuPopupUi").GetComponent<MenuPopupUi>();
_fadeImage = MainCanvas.transform.Find("FadeImage").GetComponent<Image>();
PopupUiList = new List<PopupUi>(8);
@ -132,35 +134,43 @@ namespace BlueWater.Uis
PopupUiList.Clear();
}
public void FadeInOut()
public void FadeInOut(float fadeInTime, float fadeOutTime, Color? fadeColor = null, float delayAfterFadeIn = 0f)
{
_fadeImage.enabled = true;
_fadeImage.color = new Color(1, 1, 1, 0);
_fadeImage.DOFade(1f, _fadeInOutDuration.x).OnComplete(() =>
var newColor = new Color(1f, 1f, 1f, 0f);
if (fadeColor != null)
{
_fadeImage.DOFade(0f, _fadeInOutDuration.y).OnComplete(() =>
newColor = (Color)fadeColor;
}
_fadeImage.color = newColor;
_fadeImage.enabled = true;
_fadeImage.DOFade(1f, fadeInTime).OnComplete(() =>
{
DOVirtual.DelayedCall(delayAfterFadeIn, () =>
{
_fadeImage.enabled = false;
_fadeImage.DOFade(0f, fadeOutTime).OnComplete(() =>
{
_fadeImage.enabled = false;
});
});
});
}
public void HardResetAllMaps()
{
MapManager.Instance.HardResetAllMaps();
CloseAllPopup();
}
public void RestartCurrentStage()
{
MapManager.Instance.InitializeMap();
MapManager.Instance.CurrentMapRestart();
CloseAllPopup();
}
public void MoveNextStage()
{
DataManager.Instance.CurrentSaveStage++;
RestartCurrentStage();
}
public void MoveSelectStage(int stage)
{
DataManager.Instance.CurrentSaveStage = (SaveStage)stage;
RestartCurrentStage();
MapManager.Instance.MoveSelectStage(stage);
CloseAllPopup();
}
public void MoveTitleScene()

View File

@ -50,7 +50,7 @@ namespace BlueWater.Uis
_removeType = RemoveType.Single;
_selectedList.Clear();
_selectedList.Add(selectedSlot);
_contentText.text = ItemManager.Instance.ItemDictionary[selectedSlot.ItemSlot.Idx].Name + "을(를) 버리시겠습니까?";
_contentText.text = ItemManager.Instance.GetItemDataByIdx(selectedSlot.ItemSlot.Idx).Name + "을(를) 버리시겠습니까?";
_currentCount = 1;
_countText.text = _currentCount.ToString();

View File

@ -47,7 +47,7 @@ namespace BlueWater.Uis
public void UpdateData(ItemSlot itemSlot)
{
var item = ItemManager.Instance.ItemDictionary[itemSlot.Idx];
var item = ItemManager.Instance.GetItemDataByIdx(itemSlot.Idx);
_image.sprite = item.Sprite;
_nameText.text = item.Name;
_weightText.text = item.Weight * ItemSlot.Count + "kg";

BIN
Assets/03.Images/Fire.jpg Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 9be7ccef6923b9a4bb8517ca399f8875
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 1024
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 MiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 3dc6e21aa8674b7439c33b913a15a7ff
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
spritePivot: {x: 0.49, y: 0.5}
spritePixelsToUnits: 2048
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.1 MiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: fbb146e2be969a54e9c727ddb7f9e376
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
spritePivot: {x: 0.49, y: 0.5}
spritePixelsToUnits: 2048
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 MiB

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: b6927a0b762f1fd4f8c09b527a12b12e
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 9
spritePivot: {x: 0.49, y: 0.5}
spritePixelsToUnits: 2048
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Android
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: WindowsStoreApps
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -46,8 +46,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5, y: 0.12}
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
@ -127,7 +127,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

View File

@ -46,8 +46,8 @@ TextureImporter:
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
alignment: 9
spritePivot: {x: 0.5, y: 0.12}
spritePixelsToUnits: 256
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1

View File

@ -1,5 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-6618167929957125877
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
@ -7,8 +20,8 @@ Material:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: SpriteTest
m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
m_Name: MapEntrance
m_Shader: {fileID: -6465566751694194690, guid: e554a7f1a3b4f9b40bb81cc2c27d2ef4, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
@ -20,14 +33,10 @@ Material:
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_LockedProperties: _DissolveScale
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -53,21 +62,13 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 9be7ccef6923b9a4bb8517ca399f8875, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -80,6 +81,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SubTex:
m_Texture: {fileID: 2800000, guid: 6701bfb8e762cd54e96d8dc1a763d942, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@ -94,7 +99,6 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- PixelSnap: 0
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
@ -107,9 +111,12 @@ Material:
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DissolveAmount: 2
- _DissolveScale: 2
- _DistortionAmount: 0.5
- _DistortionScale: 5
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnableExternalAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
@ -117,6 +124,7 @@ Material:
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
@ -129,23 +137,10 @@ Material:
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 6.961862, g: 16.020674, b: 2.4324582, a: 0}
- _DissolveSpeed: {r: 0.1, g: -0.2, b: 0, a: 0}
- _DistortionSpeed: {r: -0.2, g: 0.1, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &5626841901917671979
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: d9661228028579246b04396b50448874
guid: 61bcb80cd058c0b46820a9bdbd18bd7f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000

View File

@ -1,142 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8726976126742831339
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Test
m_Shader: {fileID: -6465566751694194690, guid: 835dd53a78c02664c864a5a31c79c4c5, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2501
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: d2d7eac4c6fe70241884aa288e039d1c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossinessSource: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _SampleGI: 0
- _Shininess: 0
- _Smoothness: 0.5
- _SmoothnessSource: 0
- _SmoothnessTextureChannel: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -1,154 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8726976126742831339
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Test2
m_Shader: {fileID: -6465566751694194690, guid: e7e53e9fe92507d4fb6c701e11403155, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 2800000, guid: d2d7eac4c6fe70241884aa288e039d1c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _FillMap:
m_Texture: {fileID: 2800000, guid: be3dc57a3e6cfff46a6f38321763456e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _IndicatorMap:
m_Texture: {fileID: 2800000, guid: ed7005bcdc79d774d866653ff8a0c6a0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 702bd7ea217003e47be28d81a79dd99c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 1
- _AlphaToMask: 1
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BlendOp: 0
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 0
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _Fill: 0
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossinessSource: 0
- _GlossyReflections: 0
- _Intensity: 1
- _Metallic: 0
- _OcclusionStrength: 1
- _Opacity: 1
- _Parallax: 0.005
- _QueueControl: 1
- _QueueOffset: 0
- _ReceiveShadows: 1
- _RotationSpeed: 10
- _SampleGI: 0
- _Shininess: 0
- _Smoothness: 0.5
- _SmoothnessSource: 0
- _SmoothnessTextureChannel: 0
- _SpecSource: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 0
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@ -261,9 +261,9 @@ Rigidbody:
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Interpolate: 1
m_Constraints: 112
m_CollisionDetection: 0
m_CollisionDetection: 2
--- !u!136 &4832858849328938018
CapsuleCollider:
m_ObjectHideFlags: 0

View File

@ -77,7 +77,7 @@ GameObject:
- component: {fileID: 7608738450534251423}
m_Layer: 9
m_Name: CombatPlayer
m_TagString: Untagged
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -343,6 +343,78 @@ MonoBehaviour:
m_Calls: []
m_ActionId: 70079543-a5e9-4137-85af-1ad206da8794
m_ActionName: 'CombatTitle/MoveScene[/Keyboard/anyKey,/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 66824a18-0819-44a4-92c2-6395511e3d0d
m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 93ed1c14-2900-4d30-91fb-a9f2353a9540
m_ActionName: 'UI/Submit[/Keyboard/enter]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 3c7c74ba-0c86-4e21-ab91-2b1e674cf243
m_ActionName: 'UI/Cancel[/Keyboard/escape]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 52083aa7-62f5-41d7-b37e-4db100ef2cda
m_ActionName: 'UI/Point[/Mouse/position]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 42e6067b-0d00-4787-92d8-ddf60510de83
m_ActionName: 'UI/Click[/Mouse/leftButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 30ef3965-cc51-452e-8df9-6a3567a53f4d
m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: b99f7e4b-30f0-4936-9e55-c383951d6f58
m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 4849bf4c-7b3b-43c4-8bbf-7178f536fb94
m_ActionName: 'UI/RightClick[/Mouse/rightButton]'
- m_PersistentCalls:
m_Calls: []
m_ActionId: 49ed4722-bfe5-47b7-b724-008d9ca57edc
m_ActionName: UI/TrackedDevicePosition
- m_PersistentCalls:
m_Calls: []
m_ActionId: 7f4f45c6-67b1-47bf-9a74-fea6f6b5fde1
m_ActionName: UI/TrackedDeviceOrientation
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 522031830802304584}
m_TargetAssemblyTypeName: BlueWater.Players.Combat.CombatInput, Assembly-CSharp
m_MethodName: OnInteraction
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: 2959a0ad-c73e-43b1-b98e-9917868b2a9a
m_ActionName: 'Combat/Interaction[/Keyboard/f]'
- m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 522031830802304584}
m_TargetAssemblyTypeName: BlueWater.Players.Combat.CombatInput, Assembly-CSharp
m_MethodName: OnOpenDevelopMenu
m_Mode: 0
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
m_ActionId: a5d9ffcb-5c4f-4c6d-8335-9060bbea120a
m_ActionName: 'Combat/OpenDevelopMenu[/Keyboard/f1]'
m_NeverAutoSwitchControlSchemes: 0
m_DefaultControlScheme:
m_DefaultActionMap: Combat
@ -387,6 +459,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_playerInput: {fileID: 6401154187219196241}
InteractionRadius: 2
_interactionUiOffset: {x: 0, y: 1.5, z: 0}
--- !u!114 &181082763061672982
MonoBehaviour:
m_ObjectHideFlags: 0
@ -529,7 +603,6 @@ MonoBehaviour:
_maskLayer:
serializedVersion: 2
m_Bits: 1024
_material: {fileID: 2100000, guid: 1ad7e8b18587eb64b98d1c75db32dc5a, type: 2}
--- !u!1 &7185106063436424164
GameObject:
m_ObjectHideFlags: 0

View File

@ -0,0 +1,128 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2777433600211998119
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_Name
value: FullHeartItem
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
insertIndex: -1
addedObject: {fileID: 8962896418303621511}
m_SourcePrefab: {fileID: 100100000, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
--- !u!1 &62503137722364538 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8962896418303621511
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62503137722364538}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31ee4bedfcf364843a6f2665bec1c762, type: 3}
m_Name:
m_EditorClassIdentifier:
Rigidbody: {fileID: 6274307350954836457}
Collider: {fileID: 2848843651262022415}
VisualLook: {fileID: 5201300381511609034}
SpriteRenderer: {fileID: 4737084216554679565}
Canvas: {fileID: 2788422010916109769}
<EnableInteraction>k__BackingField: 1
UseAutoDestroy: 1
AutoDestroyTime: 30
DrawGizmos: 1
Radius: 5
AcquisitionTime: 1
AcquiredSfxName: GetItem
ItemData:
<Idx>k__BackingField: 0
<Name>k__BackingField:
<Category>k__BackingField: 0
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
_healingHealthPoint: 2
--- !u!223 &2788422010916109769 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2848843651262022415 stripped
BoxCollider:
m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!212 &4737084216554679565 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5201300381511609034 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7973014042992492397, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!54 &6274307350954836457 stripped
Rigidbody:
m_CorrespondingSourceObject: {fileID: 8185780986250253390, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}

View File

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

View File

@ -0,0 +1,132 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &2777433600211998119
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_Name
value: HalfHeartItem
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3930562537327335166, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 8de91ee4e8525bb46bb309c15c5207d3, type: 3}
m_RemovedComponents:
- {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
insertIndex: -1
addedObject: {fileID: 8962896418303621511}
m_SourcePrefab: {fileID: 100100000, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
--- !u!1 &62503137722364538 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8962896418303621511
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62503137722364538}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31ee4bedfcf364843a6f2665bec1c762, type: 3}
m_Name:
m_EditorClassIdentifier:
Rigidbody: {fileID: 6274307350954836457}
Collider: {fileID: 2848843651262022415}
VisualLook: {fileID: 5201300381511609034}
SpriteRenderer: {fileID: 4737084216554679565}
Canvas: {fileID: 2788422010916109769}
<EnableInteraction>k__BackingField: 1
UseAutoDestroy: 1
AutoDestroyTime: 30
DrawGizmos: 1
Radius: 5
AcquisitionTime: 1
AcquiredSfxName: GetItem
ItemData:
<Idx>k__BackingField: 0
<Name>k__BackingField:
<Category>k__BackingField: 0
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
_healingHealthPoint: 1
--- !u!223 &2788422010916109769 stripped
Canvas:
m_CorrespondingSourceObject: {fileID: 16072863968012398, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!65 &2848843651262022415 stripped
BoxCollider:
m_CorrespondingSourceObject: {fileID: 72705275807094440, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!212 &4737084216554679565 stripped
SpriteRenderer:
m_CorrespondingSourceObject: {fileID: 7437393363680573610, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5201300381511609034 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7973014042992492397, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}
--- !u!54 &6274307350954836457 stripped
Rigidbody:
m_CorrespondingSourceObject: {fileID: 8185780986250253390, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
m_PrefabInstance: {fileID: 2777433600211998119}
m_PrefabAsset: {fileID: 0}

View File

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

View File

@ -0,0 +1,557 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &316318118309449416
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 666340171847681576}
- component: {fileID: 16072863968012398}
- component: {fileID: 3466664881830510074}
- component: {fileID: 897534835685585813}
m_Layer: 13
m_Name: Canvas
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &666340171847681576
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 316318118309449416}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.01069167, y: 0.01069167, z: 0.01069167}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 482296371213806214}
m_Father: {fileID: 3930562537327335166}
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: 800, y: 600}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!223 &16072863968012398
Canvas:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 316318118309449416}
m_Enabled: 1
serializedVersion: 3
m_RenderMode: 2
m_Camera: {fileID: 0}
m_PlaneDistance: 100
m_PixelPerfect: 0
m_ReceivesEvents: 1
m_OverrideSorting: 0
m_OverridePixelPerfect: 0
m_SortingBucketNormalizedSize: 0
m_VertexColorAlwaysGammaSpace: 1
m_AdditionalShaderChannelsFlag: 25
m_UpdateRectTransformForStandalone: 0
m_SortingLayerID: 0
m_SortingOrder: 0
m_TargetDisplay: 0
--- !u!114 &3466664881830510074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 316318118309449416}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
m_FallbackScreenDPI: 96
m_DefaultSpriteDPI: 96
m_DynamicPixelsPerUnit: 1
m_PresetInfoIsWorld: 1
--- !u!114 &897534835685585813
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 316318118309449416}
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: 65535
--- !u!1 &1513751791682743921
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7973014042992492397}
- component: {fileID: 7437393363680573610}
m_Layer: 13
m_Name: VisualLook
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7973014042992492397
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513751791682743921}
serializedVersion: 2
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: 3930562537327335166}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &7437393363680573610
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1513751791682743921}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 4e2159443b5aedf43849ec062f4f8016, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 0.64, y: 0.64}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &2762223215237867485
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3930562537327335166}
- component: {fileID: 8185780986250253390}
- component: {fileID: 72705275807094440}
- component: {fileID: 1370112280380943697}
m_Layer: 13
m_Name: Item
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3930562537327335166
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2762223215237867485}
serializedVersion: 2
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: 7973014042992492397}
- {fileID: 666340171847681576}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!54 &8185780986250253390
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2762223215237867485}
serializedVersion: 4
m_Mass: 10
m_Drag: 0
m_AngularDrag: 0.05
m_CenterOfMass: {x: 0, y: 0, z: 0}
m_InertiaTensor: {x: 1, y: 1, z: 1}
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_ImplicitCom: 1
m_ImplicitTensor: 1
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 112
m_CollisionDetection: 0
--- !u!65 &72705275807094440
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2762223215237867485}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 0.25}
m_Center: {x: 0, y: 0.5, z: 0}
--- !u!114 &1370112280380943697
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2762223215237867485}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 619bc0c8098f9a841b08d6cf4d9c1e91, type: 3}
m_Name:
m_EditorClassIdentifier:
Rigidbody: {fileID: 8185780986250253390}
Collider: {fileID: 72705275807094440}
VisualLook: {fileID: 7973014042992492397}
SpriteRenderer: {fileID: 7437393363680573610}
Canvas: {fileID: 16072863968012398}
<EnableInteraction>k__BackingField: 1
UseAutoDestroy: 1
AutoDestroyTime: 30
DrawGizmos: 1
Radius: 5
AcquisitionTime: 1
AcquiredSfxName: GetItem
ItemData:
<Idx>k__BackingField: 0
<Name>k__BackingField:
<Category>k__BackingField: 0
<Type>k__BackingField: 0
<Price>k__BackingField: 0
<Weight>k__BackingField: 0
<Description>k__BackingField:
<Sprite>k__BackingField: {fileID: 0}
<ItemPrefab>k__BackingField: {fileID: 0}
--- !u!1 &2815016273565104219
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 226077220011295018}
- component: {fileID: 448025115665681541}
- component: {fileID: 1697045944594333697}
m_Layer: 5
m_Name: Text (TMP)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &226077220011295018
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2815016273565104219}
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: 6223355445657907225}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &448025115665681541
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2815016273565104219}
m_CullTransparentMesh: 1
--- !u!114 &1697045944594333697
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2815016273565104219}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: F
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 34.5
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
m_fontSizeMin: 18
m_fontSizeMax: 200
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1 &8111308071153146249
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 482296371213806214}
m_Layer: 5
m_Name: InteractionUi
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &482296371213806214
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8111308071153146249}
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: 1
m_Children:
- {fileID: 6223355445657907225}
m_Father: {fileID: 666340171847681576}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 120}
m_SizeDelta: {x: 50, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &8357987098767019228
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6223355445657907225}
- component: {fileID: 453554727717358886}
- component: {fileID: 1713988739707689781}
m_Layer: 5
m_Name: Circle
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &6223355445657907225
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8357987098767019228}
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: 226077220011295018}
m_Father: {fileID: 482296371213806214}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &453554727717358886
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8357987098767019228}
m_CullTransparentMesh: 1
--- !u!114 &1713988739707689781
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8357987098767019228}
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: 0.3647059, g: 0.35686275, b: 0.3647059, 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: -2413806693520163455, guid: a86470a33a6bf42c4b3595704624658b, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1

View File

@ -45,6 +45,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_persistent: 1
_dropItemControllerPrefab: {fileID: 2762223215237867485, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
_itemDataSo: {fileID: 11400000, guid: ec425583030e16d4dacc21b64f467bd1, type: 2}
_defaultItemPrefab: {fileID: 1370112280380943697, guid: 28a379482be867746aad889c0f1c3c79, type: 3}
_itemDataSo: {fileID: 11400000, guid: d7011c71193e95743aa868ca1bea6010, type: 2}
_itemDropTableSo: {fileID: 11400000, guid: 9e1384a77106eb845ad86d6834ba9a52, type: 2}

View File

@ -0,0 +1,215 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &873287429936955811
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7257062567955675062}
- component: {fileID: 4862962219166162506}
- component: {fileID: 6589898666490457267}
- component: {fileID: 545895004707295019}
m_Layer: 0
m_Name: VisualLook
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7257062567955675062
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873287429936955811}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.001, z: -0.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7348979974277454575}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!33 &4862962219166162506
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873287429936955811}
m_Mesh: {fileID: 0}
--- !u!23 &6589898666490457267
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873287429936955811}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 74269c31af0586d4cbf4b2307813e475, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &545895004707295019
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 873287429936955811}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d247ba06193faa74d9335f5481b2b56c, type: 3}
m_Name:
m_EditorClassIdentifier:
skeletonDataAsset: {fileID: 11400000, guid: fe0cd3a6556ca6942a36e1ea6c29c865, type: 2}
initialSkinName:
fixPrefabOverrideViaMeshFilter: 2
initialFlipX: 0
initialFlipY: 0
updateWhenInvisible: 3
separatorSlotNames: []
zSpacing: 0
useClipping: 1
immutableTriangles: 0
pmaVertexColors: 1
clearStateOnDisable: 0
tintBlack: 0
singleSubmesh: 0
fixDrawOrder: 0
addNormals: 0
calculateTangents: 0
maskInteraction: 0
maskMaterials:
materialsMaskDisabled: []
materialsInsideMask: []
materialsOutsideMask: []
disableRenderingOnOverride: 1
physicsPositionInheritanceFactor: {x: 1, y: 1}
physicsRotationInheritanceFactor: 1
physicsMovementRelativeTo: {fileID: 0}
updateTiming: 1
unscaledTime: 0
_animationName: Idle
loop: 1
timeScale: 1
--- !u!1 &4070104005773255287
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7348979974277454575}
- component: {fileID: 8901558942315672686}
- component: {fileID: 864693122161811869}
- component: {fileID: 9078754208177888251}
m_Layer: 8
m_Name: BossMapTrigger
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7348979974277454575
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4070104005773255287}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 7257062567955675062}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &8901558942315672686
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4070104005773255287}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0.5, z: 0}
--- !u!114 &864693122161811869
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4070104005773255287}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3}
m_Name:
m_EditorClassIdentifier:
_spineController: {fileID: 9078754208177888251}
--- !u!114 &9078754208177888251
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4070104005773255287}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: be4f815e5e3c0d5459559bdc0b8bbbfb, type: 3}
m_Name:
m_EditorClassIdentifier:
_skeletonAnimation: {fileID: 545895004707295019}
_initialSkinName: default

View File

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

View File

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

View File

@ -10,31 +10,7 @@ PrefabInstance:
m_Modifications:
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x

View File

@ -481,7 +481,8 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 5684081474487815918}
m_Father: {fileID: 665791185885374265}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3228264040967496712
@ -548,6 +549,37 @@ Transform:
m_Children: []
m_Father: {fileID: 7580754897896246193}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4768462283633482403
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 616072524783204347}
m_Layer: 0
m_Name: MapPortals
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &616072524783204347
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4768462283633482403}
serializedVersion: 2
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: 7580754897896246193}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4942791758257518844
GameObject:
m_ObjectHideFlags: 0
@ -1112,10 +1144,43 @@ Transform:
- {fileID: 7798505859049167048}
- {fileID: 3528589141546779327}
- {fileID: 4700527603807157220}
- {fileID: 8536453960896907503}
- {fileID: 616072524783204347}
- {fileID: 7778690860228022480}
- {fileID: 5292453453235858255}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7710462685797103205
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8536453960896907503}
m_Layer: 0
m_Name: MapEntrances
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8536453960896907503
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7710462685797103205}
serializedVersion: 2
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: 7580754897896246193}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9198442223207540368
GameObject:
m_ObjectHideFlags: 0
@ -1224,3 +1289,41 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &3106704901392946177
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 4291237925026304783}
m_Modifications:
- target: {fileID: 4070104005773255287, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
propertyPath: m_Name
value: BossMapTrigger
objectReference: {fileID: 0}
- target: {fileID: 4862962219166162506, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
--- !u!4 &5684081474487815918 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7348979974277454575, guid: ecbffb138ac6f52458902a58b58ef697, type: 3}
m_PrefabInstance: {fileID: 3106704901392946177}
m_PrefabAsset: {fileID: 0}

View File

@ -311,6 +311,114 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &1760715683021774751
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5467576439725994877}
- component: {fileID: 5956220603318830841}
- component: {fileID: 2224340551834110735}
- component: {fileID: 8383108166877643083}
m_Layer: 7
m_Name: Wall (8)
m_TagString: Wall
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5467576439725994877
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760715683021774751}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -4.65, y: 0, z: -7}
m_LocalScale: {x: 8, y: 5, z: 4}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1335494345527737213}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &5956220603318830841
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760715683021774751}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &2224340551834110735
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760715683021774751}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &8383108166877643083
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1760715683021774751}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &2563095547787055824
GameObject:
m_ObjectHideFlags: 0
@ -450,6 +558,114 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4927020328815886220
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6808103865080557536}
- component: {fileID: 4532412719844494229}
- component: {fileID: 6504471468362816209}
- component: {fileID: 1688085060042845872}
m_Layer: 7
m_Name: Wall (9)
m_TagString: Wall
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6808103865080557536
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4927020328815886220}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -8.2}
m_LocalScale: {x: 8, y: 5, z: 4}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1335494345527737213}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4532412719844494229
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4927020328815886220}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6504471468362816209
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4927020328815886220}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &1688085060042845872
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4927020328815886220}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &6878346579007020644
GameObject:
m_ObjectHideFlags: 0
@ -558,6 +774,114 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7049278992516918060
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7980065968173810144}
- component: {fileID: 339313247665189224}
- component: {fileID: 4832383091149187922}
- component: {fileID: 5858055743687062617}
m_Layer: 7
m_Name: Wall (10)
m_TagString: Wall
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7980065968173810144
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7049278992516918060}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -6.8, y: 0, z: 4.8}
m_LocalScale: {x: 4, y: 5, z: 8}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1335494345527737213}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &339313247665189224
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7049278992516918060}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4832383091149187922
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7049278992516918060}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &5858055743687062617
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7049278992516918060}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7225845442489806937
GameObject:
m_ObjectHideFlags: 0
@ -741,6 +1065,114 @@ Transform:
- {fileID: 6657138680337087356}
m_Father: {fileID: 6960399737772514917}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7687132103722071672
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6033259031597972912}
- component: {fileID: 3677994094677427467}
- component: {fileID: 7748781785925775046}
- component: {fileID: 2707051628513835897}
m_Layer: 7
m_Name: Wall (11)
m_TagString: Wall
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6033259031597972912
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7687132103722071672}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8.336, y: 0, z: 0}
m_LocalScale: {x: 4, y: 5, z: 8}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1335494345527737213}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3677994094677427467
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7687132103722071672}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7748781785925775046
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7687132103722071672}
m_Enabled: 0
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!65 &2707051628513835897
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7687132103722071672}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &7883838996347282313
GameObject:
m_ObjectHideFlags: 0
@ -880,6 +1312,83 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &132332318437660084
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6328821892107758958}
m_Modifications:
- target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_Name
value: MapEntrance
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalScale.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.x
value: 0.44
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.z
value: -12.35
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
--- !u!114 &5373123456437408081 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
m_PrefabInstance: {fileID: 132332318437660084}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &8394166543195273174 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
m_PrefabInstance: {fileID: 132332318437660084}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2424043105665738113
PrefabInstance:
m_ObjectHideFlags: 0
@ -888,6 +1397,18 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalScale.z
value: 8
objectReference: {fileID: 0}
- target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.x
value: -6.8
objectReference: {fileID: 0}
- target: {fileID: 2614076963411596655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.z
value: -4.8
objectReference: {fileID: 0}
- target: {fileID: 2688871614312994883, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_Enabled
value: 0
@ -908,10 +1429,50 @@ PrefabInstance:
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5194988466372041496, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalScale.y
value: 25
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.w
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: 5711256728325704458, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 270
objectReference: {fileID: 0}
- target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_Size.x
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 5958988907676655751, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_Size.y
value: 1.3
objectReference: {fileID: 0}
- target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalScale.x
value: 8
objectReference: {fileID: 0}
- target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.x
value: 5
objectReference: {fileID: 0}
- target: {fileID: 6511453854817970958, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.z
value: -7
@ -919,34 +1480,18 @@ PrefabInstance:
- target: {fileID: 7396433262681865224, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: b6ebe79d23afa6846929e91ecb098d02, type: 3}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 21300000, guid: 3dc6e21aa8674b7439c33b913a15a7ff, type: 3}
- target: {fileID: 7521448959059331659, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.y
value: 0
propertyPath: m_LocalPosition.x
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalRotation.z
value: 0
value: 200
objectReference: {fileID: 0}
- target: {fileID: 7580754897896246193, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@ -971,6 +1516,18 @@ PrefabInstance:
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: 1
addedObject: {fileID: 7980065968173810144}
- targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: 2
addedObject: {fileID: 6033259031597972912}
- targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 5467576439725994877}
- targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 6808103865080557536}
- targetCorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 9110149285681616722}
@ -998,16 +1555,44 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 4700527603807157220, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 8991664057069348477}
- targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 8394166543195273174}
- targetCorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 2011948303591882848}
- targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 1405513706330517591}
- targetCorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 4402092296501028718}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 7702874292798655589, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
insertIndex: -1
addedObject: {fileID: 4232848145969149048}
m_SourcePrefab: {fileID: 100100000, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
--- !u!114 &486059084208967709 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2818473219870193052, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdff38e2580871c42b6f98a477e42335, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1335494345527737213 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 3687127944708873980, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
--- !u!4 &2967684064714445434 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 616072524783204347, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
--- !u!4 &5354947371749406033 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7778690860228022480, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
@ -1030,13 +1615,20 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: eb656087fe6c652469b29504a37df539, type: 3}
m_Name:
m_EditorClassIdentifier:
PlayerSpawnTransform: {fileID: 7906706039042621278}
EnemyInstantiateLocation: {fileID: 5354947371749406033}
<ParticleInstantiateLocation>k__BackingField: {fileID: 7552954649617714894}
PlayerSpawnLocation: {fileID: 7906706039042621278}
<EnemyInstanceLocation>k__BackingField: {fileID: 5354947371749406033}
<ParticleInstanceLocation>k__BackingField: {fileID: 7552954649617714894}
MapEntranceLocations: {fileID: 6328821892107758958}
MapEntrances:
- {fileID: 5373123456437408081}
- {fileID: 2667497661582632679}
SaveStage: 5
BGMName:
BgmName:
InitializeFadeInOutTime: {x: 0.2, y: 1}
ClearFadeInOutTime: {x: 0.2, y: 0.3}
BossSpawnTransform: {fileID: 6522622582430961898}
BossType: 3
BossMapTrigger: {fileID: 486059084208967709}
<CenterSpawnTransform>k__BackingField: {fileID: 4946803535834257734}
MiniSandMoleSpawnTransforms:
- {fileID: 2981470058859736985}
@ -1048,6 +1640,11 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7798505859049167048, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6328821892107758958 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8536453960896907503, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6522622582430961898 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8874040642671342955, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
@ -1068,3 +1665,204 @@ Transform:
m_CorrespondingSourceObject: {fileID: 5483604360458066655, guid: 02759e0bd03056e499ebce198da0c9d6, type: 3}
m_PrefabInstance: {fileID: 2424043105665738113}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5242029347387589900
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2967684064714445434}
m_Modifications:
- target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_Name
value: MapPortal (1)
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.x
value: -14.87
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.w
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 270
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3}
--- !u!4 &4402092296501028718 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
m_PrefabInstance: {fileID: 5242029347387589900}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7361504337758868021
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 2967684064714445434}
m_Modifications:
- target: {fileID: 3695289696544250322, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_Name
value: MapPortal
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.x
value: 0.4
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalPosition.z
value: -14.54
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 798202f522c348649add7379a99abad4, type: 3}
--- !u!4 &1405513706330517591 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 798202f522c348649add7379a99abad4, type: 3}
m_PrefabInstance: {fileID: 7361504337758868021}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7945425234005582338
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 6328821892107758958}
m_Modifications:
- target: {fileID: 3695289696544250322, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_Name
value: MapEntrance (1)
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalScale.x
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.x
value: -11.85
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalPosition.z
value: -0.05
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.w
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.y
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 270
objectReference: {fileID: 0}
- target: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
--- !u!4 &2011948303591882848 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 8478081780112990818, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
m_PrefabInstance: {fileID: 7945425234005582338}
m_PrefabAsset: {fileID: 0}
--- !u!114 &2667497661582632679 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5424314009316918501, guid: 7b8975b59db16444ab90718ccdbafd1f, type: 3}
m_PrefabInstance: {fileID: 7945425234005582338}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6b1ebaf29bf6b49478d58541a2343fa5, type: 3}
m_Name:
m_EditorClassIdentifier:

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