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

버그 및 수정

Browse Source 
+ SpineDamageableProps Idle이 반복하지 않는 현상 수정
+ 플레이어 체력이 부족할 때, Vignette 효과 줄이고, 쉽게 수정할 수 있게 변경
+ 보스 처치 후 일정시간 무적 효과 적용
+ MiniSandMole 죽지 않는 버그 수정
+ Bgm 3종 추가 및 BgmSo 수정
This commit is contained in:
Nam Tae Gun 2024-06-24 18:54:47 +09:00
parent 9ae121f396
commit a5c3159335
34 changed files with 331 additions and 148 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

123
Assets/01.Scenes/02.Combat.unity
View File

@ -10878,6 +10878,7 @@ MonoBehaviour:
<TitanSlimeMapController>k__BackingField: {fileID: 36953787}
<RhinocerosMapController>k__BackingField: {fileID: 1011270532}
<SandMoleMapController>k__BackingField: {fileID: 1213070730}
_dailyBgm: DailyBgm1
--- !u!4 &1597727070
Transform:
m_ObjectHideFlags: 0
@ -11365,69 +11366,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1704481408}
m_CullTransparentMesh: 0
--- !u!1 &1715186577
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1715186579}
- component: {fileID: 1715186578}
- component: {fileID: 1715186580}
m_Layer: 3
m_Name: PostProcessingVolume
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1715186578
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1715186577}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: da9f66a87cd612d4e847d191aa6df602, type: 2}
--- !u!4 &1715186579
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1715186577}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1715186580
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1715186577}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d287dbc75fdbb6b44bd97e6d0604b227, type: 3}
m_Name:
m_EditorClassIdentifier:
_persistent: 1
--- !u!1 &1719893243
GameObject:
m_ObjectHideFlags: 0
@ -14481,6 +14419,63 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1001 &657457093462647415
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1492562680585263202, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6468678730395126332, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
propertyPath: m_Name
value: PostProcessingVolume
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 29ff4b046e796f249b05a7e81fa48779, type: 3}
--- !u!1 &657515045302343592
GameObject:
m_ObjectHideFlags: 0
@ -22922,7 +22917,7 @@ SceneRoots:
- {fileID: 1184277681}
- {fileID: 191889762}
- {fileID: 2043119555}
- {fileID: 1715186579}
- {fileID: 657457093462647415}
- {fileID: 1816611989}
- {fileID: 882036795}
- {fileID: 269653247}

4
Assets/01.Scenes/02.Combat/CombatPostProcessingVolume.asset
View File

@ -108,7 +108,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
m_Name: Vignette
m_EditorClassIdentifier:
active: 0
active: 1
color:
m_OverrideState: 1
m_Value: {r: 1, g: 0, b: 0, a: 1}
@ -117,7 +117,7 @@ MonoBehaviour:
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.2
m_Value: 0.15
smoothness:
m_OverrideState: 1
m_Value: 1

2
Assets/02.Scripts/Character/Enemy/Boss/Rhinoceros/Rhinoceros.cs
View File

@ -66,7 +66,7 @@ namespace BlueWater.Enemies.Bosses.Rhinoceros
}
AnimationController.SetAnimationTrigger("isDead");
BossMapController.ClearMap();
BossMapController.ClearMap(gameObject);
while (AnimationController.GetCurrentAnimationNormalizedTime() <= 1f)
{
await Awaitable.NextFrameAsync();

1
Assets/02.Scripts/Character/Enemy/Boss/SandMole/MiniSandMole.cs
View File

@ -61,6 +61,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
protected override async void Die()
{
BossSkillController.StopAllCoroutine();
SandMoleStatus.StopAllCoroutine();
BehaviorTree.DisableBehavior();
StopMove();

5
Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMole.cs
View File

@ -90,7 +90,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
SandMoleMapController = MapManager.Instance.SandMoleMapController;
}
public override async void Initialize()
public override void Initialize()
{
StartCoroutine(InitializeCoroutine());
}
@ -133,6 +133,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
protected override async void Die()
{
BossSkillController.StopAllCoroutine();
SandMoleStatus.StopAllCoroutine();
BehaviorTree.DisableBehavior();
StopMove();
@ -145,7 +146,7 @@ namespace BlueWater.Enemies.Bosses.SandMole
SpineController.SetSkin(SandMoleSkin.Idle.ToString());
var dieTrack = SpineController.PlayAnimation(SandMoleAnimation.Die.ToString(), false);
SandMoleMapController.ClearMap();
SandMoleMapController.ClearMap(gameObject);
await SpineController.WaitForAnimationCompletion(dieTrack);
ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position);

6
Assets/02.Scripts/Character/Enemy/Boss/SandMole/SandMoleStatus.cs
View File

@ -1,4 +1,3 @@
using System;
using BlueWater.Interfaces;
using BlueWater.Players;
using BlueWater.Utility;
@ -66,5 +65,10 @@ namespace BlueWater.Enemies.Bosses.SandMole
_stunParticle.Clear();
IsStunned = false;
}
public void StopAllCoroutine()
{
StopAllCoroutines();
}
}
}

3
Assets/02.Scripts/Character/Enemy/Boss/TitanSlime/TitanSlime.cs
View File

@ -75,7 +75,8 @@ namespace BlueWater.Enemies.Bosses.TitanSlime
if (TitanSlimeState.Level == 4 && TitanSlimeState.HasRabbit)
{
ItemManager.Instance.ItemDropRandomPosition(BossData.CharacterIdx, transform.position);
_titanSlimeMapController.ClearMap();
_titanSlimeMapController.ClearMap(gameObject);
Destroy(gameObject);
return;
}
if (TitanSlimeState.Level <= 4)

3
Assets/02.Scripts/Character/Player/Combat/CombatPlayer.cs
View File

@ -173,6 +173,9 @@ namespace BlueWater.Players.Combat
CombatUiManager.Instance.GameOverPopupUi.Open(CombatUiManager.Instance.PopupUiList);
}
public void ActivateInvincibility() => PlayerHealthPoint.ActivateInvincibility();
public void DeactivateInvincibility() => PlayerHealthPoint.DeactivateInvincibility();
public void SetCurrentHealthPoint(int value) => PlayerHealthPoint.SetCurrentHealthPoint(value);
public void SetCurrentHealthPointMax() => PlayerHealthPoint.SetCurrentHealthPoint(PlayerHealthPoint.MaxHealthPoint);

4
Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs
View File

@ -28,6 +28,7 @@ namespace BlueWater.Players
[field: SerializeField]
public float InvincibilityDuration { get; private set; } = 0.5f;
[field: SerializeField]
public bool IsInvincible { get; private set; }
private WaitForSeconds _flashWhiteWaitTime;
private Coroutine _flashWhiteCoroutine;
@ -160,5 +161,8 @@ namespace BlueWater.Players
IsInvincible = false;
Utils.EndUniqueCoroutine(this, ref _damageIntervalCoroutine);
}
public void ActivateInvincibility() => IsInvincible = true;
public void DeactivateInvincibility() => IsInvincible = false;
}
}

11
Assets/02.Scripts/Map/BossMapController.cs
View File

@ -74,10 +74,10 @@ namespace BlueWater.Maps
StartCoroutine(RestartMapCoroutine());
}
public override void ClearMap()
public override void ClearMap(GameObject bossObject)
{
IsCleared = true;
StartCoroutine(nameof(ClearMapCoroutine));
StartCoroutine(ClearMapCoroutine(bossObject));
}
protected virtual IEnumerator InitializeMapCoroutine()
@ -103,7 +103,6 @@ namespace BlueWater.Maps
DataManager.Instance.CurrentSaveStage = SaveStage;
CombatUiManager.Instance.FieldBossHealthPointUi.SetActiveHpSlider(false);
AudioManager.Instance.StopBgm();
CombatUiManager.Instance.FadeInOut(InitializeFadeInOutTime.x, InitializeFadeInOutTime.y,
new Color(0f, 0f, 0f, 0f), 1f);
@ -119,8 +118,9 @@ namespace BlueWater.Maps
OpenMapEntrances();
}
protected virtual IEnumerator ClearMapCoroutine()
protected virtual IEnumerator ClearMapCoroutine(GameObject bossObject)
{
GameManager.Instance.CurrentCombatPlayer.ActivateInvincibility();
VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y);
@ -130,7 +130,7 @@ namespace BlueWater.Maps
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
DestroyAllEnemiesExceptBoss();
DestroyAllEnemiesExceptBoss(bossObject);
VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
elapsedTime = 0f;
@ -141,6 +141,7 @@ namespace BlueWater.Maps
}
OpenMapEntrances();
GameManager.Instance.CurrentCombatPlayer.DeactivateInvincibility();
}
}
}

2
Assets/02.Scripts/Map/FirstTutorialMapController.cs
View File

@ -49,7 +49,7 @@ namespace BlueWater.Maps
throw new System.NotImplementedException();
}
public override void ClearMap()
public override void ClearMap(GameObject bossObject)
{
throw new System.NotImplementedException();
}

16
Assets/02.Scripts/Map/MapController.cs
View File

@ -107,19 +107,12 @@ namespace BlueWater.Maps
}
}
public void DestroyAllEnemiesExceptBoss()
public void DestroyAllEnemiesExceptBoss(GameObject bossObject)
{
var temps = new List<Transform>();
foreach (Transform element in EnemyInstanceLocation)
{
temps.Add(element);
}
foreach (var element in temps)
{
var boss = element.GetComponent<Boss>();
if (boss) continue;
if (element.gameObject == bossObject) continue;
Destroy(element.gameObject);
}
}
@ -163,11 +156,10 @@ namespace BlueWater.Maps
GameManager.Instance.CurrentCombatPlayer.transform.position = PlayerSpawnLocation.position;
CombatUiManager.Instance.FieldBossHealthPointUi.SetActiveHpSlider(false);
AudioManager.Instance.StopBgm();
}
public abstract void ResetMap(bool isHardReset = false);
public abstract void RestartMap();
public abstract void ClearMap();
public abstract void ClearMap(GameObject bossObject);
}
}

12
Assets/02.Scripts/Map/MapManager.cs
View File

@ -16,6 +16,9 @@ namespace BlueWater.Maps
[field: SerializeField]
public SandMoleMapController SandMoleMapController { get; private set; }
[SerializeField]
private string _dailyBgm = "DailyBgm1";
private List<MapController> _mapControllers;
private MapController _currentMapController;
@ -29,6 +32,11 @@ namespace BlueWater.Maps
};
}
private void Start()
{
AudioManager.Instance.PlayBgm(_dailyBgm);
}
public MapController GetMapController(SaveStage saveStage)
{
switch (saveStage)
@ -53,7 +61,7 @@ namespace BlueWater.Maps
element.ResetMap(true);
}
GameManager.Instance.CurrentCombatPlayer.SetCurrentHealthPointMax();
AudioManager.Instance.StopBgm();
AudioManager.Instance.PlayBgm(_dailyBgm);
}
public void RestartCurrentMap()
@ -64,6 +72,7 @@ namespace BlueWater.Maps
}
_currentMapController = GetMapController(DataManager.Instance.CurrentSaveStage);
_currentMapController.RestartMap();
AudioManager.Instance.PlayBgm(_dailyBgm);
}
public void MoveSelectStage(int stage)
@ -76,6 +85,7 @@ namespace BlueWater.Maps
var moveMapController = GetMapController((SaveStage)stage);
moveMapController.MovePlayer();
AudioManager.Instance.PlayBgm(_dailyBgm);
}
public void ForceKillCurrentBoss()

50
Assets/02.Scripts/Map/TitanSlimeMapController.cs
View File

@ -12,30 +12,30 @@ namespace BlueWater.Maps
EnemyManager.Instance.InstantiateTitanSlime(BossSpawnTransform.position, 1, true, EnemyInstanceLocation);
}
protected override IEnumerator ClearMapCoroutine()
{
DestroyAllEnemies();
VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y);
var elapsedTime = 0f;
while (elapsedTime <= 3f)
{
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
DestroyAllEnemies();
VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
elapsedTime = 0f;
while (elapsedTime <= 2f)
{
elapsedTime += Time.unscaledDeltaTime;
yield return null;
}
OpenMapEntrances();
//CombatUiManager.Instance.ClearPopupUi.Open(CombatUiManager.Instance.PopupUiList);
}
// protected override IEnumerator ClearMapCoroutine(GameObject bossObject)
// {
// DestroyAllEnemies();
// GameManager.Instance.CurrentCombatPlayer.ActivateInvincibility();
// VisualFeedbackManager.Instance.SetBaseTimeScale(0.1f);
// CombatUiManager.Instance.FadeInOut(ClearFadeInOutTime.x, ClearFadeInOutTime.y);
//
// var elapsedTime = 0f;
// while (elapsedTime <= 3f)
// {
// elapsedTime += Time.unscaledDeltaTime;
// yield return null;
// }
// DestroyAllEnemies();
// VisualFeedbackManager.Instance.SetBaseTimeScale(1f);
//
// elapsedTime = 0f;
// while (elapsedTime <= 2f)
// {
// elapsedTime += Time.unscaledDeltaTime;
// yield return null;
// }
//
// OpenMapEntrances();
// }
}
}

34
Assets/02.Scripts/PostProcessingManager.cs
View File

@ -1,5 +1,6 @@
using System.Collections;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
using UnityEngine.Rendering;
using UnityEngine.Rendering.Universal;
@ -18,6 +19,20 @@ namespace BlueWater
private ScriptableRendererData _currentRenderData;
private Volume _currentVolume;
private Coroutine _lowHpVignetteCoroutine;
// LowHpVignette
[Title("LowHpVignette")]
[SerializeField]
private bool _isLerpIntensity = true;
[SerializeField]
private float _startIntensity = 0.15f;
[SerializeField, ShowIf("@_isLerpIntensity")]
private float _endIntensity = 0.2f;
[SerializeField, ShowIf("@_isLerpIntensity")]
private float _lerpTime = 1f;
protected override void OnAwake()
{
@ -83,23 +98,22 @@ namespace BlueWater
private IEnumerator LowHpVignetteCoroutine()
{
var startValue = 0.2f;
var endValue = 0.3f;
var time = 0f;
var vignette = GetEffect<Vignette>();
vignette.intensity.value = startValue;
vignette.intensity.value = _startIntensity;
vignette.active = true;
if (!_isLerpIntensity) yield break;
var elapsedTime = 0f;
while (true)
{
time += Time.deltaTime * 2f;
vignette.intensity.value = Mathf.Lerp(startValue, endValue, time);
if (time >= 1f)
vignette.intensity.value = Mathf.Lerp(_startIntensity, _endIntensity, elapsedTime);
if (elapsedTime >= _lerpTime)
{
(startValue, endValue) = (endValue, startValue);
time = 0f;
(_startIntensity, _endIntensity) = (_endIntensity, _startIntensity);
elapsedTime = 0f;
}
elapsedTime += Time.deltaTime;
yield return null;
}
}

19
Assets/02.Scripts/Prop/SpineDamageableProps.cs
View File

@ -1,5 +1,7 @@
using System.Collections;
using BlueWater.Audios;
using BlueWater.Players;
using BlueWater.Utility;
using UnityEngine;
namespace BlueWater
@ -18,6 +20,8 @@ namespace BlueWater
[SerializeField]
private string _dieAnimationName;
private Coroutine _touchCoroutineInstance;
private void Awake()
{
_spineController = GetComponent<SpineController>();
@ -33,13 +37,18 @@ namespace BlueWater
{
if (!other.CompareTag("Player") || CurrentHealthPoint <= 0) return;
_spineController.PlayAnimation(_touchAnimationName, false);
Utils.StartUniqueCoroutine(this, ref _touchCoroutineInstance, TouchCoroutine());
}
private void OnTriggerExit(Collider other)
private IEnumerator TouchCoroutine()
{
if (!other.CompareTag("Player") || CurrentHealthPoint <= 0) return;
var touchTrack = _spineController.PlayAnimation(_touchAnimationName, false);
while (!touchTrack.IsComplete)
{
if (CurrentHealthPoint == 0) yield break;
yield return null;
}
_spineController.PlayAnimation(_idleAnimationName, true);
}

21
Assets/02.Scripts/ScriptableObject/Audio/BgmData.asset
View File

@ -13,12 +13,15 @@ MonoBehaviour:
m_Name: BgmData
m_EditorClassIdentifier:
<BgmDataList>k__BackingField:
- <BgmName>k__BackingField: TutorialStage
<Clip>k__BackingField: {fileID: 8300000, guid: 7c619b42e5894ee4db14168ce657a8dd,
type: 3}
- <BgmName>k__BackingField: Stage1
<Clip>k__BackingField: {fileID: 8300000, guid: a7c4714bdbfdb764a8c19b58dbdf4d47,
type: 3}
- <BgmName>k__BackingField: Stage2
<Clip>k__BackingField: {fileID: 8300000, guid: 3120a718e36ab39419f53318deed3976,
type: 3}
- <BgmName>k__BackingField: DailyBgm1
<Clip>k__BackingField: {fileID: 8300000, guid: 7c619b42e5894ee4db14168ce657a8dd, type: 3}
- <BgmName>k__BackingField: DailyBgm2
<Clip>k__BackingField: {fileID: 8300000, guid: 3ba3ebbe3bd52984eb49c0cdb9656ceb, type: 3}
- <BgmName>k__BackingField: TitanSlimeMap
<Clip>k__BackingField: {fileID: 8300000, guid: a7c4714bdbfdb764a8c19b58dbdf4d47, type: 3}
- <BgmName>k__BackingField: RhinocerosMap
<Clip>k__BackingField: {fileID: 8300000, guid: 3120a718e36ab39419f53318deed3976, type: 3}
- <BgmName>k__BackingField: SandMoleMap
<Clip>k__BackingField: {fileID: 8300000, guid: 4914a1d514cce3f459a0af45d62eeeee, type: 3}
- <BgmName>k__BackingField: GhostBarrelMap
<Clip>k__BackingField: {fileID: 8300000, guid: d1f140d54184dc7449198f540d98d305, type: 3}

4
Assets/05.Prefabs/Characters/Enemies/Bosses/TitanSlime.prefab
View File

@ -26,7 +26,7 @@ Transform:
m_GameObject: {fileID: 1016303419742354216}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.258819, w: 0.9659259}
m_LocalPosition: {x: 0, y: 0.22, z: 0.01}
m_LocalPosition: {x: 0, y: 0.22, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
@ -75,7 +75,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 5
m_SortingOrder: 4
m_Sprite: {fileID: 21300000, guid: 1ddf647b8857bff45a83e009dbb9ec8c, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0

65
Assets/05.Prefabs/Managers/PostProcessingVolume.prefab Normal file
View File

@ -0,0 +1,65 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6468678730395126332
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1492562680585263202}
- component: {fileID: 7932030668675567178}
- component: {fileID: 3481486763373117091}
m_Layer: 3
m_Name: PostProcessingVolume
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1492562680585263202
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6468678730395126332}
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: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &7932030668675567178
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6468678730395126332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IsGlobal: 1
priority: 0
blendDistance: 0
weight: 1
sharedProfile: {fileID: 11400000, guid: da9f66a87cd612d4e847d191aa6df602, type: 2}
--- !u!114 &3481486763373117091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6468678730395126332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d287dbc75fdbb6b44bd97e6d0604b227, type: 3}
m_Name:
m_EditorClassIdentifier:
_persistent: 1

7
Assets/05.Prefabs/Managers/PostProcessingVolume.prefab.meta Normal file
View File

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

2
Assets/05.Prefabs/Maps/MapControllers/RhinocerosMapController.prefab
View File

@ -3725,7 +3725,7 @@ MonoBehaviour:
- {fileID: 5780826671245057235}
- {fileID: 6690762032223832123}
SaveStage: 4
BgmName: Stage2
BgmName: RhinocerosMap
InitializeFadeInOutTime: {x: 0.2, y: 1}
ClearFadeInOutTime: {x: 0.2, y: 0.3}
BossSpawnTransform: {fileID: 1204009204749076978}

2
Assets/05.Prefabs/Maps/MapControllers/SandMoleMapController.prefab
View File

@ -1680,7 +1680,7 @@ MonoBehaviour:
- {fileID: 5373123456437408081}
- {fileID: 2667497661582632679}
SaveStage: 5
BgmName:
BgmName: SandMoleMap
InitializeFadeInOutTime: {x: 0.2, y: 1}
ClearFadeInOutTime: {x: 0.2, y: 0.3}
BossSpawnTransform: {fileID: 6522622582430961898}

2
Assets/05.Prefabs/Maps/MapControllers/TitanSlimeMapController.prefab
View File

@ -5218,7 +5218,7 @@ MonoBehaviour:
- {fileID: 60991982810615371}
- {fileID: 6632898035063951688}
SaveStage: 3
BgmName: Stage1
BgmName: TitanSlimeMap
InitializeFadeInOutTime: {x: 0.2, y: 1}
ClearFadeInOutTime: {x: 0.2, y: 0.3}
BossSpawnTransform: {fileID: 6522622582430961898}

2
Assets/05.Prefabs/Particles/Enemies/Bosses/TitanSlime/TitanSlimeAttackedParticle.prefab
View File

@ -3851,7 +3851,7 @@ ParticleSystem:
radiusScale: 1
collidesWith:
serializedVersion: 2
m_Bits: 64
m_Bits: 192
maxCollisionShapes: 256
quality: 0
voxelSize: 0.5

2
Assets/05.Prefabs/Particles/Enemies/Bosses/TitanSlime/TitanSlimeDieParticle.prefab
View File

@ -3851,7 +3851,7 @@ ParticleSystem:
radiusScale: 1
collidesWith:
serializedVersion: 2
m_Bits: 64
m_Bits: 192
maxCollisionShapes: 256
quality: 0
voxelSize: 0.5

2
Assets/05.Prefabs/Particles/Players/Combat/TheWaltzOfTheSwordAttackParticle.prefab
View File

@ -19407,7 +19407,7 @@ ParticleSystem:
serializedVersion: 8
lengthInSec: 1
simulationSpeed: 1
stopAction: 0
stopAction: 2
cullingMode: 3
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}

2
Assets/05.Prefabs/Particles/Players/Combat/TheWaltzOfTheSwordReadyParticle.prefab
View File

@ -4863,7 +4863,7 @@ ParticleSystem:
serializedVersion: 8
lengthInSec: 0.3
simulationSpeed: 1
stopAction: 0
stopAction: 2
cullingMode: 3
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}

4
Assets/05.Prefabs/Props/Spines/SummerGrass01.prefab
View File

@ -8,6 +8,10 @@ PrefabInstance:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 1725476421927655530, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: loop
value: 1
objectReference: {fileID: 0}
- target: {fileID: 1725476421927655530, guid: 384b448f89341e84bb003cb48e37bb7d, type: 3}
propertyPath: _animationName
value: Normal

BIN
Assets/06.Sounds/Bgm/Battle! (Wild Pokémon) medley.mp3 Normal file
View File

Binary file not shown.

23
Assets/06.Sounds/Bgm/Battle! (Wild Pokémon) medley.mp3.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 4914a1d514cce3f459a0af45d62eeeee
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/06.Sounds/Bgm/Ghost Pokemon - Halloween 2023 (320 kbps).mp3 Normal file
View File

Binary file not shown.

23
Assets/06.Sounds/Bgm/Ghost Pokemon - Halloween 2023 (320 kbps).mp3.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: d1f140d54184dc7449198f540d98d305
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/06.Sounds/Bgm/Mysterious Forest - The Legend of Zelda_ Link's Awakening.mp3 Normal file
View File

Binary file not shown.

23
Assets/06.Sounds/Bgm/Mysterious Forest - The Legend of Zelda_ Link's Awakening.mp3.meta Normal file
View File

@ -0,0 +1,23 @@
fileFormatVersion: 2
guid: 3ba3ebbe3bd52984eb49c0cdb9656ceb
AudioImporter:
externalObjects: {}
serializedVersion: 8
defaultSettings:
serializedVersion: 2
loadType: 0
sampleRateSetting: 0
sampleRateOverride: 44100
compressionFormat: 1
quality: 1
conversionMode: 0
preloadAudioData: 0
platformSettingOverrides: {}
forceToMono: 0
normalize: 1
loadInBackground: 0
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleVariant: