Merge branch 'main' of https://github.com/Degulleo/Degulleo3D into DEG-94-플레이어-회피-기능-구현
This commit is contained in:
commit
4a527c8443
@ -30,12 +30,6 @@ public class EnemyControllerEditor : Editor
|
||||
case EnemyState.Attack:
|
||||
GUI.backgroundColor = new Color(1, 1, 0, 1f);
|
||||
break;
|
||||
case EnemyState.Move:
|
||||
GUI.backgroundColor = new Color(0, 1, 1, 1f);
|
||||
break;
|
||||
case EnemyState.GetHit:
|
||||
GUI.backgroundColor = new Color(0.1f, 0.1f, 0.1f, 1f);
|
||||
break;
|
||||
case EnemyState.Dead:
|
||||
GUI.backgroundColor = new Color(1, 0, 0, 1f);
|
||||
break;
|
||||
@ -55,12 +49,10 @@ public class EnemyControllerEditor : Editor
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
if (GUILayout.Button("Idle")) enemyController.SetState(EnemyState.Idle);
|
||||
if (GUILayout.Button("Trace")) enemyController.SetState(EnemyState.Trace);
|
||||
if (GUILayout.Button("Attack")) enemyController.SetState(EnemyState.Attack);
|
||||
EditorGUILayout.EndHorizontal();
|
||||
|
||||
EditorGUILayout.BeginHorizontal();
|
||||
if (GUILayout.Button("Move")) enemyController.SetState(EnemyState.Move);
|
||||
if (GUILayout.Button("GetHit")) enemyController.SetState(EnemyState.GetHit);
|
||||
if (GUILayout.Button("Attack")) enemyController.SetState(EnemyState.Attack);
|
||||
if (GUILayout.Button("Dead")) enemyController.SetState(EnemyState.Dead);
|
||||
EditorGUILayout.EndHorizontal();
|
||||
}
|
||||
|
BIN
Assets/JYY/Animator/PldDogControl.controller
(Stored with Git LFS)
BIN
Assets/JYY/Animator/PldDogControl.controller
(Stored with Git LFS)
Binary file not shown.
8
Assets/JYY/Models.meta
Normal file
8
Assets/JYY/Models.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ac3af37988877784e91ab90c4ade37d9
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Models/Y Bot.fbx
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Models/Y Bot.fbx
(Stored with Git LFS)
Normal file
Binary file not shown.
109
Assets/JYY/Models/Y Bot.fbx.meta
Normal file
109
Assets/JYY/Models/Y Bot.fbx.meta
Normal file
@ -0,0 +1,109 @@
|
||||
fileFormatVersion: 2
|
||||
guid: decb96f75d6a2344baa18f902f21a131
|
||||
ModelImporter:
|
||||
serializedVersion: 22200
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 1
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 0
|
||||
motionNodeName:
|
||||
rigImportErrors:
|
||||
rigImportWarnings:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 3
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importPhysicalCameras: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
strictVertexDataChecks: 0
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 1
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 3
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 1
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
importBlendShapeDeformPercent: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/AOEIndicator.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/AOEIndicator.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/JYY/Prefabs/AOEIndicatorChariot.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/AOEIndicatorChariot.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/AOEIndicatorDynamo.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/AOEIndicatorHorizontal.prefab
(Stored with Git LFS)
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 44d67bf59c049fb46876a549120a16d7
|
||||
guid: 0e60f1766f73dbc439ff69a154cc9a99
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
BIN
Assets/JYY/Prefabs/AOEIndicatorVertical.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/AOEIndicatorVertical.prefab
(Stored with Git LFS)
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9adff7c5e2e43974fa9f2d241ef2e433
|
||||
guid: dc0537feab3e2944aa554e23fb3923a3
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
BIN
Assets/JYY/Prefabs/AoE Indicator Chariot.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/AoE Indicator Chariot.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
BIN
Assets/JYY/Prefabs/AoE Indicator Horizontal.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/AoE Indicator Horizontal.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e9e020ef2784edf4ca2a83ae9e1edefd
|
||||
guid: 44d67bf59c049fb46876a549120a16d7
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
BIN
Assets/JYY/Prefabs/AoE Indicator Vertical.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/AoE Indicator Vertical.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/AoE Indicator Vertical.prefab.meta
Normal file
7
Assets/JYY/Prefabs/AoE Indicator Vertical.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 9adff7c5e2e43974fa9f2d241ef2e433
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/AoE Slash Blue Chariot.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/AoE Slash Blue Chariot.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/AoE Slash Blue Chariot.prefab.meta
Normal file
7
Assets/JYY/Prefabs/AoE Slash Blue Chariot.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 3f431e991bd65014c833e89305ddd5e3
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/Charge slash red.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/Charge slash red.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/Charge slash red.prefab.meta
Normal file
7
Assets/JYY/Prefabs/Charge slash red.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8a0ddc8dd6d760e4e93999c4d49dc16c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/Explosion.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/Explosion.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/Explosion.prefab.meta
Normal file
7
Assets/JYY/Prefabs/Explosion.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2ccd5acc2f6d74d4bb687fd2ee94b9de
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/Red energy explosion 1.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/Red energy explosion 1.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/Red energy explosion 1.prefab.meta
Normal file
7
Assets/JYY/Prefabs/Red energy explosion 1.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 49ada3fea2be23f4a988d4bc21dcaa32
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/Snow slash 1.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/JYY/Prefabs/Snow slash 1.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/JYY/Prefabs/Snow slash 1.prefab.meta
Normal file
7
Assets/JYY/Prefabs/Snow slash 1.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 03a874e2d684ee04a9729b8363fdbb9c
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/JYY/Prefabs/[Enemy] PldDog.prefab
(Stored with Git LFS)
BIN
Assets/JYY/Prefabs/[Enemy] PldDog.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/JYY/Scenes/MonsterTest.unity
(Stored with Git LFS)
BIN
Assets/JYY/Scenes/MonsterTest.unity
(Stored with Git LFS)
Binary file not shown.
@ -1,23 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class JoystickPanelController : MonoBehaviour
|
||||
{
|
||||
public void OnClickAttackButton()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void OnClickDashButton()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void OnClickInteractionButton()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
@ -13,6 +13,13 @@ public class InteractionController : MonoBehaviour
|
||||
[Header("UI 연동")]
|
||||
[SerializeField] HousingCanvasController housingCanvasController;
|
||||
|
||||
private SuddenEventController _suddenEventController = new SuddenEventController();
|
||||
|
||||
private void Start()
|
||||
{
|
||||
playerStats.OnWorked += SuddenAfterWorkEventHappen;
|
||||
}
|
||||
|
||||
// 상호작용 가능한 사물 범위에 들어올 때
|
||||
private void OnTriggerEnter(Collider other)
|
||||
{
|
||||
@ -37,64 +44,47 @@ public class InteractionController : MonoBehaviour
|
||||
// ActionType 별로 화면에 상호작용 내용 표시, 상호작용 버튼에 이벤트 작성
|
||||
private void PopActionOnScreen(ActionType interactionType)
|
||||
{
|
||||
switch (interactionType)
|
||||
HousingConstants.interactions.TryGetValue(interactionType, out var interactionTexts);
|
||||
|
||||
housingCanvasController.ShowInteractionButton(interactionTexts.ActionText,interactionTexts.DescriptionText,()=>
|
||||
{
|
||||
case ActionType.Sleep:
|
||||
housingCanvasController.ShowInteractionButton("침대에서 잘까?","숙면으로 시간 당 체력 1을 회복한다.", () =>
|
||||
if (playerStats.CanPerformByHealth(interactionType))
|
||||
{
|
||||
playerStats.PerformAction(ActionType.Sleep);
|
||||
housingCanvasController.HideInteractionButton();
|
||||
//TODO: 화면 전환 효과와 UI 업데이트 작업
|
||||
});
|
||||
break;
|
||||
case ActionType.Housework:
|
||||
housingCanvasController.ShowInteractionButton("밀린 집안일을 처리할까?","체력 1을 사용하고 좋은일이 일어날지도 모른다", () =>
|
||||
{
|
||||
if (playerStats.CanPerformByHealth(ActionType.Housework))
|
||||
{
|
||||
playerStats.PerformAction(ActionType.Housework);
|
||||
housingCanvasController.HideInteractionButton();
|
||||
//TODO: 집안일 후 랜덤 강화 효과 적용
|
||||
playerStats.PerformAction(interactionType);
|
||||
}
|
||||
else
|
||||
{
|
||||
housingCanvasController.SetActionText("힘들어서 못해..");
|
||||
housingCanvasController.SetActionText(interactionTexts.LackOfHealth);
|
||||
housingCanvasController.SetDescriptionText();
|
||||
}
|
||||
});
|
||||
break;
|
||||
case ActionType.Dungeon:
|
||||
housingCanvasController.ShowInteractionButton("던전에 입장할까?","체력 3을 사용하고 3시간이 흐른다.", () =>
|
||||
{
|
||||
if (playerStats.CanPerformByHealth(ActionType.Dungeon))
|
||||
{
|
||||
playerStats.PerformAction(ActionType.Dungeon);
|
||||
housingCanvasController.HideInteractionButton();
|
||||
}
|
||||
else
|
||||
|
||||
public Action SuddenEventHappen()
|
||||
{
|
||||
housingCanvasController.SetActionText("던전에 갈 체력이 되지 않아..");
|
||||
housingCanvasController.SetDescriptionText();
|
||||
return null;
|
||||
}
|
||||
|
||||
public void SuddenAfterWorkEventHappen()
|
||||
{
|
||||
AfterWorkEvent afterWorkEvent = _suddenEventController.SuddenEventCalculator();
|
||||
if (afterWorkEvent == AfterWorkEvent.None)
|
||||
return;
|
||||
switch (afterWorkEvent)
|
||||
{
|
||||
case AfterWorkEvent.OvertimeWork:
|
||||
housingCanvasController.ShowSuddenEventPanel("부장님이 퇴근을 안하셔.. 야근할까?", () =>
|
||||
{
|
||||
//Todo: 컷씬과 스테이터스 변경
|
||||
housingCanvasController.HideSuddenEventPanel();
|
||||
});
|
||||
break;
|
||||
case ActionType.Work:
|
||||
housingCanvasController.ShowInteractionButton("출근한다.","체력 3을 사용하고 저녁 6시에나 돌아오겠지..", () =>
|
||||
case AfterWorkEvent.TeamGathering:
|
||||
housingCanvasController.ShowSuddenEventPanel("갑자기 팀 회식이 잡혔다. 참석 하러 가자", () =>
|
||||
{
|
||||
if (playerStats.CanPerformByHealth(ActionType.Work))
|
||||
{
|
||||
playerStats.PerformAction(ActionType.Work);
|
||||
housingCanvasController.HideInteractionButton();
|
||||
}
|
||||
else
|
||||
{
|
||||
housingCanvasController.SetActionText("도저히 출근할 체력이 안되는걸..?");
|
||||
housingCanvasController.SetDescriptionText();
|
||||
}
|
||||
housingCanvasController.HideSuddenEventPanel();
|
||||
});
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
BIN
Assets/LIN/Housing Copy.unity
(Stored with Git LFS)
BIN
Assets/LIN/Housing Copy.unity
(Stored with Git LFS)
Binary file not shown.
@ -6,19 +6,26 @@ using UnityEngine;
|
||||
|
||||
public class HousingCanvasController : MonoBehaviour
|
||||
{
|
||||
[Header("일상행동 상호작용")]
|
||||
[SerializeField] GameObject interactionButton;
|
||||
[SerializeField] TMP_Text actionText;
|
||||
[SerializeField] TMP_Text descriptionText;
|
||||
|
||||
public Action OnInteractionButtonPressed;
|
||||
[Header("돌발 이벤트")]
|
||||
[SerializeField] private GameObject suddenPanel;
|
||||
[SerializeField] private TMP_Text suddenText;
|
||||
|
||||
public Action OnInteractionButtonPressed;
|
||||
public Action OnSuddenButtonPressed;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
InitTexts();
|
||||
InitInteractionTexts();
|
||||
interactionButton.SetActive(false);
|
||||
suddenPanel.SetActive(false);
|
||||
}
|
||||
|
||||
#region 상호작용 일상 행동
|
||||
//사물 이름 세팅
|
||||
public void SetActionText(string text = "")
|
||||
{
|
||||
@ -30,7 +37,7 @@ public class HousingCanvasController : MonoBehaviour
|
||||
descriptionText.text = text;
|
||||
}
|
||||
|
||||
private void InitTexts()
|
||||
private void InitInteractionTexts()
|
||||
{
|
||||
SetActionText();
|
||||
SetDescriptionText();
|
||||
@ -46,7 +53,6 @@ public class HousingCanvasController : MonoBehaviour
|
||||
//각 행동 별로 실행되어야 할 이벤트 구독
|
||||
OnInteractionButtonPressed = onInteractionButtonPressed;
|
||||
}
|
||||
|
||||
//범위에서 벗어나면 상호작용 버튼 off
|
||||
public void HideInteractionButton()
|
||||
{
|
||||
@ -62,5 +68,27 @@ public class HousingCanvasController : MonoBehaviour
|
||||
public void OnClickInteractionButton()
|
||||
{
|
||||
OnInteractionButtonPressed?.Invoke();
|
||||
HideInteractionButton();
|
||||
}
|
||||
#endregion
|
||||
|
||||
#region 돌발 이벤트
|
||||
public void ShowSuddenEventPanel(string actText, Action onSuddenButtonPressed)
|
||||
{
|
||||
suddenPanel.SetActive(true);
|
||||
suddenText.text = actText;
|
||||
OnSuddenButtonPressed += onSuddenButtonPressed;
|
||||
}
|
||||
public void HideSuddenEventPanel()
|
||||
{
|
||||
suddenPanel.SetActive(false);
|
||||
suddenText.text = "";
|
||||
OnSuddenButtonPressed = null;
|
||||
}
|
||||
public void OnSuddenConfirmButton()
|
||||
{
|
||||
OnSuddenButtonPressed?.Invoke();
|
||||
}
|
||||
#endregion
|
||||
|
||||
}
|
||||
|
43
Assets/LIN/HousingConstants.cs
Normal file
43
Assets/LIN/HousingConstants.cs
Normal file
@ -0,0 +1,43 @@
|
||||
//퇴근 후 발생할 수 있는 돌발 이벤트
|
||||
|
||||
using System.Collections.Generic;
|
||||
|
||||
public enum AfterWorkEvent
|
||||
{
|
||||
None,
|
||||
TeamGathering,
|
||||
OvertimeWork
|
||||
}
|
||||
|
||||
public static class HousingConstants
|
||||
{
|
||||
//돌발 이벤트 확률 계산
|
||||
public static int AFTER_WORK_DENOMINATOR = 4;
|
||||
|
||||
|
||||
#region 상호작용 멘트
|
||||
|
||||
public static readonly Dictionary<ActionType, InteractionTexts> interactions =
|
||||
new Dictionary<ActionType, InteractionTexts>
|
||||
{
|
||||
{ ActionType.Sleep, new InteractionTexts("침대에서 잘까?","숙면으로 시간 당 체력 1을 회복한다.", ".")},
|
||||
{ ActionType.Housework, new InteractionTexts("밀린 집안일을 처리할까?","체력 1을 사용하고 좋은일이 일어날지도 모른다","힘들어서 못해..")},
|
||||
{ ActionType.Dungeon, new InteractionTexts("던전에 입장할까?","체력 3을 사용하고 3시간이 흐른다.","던전에 갈 체력이 되지 않아..")},
|
||||
{ ActionType.Work, new InteractionTexts("출근한다.","체력 3을 사용하고 저녁 6시에나 돌아오겠지..", "도저히 출근할 체력이 안되는걸..?")}
|
||||
};
|
||||
#endregion
|
||||
|
||||
public struct InteractionTexts
|
||||
{
|
||||
public string ActionText { get; private set; }
|
||||
public string DescriptionText { get; private set; }
|
||||
public string LackOfHealth { get; private set; }
|
||||
|
||||
public InteractionTexts(string actionText, string descriptionText, string lackOfHealth)
|
||||
{
|
||||
ActionText = actionText;
|
||||
DescriptionText = descriptionText;
|
||||
LackOfHealth = lackOfHealth;
|
||||
}
|
||||
}
|
||||
}
|
3
Assets/LIN/HousingConstants.cs.meta
Normal file
3
Assets/LIN/HousingConstants.cs.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: b0ce52df52334b1eaf37479fdda66f7a
|
||||
timeCreated: 1745303266
|
24
Assets/LIN/SuddenEventController.cs
Normal file
24
Assets/LIN/SuddenEventController.cs
Normal file
@ -0,0 +1,24 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
public class SuddenEventController
|
||||
{
|
||||
// 랜덤 값에 일치하는 함수를 리턴하기 위한 딕셔너리
|
||||
// AFTER_WORK_DENOMINATOR 값 확정 후에 키 값 수정
|
||||
private Dictionary<int, AfterWorkEvent> afterWorkEvents = new Dictionary<int, AfterWorkEvent>();
|
||||
public SuddenEventController()
|
||||
{
|
||||
afterWorkEvents.Add(0, AfterWorkEvent.OvertimeWork);
|
||||
afterWorkEvents.Add(1, AfterWorkEvent.TeamGathering);
|
||||
}
|
||||
|
||||
//퇴근 후 돌발 이벤트
|
||||
public AfterWorkEvent SuddenEventCalculator()
|
||||
{
|
||||
var index = Random.Range(0,HousingConstants.AFTER_WORK_DENOMINATOR);
|
||||
return afterWorkEvents.GetValueOrDefault(index, AfterWorkEvent.None);
|
||||
}
|
||||
|
||||
}
|
3
Assets/LIN/SuddenEventController.cs.meta
Normal file
3
Assets/LIN/SuddenEventController.cs.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 26ce8577425c4630903173b182839514
|
||||
timeCreated: 1745306651
|
File diff suppressed because one or more lines are too long
8
Assets/LYM/Materials.meta
Normal file
8
Assets/LYM/Materials.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 02303d18bbfec0e4b9f6699f1a0152d2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Materials/Glass.mat
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Materials/Glass.mat
(Stored with Git LFS)
Normal file
Binary file not shown.
8
Assets/LYM/Materials/Glass.mat.meta
Normal file
8
Assets/LYM/Materials/Glass.mat.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ecddda1709edab34c820484e3de09bea
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Scenes/HousingUI.unity
(Stored with Git LFS)
BIN
Assets/LYM/Scenes/HousingUI.unity
(Stored with Git LFS)
Binary file not shown.
8
Assets/LYM/Scripts.meta
Normal file
8
Assets/LYM/Scripts.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: bb031fff0dd38c1499e8108a1b04c699
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
113
Assets/LYM/Scripts/ChatWindowController.cs
Normal file
113
Assets/LYM/Scripts/ChatWindowController.cs
Normal file
@ -0,0 +1,113 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class ChatWindowController : MonoBehaviour, IPointerClickHandler
|
||||
{
|
||||
[SerializeField] private TMP_Text chatText;
|
||||
[SerializeField] private Image clickIndicator;
|
||||
|
||||
private Coroutine _typingCoroutine;
|
||||
private Coroutine _clickCoroutine;
|
||||
private string _inputText;
|
||||
private Queue<string> _inputQueue;
|
||||
|
||||
public delegate void OnComplete();
|
||||
public OnComplete onComplete;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
Init("마무리", () =>
|
||||
{
|
||||
Debug.Log("대화 끝.");
|
||||
});
|
||||
ShowText(_inputQueue.Dequeue());
|
||||
}
|
||||
|
||||
public void Init(string text, OnComplete onComplete)
|
||||
{
|
||||
_inputQueue = new Queue<string>();
|
||||
_inputQueue.Enqueue("아 망했어 오늘도 지각이다!!!! 이러면 진짜 해고당할 수도 있어!!!\n어떡하지 큰일이다!!!");
|
||||
_inputQueue.Enqueue("톼사하셈 ㅋ");
|
||||
_inputQueue.Enqueue("톼사하셈 ㅋ");
|
||||
_inputQueue.Enqueue("스킵도 가능 톼사하셈 ㅋ톼사하셈 ㅋ톼사하셈 ㅋ톼사하셈 ㅋ톼사하셈 ㅋ");
|
||||
_inputQueue.Enqueue(text);
|
||||
this.onComplete = onComplete;
|
||||
}
|
||||
|
||||
//화면에 표시할 텍스트 삽입 함수
|
||||
private void ShowText(string text)
|
||||
{
|
||||
var clickIndicatorColor = clickIndicator.color;
|
||||
clickIndicatorColor.a = 1;
|
||||
clickIndicator.color = clickIndicatorColor;
|
||||
_inputText = text;
|
||||
if (_typingCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_typingCoroutine);
|
||||
}
|
||||
_typingCoroutine = StartCoroutine(TypingEffectCoroutine(_inputText));
|
||||
}
|
||||
|
||||
//텍스트 타이핑효과 코루틴
|
||||
private IEnumerator TypingEffectCoroutine(string text)
|
||||
{
|
||||
StringBuilder strText = new StringBuilder();
|
||||
for (int i = 0; i < text.Length; i++)
|
||||
{
|
||||
strText.Append(text[i]);
|
||||
chatText.text = strText.ToString();
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
}
|
||||
|
||||
_clickCoroutine = StartCoroutine(ClickIndicatorCoroutine());
|
||||
_typingCoroutine = null;
|
||||
}
|
||||
|
||||
private IEnumerator ClickIndicatorCoroutine()
|
||||
{
|
||||
bool flag = true;
|
||||
var clickIndicatorColor = clickIndicator.color;
|
||||
while (true)
|
||||
{
|
||||
clickIndicatorColor.a = flag? 0:1;
|
||||
flag = !flag;
|
||||
clickIndicator.color = clickIndicatorColor;
|
||||
yield return new WaitForSeconds(0.5f);
|
||||
}
|
||||
}
|
||||
|
||||
//대화창 클릭 시 호출 함수
|
||||
public void OnPointerClick(PointerEventData eventData)
|
||||
{
|
||||
if (_typingCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_typingCoroutine);
|
||||
_typingCoroutine = null;
|
||||
chatText.text = _inputText;
|
||||
_clickCoroutine = StartCoroutine(ClickIndicatorCoroutine());
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_clickCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_clickCoroutine);
|
||||
_clickCoroutine = null;
|
||||
}
|
||||
if (_inputQueue.Count > 0)
|
||||
{
|
||||
ShowText(_inputQueue.Dequeue());
|
||||
}
|
||||
else
|
||||
{
|
||||
onComplete?.Invoke();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a5765847dbef51e4f9bccde712eeda30
|
||||
guid: c6d08eed775f1044ea141c88554ab445
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
83
Assets/LYM/Scripts/InteractionPanelController.cs
Normal file
83
Assets/LYM/Scripts/InteractionPanelController.cs
Normal file
@ -0,0 +1,83 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using System.Text;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
//로딩 상황
|
||||
public enum LoadingState
|
||||
{
|
||||
Housework,
|
||||
Go2Work,
|
||||
LeaveWork,
|
||||
Meal,
|
||||
Dungeon
|
||||
}
|
||||
//집안일 목록
|
||||
public enum HouseworkState
|
||||
{
|
||||
Laundry,
|
||||
Cleaning,
|
||||
|
||||
}
|
||||
|
||||
public class InteractionPanelController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Image doingImage;
|
||||
[SerializeField] private TMP_Text doingText;
|
||||
[SerializeField] private Animator animator;
|
||||
|
||||
private Coroutine _textAnimCoroutine;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
Init(LoadingState.Housework);
|
||||
}
|
||||
|
||||
private void Init(LoadingState state)
|
||||
{
|
||||
if (_textAnimCoroutine != null)
|
||||
{
|
||||
StopCoroutine(_textAnimCoroutine);
|
||||
}
|
||||
switch (state)
|
||||
{
|
||||
case LoadingState.Housework:
|
||||
doingText.text = "세탁하는 중";
|
||||
animator.Play("Laundry");
|
||||
break;
|
||||
case LoadingState.Go2Work:
|
||||
doingText.text = "출근하는 중";
|
||||
break;
|
||||
case LoadingState.LeaveWork:
|
||||
doingText.text = "퇴근하는 중";
|
||||
break;
|
||||
case LoadingState.Meal:
|
||||
doingText.text = "식사하는 중";
|
||||
break;
|
||||
case LoadingState.Dungeon:
|
||||
doingText.text = "던전 진입하는 중";
|
||||
break;
|
||||
}
|
||||
_textAnimCoroutine = StartCoroutine(TextAnimation());
|
||||
}
|
||||
|
||||
private IEnumerator TextAnimation()
|
||||
{
|
||||
var tempText = doingText.text;
|
||||
float startTime = Time.time;
|
||||
while (Time.time - startTime < 3)
|
||||
{
|
||||
for (int i = 0; i < 3; i++)
|
||||
{
|
||||
yield return new WaitForSeconds(0.3f);
|
||||
doingText.text = tempText + new string('.', i + 1);
|
||||
}
|
||||
yield return new WaitForSeconds(0.3f);
|
||||
}
|
||||
_textAnimCoroutine = null;
|
||||
}
|
||||
}
|
||||
|
11
Assets/LYM/Scripts/InteractionPanelController.cs.meta
Normal file
11
Assets/LYM/Scripts/InteractionPanelController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e1cce2eaa9f91c4439ec1749048f2df1
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
46
Assets/LYM/Scripts/JoystickPanelController.cs
Normal file
46
Assets/LYM/Scripts/JoystickPanelController.cs
Normal file
@ -0,0 +1,46 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEditor.SearchService;
|
||||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class JoystickPanelController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private GameObject dungeonUI;
|
||||
[SerializeField] private GameObject housingUI;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
dungeonUI.SetActive(false);
|
||||
housingUI.SetActive(false);
|
||||
//현재 씬 이름 확인해 UI 별 활성화 판단
|
||||
string sceneName = SceneManager.GetActiveScene().name;
|
||||
switch (sceneName)
|
||||
{
|
||||
case "HousingUI":
|
||||
housingUI.SetActive(true);
|
||||
break;
|
||||
case "DungeonUI":
|
||||
dungeonUI.SetActive(true);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
public void OnClickAttackButton()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void OnClickDashButton()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void OnClickInteractionButton()
|
||||
{
|
||||
|
||||
}
|
||||
}
|
23
Assets/LYM/Scripts/StatsPanelController.cs
Normal file
23
Assets/LYM/Scripts/StatsPanelController.cs
Normal file
@ -0,0 +1,23 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.UI;
|
||||
|
||||
public class StatsPanelController : MonoBehaviour
|
||||
{
|
||||
[SerializeField] private Slider healthSlider;
|
||||
[SerializeField] private Slider reputationSlider;
|
||||
[SerializeField] private TMP_Text healthText;
|
||||
[SerializeField] private TMP_Text reputationText;
|
||||
[SerializeField] private TMP_Text timeText;
|
||||
[SerializeField] private TMP_Text ampmText;
|
||||
[SerializeField] private TMP_Text numberText;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
healthSlider.interactable = false;
|
||||
reputationSlider.interactable = false;
|
||||
}
|
||||
}
|
11
Assets/LYM/Scripts/StatsPanelController.cs.meta
Normal file
11
Assets/LYM/Scripts/StatsPanelController.cs.meta
Normal file
@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 20ed70d0d6c60894e9186cf3c49b818b
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/2.5dButton.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/2.5dButton.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/2.5dButton.png.meta
Normal file
114
Assets/LYM/Sprites/2.5dButton.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 41c9ad4658536b84bb74af1668e1dd4f
|
||||
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: 100
|
||||
spriteBorder: {x: 229, y: 228, z: 228, w: 229}
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/38x38dot4slice.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/38x38dot4slice.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/38x38dot4slice.png.meta
Normal file
114
Assets/LYM/Sprites/38x38dot4slice.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 11fd25addefb2b5488766d5aed986d56
|
||||
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: 100
|
||||
spriteBorder: {x: 19, y: 19, z: 19, w: 19}
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
8
Assets/LYM/Sprites/LanudryMachine.meta
Normal file
8
Assets/LYM/Sprites/LanudryMachine.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e8e331d76d1397e47ae67df998b5c284
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/LaundryMachinAni.anim
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 45e541b6c0b8f7e49ae010acf07d0034
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 7400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/LaundryMachine.controller
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7e779556897b9824baf0e6a47276f61b
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 9100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine.png.meta
Normal file
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 721e47ab9d13f904494f5b8fe28aa097
|
||||
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: 100
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine2.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine2.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine2.png.meta
Normal file
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine2.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 2fa68a6a74369bb44bc651a12f61a3b3
|
||||
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: 100
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine3.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine3.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine3.png.meta
Normal file
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine3.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: a216780723c6a0548a1b0bc1e1f241b0
|
||||
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: 100
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine4.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/LanudryMachine/laundrymachine4.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine4.png.meta
Normal file
114
Assets/LYM/Sprites/LanudryMachine/laundrymachine4.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7f12433b80578284a83c53c9e56cc2ef
|
||||
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: 100
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 0
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/Sprites/Speechbubble.png
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/Sprites/Speechbubble.png
(Stored with Git LFS)
Normal file
Binary file not shown.
114
Assets/LYM/Sprites/Speechbubble.png.meta
Normal file
114
Assets/LYM/Sprites/Speechbubble.png.meta
Normal file
@ -0,0 +1,114 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d124efce3f162e7408695c446f8d5595
|
||||
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: 100
|
||||
spriteBorder: {x: 37, y: 20, z: 7, w: 7}
|
||||
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: 3
|
||||
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: 3
|
||||
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
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5e97eb03825dee720800000000000000
|
||||
internalID: 1537655665
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
secondaryTextures: []
|
||||
nameFileIdTable: {}
|
||||
mipmapLimitGroupName:
|
||||
pSDRemoveMatte: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/UIPrefabs/ChatWindowPanel.prefab
(Stored with Git LFS)
Normal file
BIN
Assets/LYM/UIPrefabs/ChatWindowPanel.prefab
(Stored with Git LFS)
Normal file
Binary file not shown.
7
Assets/LYM/UIPrefabs/ChatWindowPanel.prefab.meta
Normal file
7
Assets/LYM/UIPrefabs/ChatWindowPanel.prefab.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 05278c285f7049e49a69778586eb6744
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab
(Stored with Git LFS)
BIN
Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/LYM/UIPrefabs/JoystickPanel.prefab
(Stored with Git LFS)
BIN
Assets/LYM/UIPrefabs/JoystickPanel.prefab
(Stored with Git LFS)
Binary file not shown.
44
Assets/New Sprite Atlas.spriteatlas
Normal file
44
Assets/New Sprite Atlas.spriteatlas
Normal file
@ -0,0 +1,44 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!687078895 &4343727234628468602
|
||||
SpriteAtlas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: New Sprite Atlas
|
||||
m_EditorData:
|
||||
serializedVersion: 2
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
anisoLevel: 1
|
||||
compressionQuality: 50
|
||||
maxTextureSize: 2048
|
||||
textureCompression: 0
|
||||
filterMode: 1
|
||||
generateMipMaps: 0
|
||||
readable: 0
|
||||
crunchedCompression: 0
|
||||
sRGB: 1
|
||||
platformSettings: []
|
||||
packingSettings:
|
||||
serializedVersion: 2
|
||||
padding: 4
|
||||
blockOffset: 1
|
||||
allowAlphaSplitting: 0
|
||||
enableRotation: 1
|
||||
enableTightPacking: 1
|
||||
enableAlphaDilation: 0
|
||||
secondaryTextureSettings: {}
|
||||
variantMultiplier: 1
|
||||
packables: []
|
||||
bindAsDefault: 1
|
||||
isAtlasV2: 0
|
||||
cachedData: {fileID: 0}
|
||||
packedSpriteRenderDataKeys: []
|
||||
m_MasterAtlas: {fileID: 0}
|
||||
m_PackedSprites: []
|
||||
m_PackedSpriteNamesToIndex: []
|
||||
m_RenderDataMap: {}
|
||||
m_Tag: New Sprite Atlas
|
||||
m_IsVariant: 0
|
8
Assets/New Sprite Atlas.spriteatlas.meta
Normal file
8
Assets/New Sprite Atlas.spriteatlas.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 23a19c2052aab0240a04de1442e84512
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 4343727234628468602
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
3
Assets/Scripts/Character/Enemy/BossPattern.meta
Normal file
3
Assets/Scripts/Character/Enemy/BossPattern.meta
Normal file
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d3b800a343fe42afa7494329ef235461
|
||||
timeCreated: 1745300808
|
109
Assets/Scripts/Character/Enemy/BossPattern/AoeControllerBase.cs
Normal file
109
Assets/Scripts/Character/Enemy/BossPattern/AoeControllerBase.cs
Normal file
@ -0,0 +1,109 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
[Serializable]
|
||||
public struct DamageEffectData
|
||||
{
|
||||
public int damage;
|
||||
public float radius;
|
||||
public float delay;
|
||||
public LayerMask targetLayer;
|
||||
public GameObject explosionEffectPrefab;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// AOE 범위 공격의 공통 로직을 처리하는 추상 베이스 클래스입니다.
|
||||
/// </summary>
|
||||
public abstract class AoeControllerBase : MonoBehaviour
|
||||
{
|
||||
[Header("경고 이펙트")]
|
||||
[SerializeField] protected GameObject warningEffectInstance;
|
||||
|
||||
protected DamageEffectData _data;
|
||||
private Action _slashAction;
|
||||
private Action _destroyAction;
|
||||
|
||||
/// <summary>
|
||||
/// 범위 공격 이펙트를 설정하고, 딜레이 후 폭발을 실행합니다.
|
||||
/// </summary>
|
||||
public void SetEffect(DamageEffectData data, Action slashAction, Action destroyAction)
|
||||
{
|
||||
_data = data;
|
||||
_slashAction = slashAction;
|
||||
_destroyAction = destroyAction;
|
||||
|
||||
ShowWarningEffect();
|
||||
StartCoroutine(ExplodeAfterDelay());
|
||||
}
|
||||
|
||||
protected virtual void ShowWarningEffect()
|
||||
{
|
||||
if (warningEffectInstance != null)
|
||||
warningEffectInstance.SetActive(true);
|
||||
|
||||
float diameter = _data.radius * 2f;
|
||||
transform.localScale = new Vector3(diameter, 1f, diameter);
|
||||
}
|
||||
|
||||
private IEnumerator ExplodeAfterDelay()
|
||||
{
|
||||
yield return new WaitForSeconds(_data.delay);
|
||||
Explode();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 폭발 이펙트 생성, 데미지 처리, 콜백 호출 순서로 실행합니다.
|
||||
/// </summary>
|
||||
protected virtual void Explode()
|
||||
{
|
||||
// 경고 이펙트 숨기기
|
||||
if (warningEffectInstance != null)
|
||||
warningEffectInstance.SetActive(false);
|
||||
|
||||
ShowDamageEffect();
|
||||
|
||||
// 슬래시 액션(애니메이션 트리거) 호출
|
||||
_slashAction?.Invoke();
|
||||
|
||||
// 범위 내 데미지 처리
|
||||
HitCheck();
|
||||
|
||||
// 패턴 클리어 콜백
|
||||
_destroyAction?.Invoke();
|
||||
|
||||
// 자기 자신 제거
|
||||
Destroy(gameObject, 2f);
|
||||
}
|
||||
|
||||
protected virtual void HitCheck()
|
||||
{
|
||||
var hits = Physics.OverlapSphere(transform.position, _data.radius, _data.targetLayer);
|
||||
foreach (var hit in hits)
|
||||
{
|
||||
if (hit.CompareTag("Player"))
|
||||
{
|
||||
Debug.Log($"{hit.name}에게 {_data.damage} 데미지 적용");
|
||||
// TODO: 실제 데미지 처리 로직 호출
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void ShowDamageEffect()
|
||||
{
|
||||
// 폭발 이펙트 생성
|
||||
if (_data.explosionEffectPrefab != null)
|
||||
{
|
||||
var effect = Instantiate(_data.explosionEffectPrefab, transform.position, transform.rotation);
|
||||
effect.transform.localScale = new Vector3(_data.radius, _data.radius, _data.radius);
|
||||
Destroy(effect, 2f);
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void OnDrawGizmosSelected()
|
||||
{
|
||||
Gizmos.color = Color.red;
|
||||
Gizmos.DrawWireSphere(transform.position, _data.radius);
|
||||
}
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 1dd40dca214a4038be21f64ce645e5d9
|
||||
timeCreated: 1745393630
|
@ -0,0 +1,4 @@
|
||||
public class BoomAoeController : AoeControllerBase
|
||||
{
|
||||
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e32c2002701d49df83faa36b3da55436
|
||||
timeCreated: 1745395178
|
@ -0,0 +1,19 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using UnityEngine;
|
||||
|
||||
|
||||
|
||||
public class ChariotAoeController : AoeControllerBase
|
||||
{
|
||||
protected override void ShowDamageEffect()
|
||||
{
|
||||
// 폭발 이펙트 생성
|
||||
if (_data.explosionEffectPrefab != null)
|
||||
{
|
||||
var effect = Instantiate(_data.explosionEffectPrefab, transform.position, transform.rotation);
|
||||
effect.transform.localScale = new Vector3(2f, 2f, 2f);
|
||||
Destroy(effect, 2f);
|
||||
}
|
||||
}
|
||||
}
|
@ -0,0 +1,52 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class HorizontalAoeController : AoeControllerBase
|
||||
{
|
||||
private float slashAngle = 270f;
|
||||
private int gizmoSegments = 20;
|
||||
protected override void HitCheck()
|
||||
{
|
||||
var hits = Physics.OverlapSphere(transform.position, _data.radius, _data.targetLayer);
|
||||
foreach (var hit in hits)
|
||||
{
|
||||
if (!hit.CompareTag("Player")) continue;
|
||||
|
||||
Vector3 dir = hit.transform.position - transform.position;
|
||||
dir.y = 0;
|
||||
float angleToForward = Vector3.Angle(transform.forward, dir);
|
||||
|
||||
if (angleToForward <= slashAngle * 0.5f)
|
||||
{
|
||||
Debug.Log($"{hit.name}이(가) 횡적 슬래시 데미지 범위에 있습니다.");
|
||||
Debug.Log($"{hit.name}에게 {_data.damage} 데미지 적용");
|
||||
// TODO: 실제 데미지 처리 로직 호출
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDrawGizmosSelected()
|
||||
{
|
||||
// 부채꼴 형태 기즈모 드로잉
|
||||
Gizmos.color = Color.red;
|
||||
Vector3 origin = transform.position;
|
||||
float halfAngle = slashAngle * 0.5f;
|
||||
float step = slashAngle / gizmoSegments;
|
||||
|
||||
// 시작 포인트
|
||||
Vector3 prevDir = Quaternion.AngleAxis(-halfAngle, Vector3.up) * transform.forward;
|
||||
Vector3 prevPoint = origin + prevDir.normalized * _data.radius;
|
||||
Gizmos.DrawLine(origin, prevPoint);
|
||||
|
||||
for (int i = 1; i <= gizmoSegments; i++)
|
||||
{
|
||||
float currentAngle = -halfAngle + step * i;
|
||||
Vector3 currDir = Quaternion.AngleAxis(currentAngle, Vector3.up) * transform.forward;
|
||||
Vector3 currPoint = origin + currDir.normalized * _data.radius;
|
||||
Gizmos.DrawLine(prevPoint, currPoint);
|
||||
prevPoint = currPoint;
|
||||
}
|
||||
|
||||
// 마지막 라인
|
||||
Gizmos.DrawLine(origin, prevPoint);
|
||||
}
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: e77da766410d47f9a7effebd30fd33f6
|
||||
timeCreated: 1745394588
|
@ -0,0 +1,51 @@
|
||||
using UnityEngine;
|
||||
|
||||
public class VerticalAoeController : AoeControllerBase
|
||||
{
|
||||
|
||||
protected override void ShowWarningEffect()
|
||||
{
|
||||
if (warningEffectInstance != null)
|
||||
warningEffectInstance.SetActive(true);
|
||||
|
||||
var centerCap = Vector3.forward * _data.radius;
|
||||
float diameter = _data.radius * 2f;
|
||||
transform.localScale = new Vector3(_data.radius, 1f, diameter);
|
||||
transform.Translate(centerCap, Space.Self);
|
||||
}
|
||||
|
||||
protected override void ShowDamageEffect()
|
||||
{
|
||||
// 폭발 이펙트 생성
|
||||
if (_data.explosionEffectPrefab != null)
|
||||
{
|
||||
var effect = Instantiate(_data.explosionEffectPrefab, transform.position, transform.rotation);
|
||||
effect.transform.localScale = new Vector3(_data.radius, _data.radius, _data.radius);
|
||||
Destroy(effect, 2f);
|
||||
}
|
||||
}
|
||||
|
||||
protected override void HitCheck()
|
||||
{
|
||||
// 박스 판정 (사각형 직선)
|
||||
Vector3 halfExtents = new Vector3(_data.radius, 1f, _data.radius * 2f);
|
||||
Collider[] hits = Physics.OverlapBox(transform.position, halfExtents, transform.rotation, _data.targetLayer);
|
||||
|
||||
foreach (var hit in hits)
|
||||
{
|
||||
if (!hit.CompareTag("Player")) continue;
|
||||
Debug.Log($"{hit.name} 사각형 범위에 있어 데미지 적용");
|
||||
// TODO: 데미지 로직
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDrawGizmosSelected()
|
||||
{
|
||||
Gizmos.color = Color.red;
|
||||
Vector3 center = transform.position;
|
||||
Vector3 size = new Vector3(_data.radius, 1f, _data.radius * 2f);
|
||||
Gizmos.matrix = Matrix4x4.TRS(center, transform.rotation, Vector3.one);
|
||||
Gizmos.DrawWireCube(Vector3.zero, size);
|
||||
Gizmos.matrix = Matrix4x4.identity;
|
||||
}
|
||||
}
|
@ -0,0 +1,3 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 8eb40ee5f0d943469026d2b6522dbe46
|
||||
timeCreated: 1745393484
|
@ -1,14 +0,0 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class EnemyAnimatorStateAttack : StateMachineBehaviour
|
||||
{
|
||||
// OnStateExit is called when a transition ends and the state machine finishes evaluating this state
|
||||
// override public void OnStateExit(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
|
||||
// {
|
||||
// animator.gameObject.GetComponent<EnemyController>().SetState(EnemyState.Trace);
|
||||
// }
|
||||
|
||||
|
||||
}
|
@ -1,42 +0,0 @@
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
||||
public class EnemyAttackController : MonoBehaviour
|
||||
{
|
||||
[Header("각종 전조 오브젝트")]
|
||||
[SerializeField] private GameObject verticalWarningArea;
|
||||
[SerializeField] private GameObject horizontalWarningArea;
|
||||
[SerializeField] private GameObject chariotWarningArea;
|
||||
[SerializeField] private GameObject dynamoWarningArea;
|
||||
|
||||
// 배열에 담아서 관리
|
||||
private List<GameObject> warningAreas;
|
||||
private GameObject _activeArea;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
warningAreas = new List<GameObject>()
|
||||
{
|
||||
verticalWarningArea,
|
||||
horizontalWarningArea,
|
||||
chariotWarningArea,
|
||||
dynamoWarningArea
|
||||
};
|
||||
}
|
||||
|
||||
// 랜덤 전조 호출
|
||||
public void TriggerRandomWarning(Vector3 spawnPosition, Quaternion spawnRotation)
|
||||
{
|
||||
// 0 ~ Count-1 사이 랜덤 인덱스
|
||||
int idx = Random.Range(0, warningAreas.Count);
|
||||
GameObject selected = warningAreas[idx];
|
||||
|
||||
// 예시: Instantiate 방식으로 화면에 띄우기
|
||||
_activeArea = Instantiate(selected, spawnPosition, spawnRotation);
|
||||
}
|
||||
|
||||
public void DestroyWarningArea()
|
||||
{
|
||||
Destroy(_activeArea);
|
||||
}
|
||||
}
|
@ -2,49 +2,46 @@
|
||||
using UnityEngine;
|
||||
using UnityEngine.AI;
|
||||
|
||||
public enum EnemyState { None, Idle, Trace, Attack, GetHit, Move, Dead }
|
||||
public enum EnemyState { None, Idle, Trace, Attack, Dead }
|
||||
|
||||
[RequireComponent(typeof(NavMeshAgent))]
|
||||
[RequireComponent(typeof(Animator))]
|
||||
[RequireComponent(typeof(EnemyAttackController))]
|
||||
public abstract class EnemyController : CharacterBase
|
||||
{
|
||||
[Header("AI")]
|
||||
[SerializeField] private float detectCircleRadius = 10f; // 플레이어 탐지 범위
|
||||
[SerializeField] private LayerMask targetLayerMask; // 플레이어 레이어 마스크
|
||||
|
||||
public Transform TraceTargetTransform { get; private set; }
|
||||
public NavMeshAgent Agent { get; private set; }
|
||||
public Animator EnemyAnimator { get; private set; }
|
||||
|
||||
public EnemyState CurrentState {get; private set;}
|
||||
public LayerMask TargetLayerMask => targetLayerMask;
|
||||
public float MoveSpeed => moveSpeed;
|
||||
public bool IsMeleeCombat { get; protected set; }
|
||||
|
||||
public EnemyAttackController EnemyAttackController { get; private set; }
|
||||
|
||||
public float WalkSpeed => walkSpeed;
|
||||
public float RunSpeed => runSpeed;
|
||||
|
||||
public Transform TraceTargetTransform { get; private set; }
|
||||
|
||||
[SerializeField] private float walkSpeed = 5;
|
||||
[SerializeField] private float runSpeed = 8;
|
||||
// -----
|
||||
// 애니메이션 관련
|
||||
private int _currentAnimationTrigger = -1;
|
||||
|
||||
// 애니메이션 파라미터 해시값
|
||||
public static readonly int Idle = Animator.StringToHash("Idle");
|
||||
public static readonly int Dead = Animator.StringToHash("Dead");
|
||||
public static readonly int Trace = Animator.StringToHash("Trace");
|
||||
|
||||
// -----
|
||||
// 상태 변수
|
||||
private EnemyStateIdle _enemyStateIdle;
|
||||
private EnemyStateTrace _enemyStateTrace;
|
||||
private EnemyStateAttack _enemyStateAttack;
|
||||
private EnemyStateGetHit _enemyStateGetHit;
|
||||
private EnemyStateDead _enemyStateDead;
|
||||
private EnemyStateMove _enemyStateMove;
|
||||
|
||||
private Dictionary<EnemyState, IEnemyState> _enemyStates;
|
||||
|
||||
private void Awake()
|
||||
protected virtual void Awake()
|
||||
{
|
||||
EnemyAnimator = GetComponent<Animator>();
|
||||
Agent = GetComponent<NavMeshAgent>();
|
||||
EnemyAttackController = GetComponent<EnemyAttackController>();
|
||||
}
|
||||
|
||||
protected override void Start()
|
||||
@ -55,24 +52,20 @@ public abstract class EnemyController : CharacterBase
|
||||
_enemyStateIdle = new EnemyStateIdle();
|
||||
_enemyStateTrace = new EnemyStateTrace();
|
||||
_enemyStateAttack = new EnemyStateAttack();
|
||||
_enemyStateGetHit = new EnemyStateGetHit();
|
||||
_enemyStateDead = new EnemyStateDead();
|
||||
_enemyStateMove = new EnemyStateMove();
|
||||
|
||||
_enemyStates = new Dictionary<EnemyState, IEnemyState>
|
||||
{
|
||||
{ EnemyState.Idle, _enemyStateIdle },
|
||||
{ EnemyState.Trace, _enemyStateTrace },
|
||||
{ EnemyState.Attack, _enemyStateAttack },
|
||||
{ EnemyState.GetHit, _enemyStateGetHit },
|
||||
{ EnemyState.Dead, _enemyStateDead },
|
||||
{ EnemyState.Move, _enemyStateMove}
|
||||
};
|
||||
|
||||
SetState(EnemyState.Idle);
|
||||
}
|
||||
|
||||
private void Update()
|
||||
protected virtual void Update()
|
||||
{
|
||||
if (CurrentState != EnemyState.None)
|
||||
{
|
||||
@ -90,6 +83,14 @@ public abstract class EnemyController : CharacterBase
|
||||
_enemyStates[CurrentState].Enter(this);
|
||||
}
|
||||
|
||||
|
||||
public override void Die()
|
||||
{
|
||||
base.Die();
|
||||
// TODO : 사망 후 동작
|
||||
|
||||
}
|
||||
|
||||
#region 적 탐지
|
||||
|
||||
// 일정 반경에 플레이어가 진입하면 플레이어 소리를 감지했다고 판단
|
||||
@ -107,5 +108,38 @@ public abstract class EnemyController : CharacterBase
|
||||
|
||||
#endregion
|
||||
|
||||
#region 애니메이션 제어
|
||||
|
||||
// Trigger
|
||||
public void SetAnimation(int hashName)
|
||||
{
|
||||
if (_currentAnimationTrigger != -1)
|
||||
{
|
||||
EnemyAnimator.ResetTrigger(_currentAnimationTrigger);
|
||||
}
|
||||
|
||||
EnemyAnimator.SetTrigger(hashName);
|
||||
_currentAnimationTrigger = hashName;
|
||||
}
|
||||
|
||||
// Bool
|
||||
public void SetAnimation(int hashName, bool value)
|
||||
{
|
||||
EnemyAnimator.SetBool(hashName, value);
|
||||
}
|
||||
|
||||
// Float
|
||||
public void SetAnimation(int hashName, float value)
|
||||
{
|
||||
EnemyAnimator.SetFloat(hashName, value);
|
||||
}
|
||||
|
||||
// Integer
|
||||
public void SetAnimation(int hashName, int value)
|
||||
{
|
||||
EnemyAnimator.SetInteger(hashName, value);
|
||||
}
|
||||
|
||||
#endregion
|
||||
}
|
||||
|
||||
|
@ -4,65 +4,21 @@ using UnityEngine;
|
||||
|
||||
public class EnemyStateAttack : IEnemyState
|
||||
{
|
||||
private static readonly int VertiSlash = Animator.StringToHash("VertiSlash");
|
||||
private static readonly int VertiAttack = Animator.StringToHash("VertiAttack");
|
||||
|
||||
private EnemyController _enemyController;
|
||||
private Animator _animator;
|
||||
private Coroutine _attackRoutine;
|
||||
private EnemyAttackController _enemyAttackController;
|
||||
private enum AttackType
|
||||
{
|
||||
VerticalAttack, // 위에서 아래로 베는 것
|
||||
HorizontalAttack, // 옆으로 베는 것
|
||||
ChariotAttack, // 원형
|
||||
DynamoAttack, // 도넛
|
||||
};
|
||||
|
||||
private AttackType _currentAttackType;
|
||||
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
_animator = _enemyController.EnemyAnimator;
|
||||
_enemyAttackController = _enemyController.EnemyAttackController;
|
||||
_animator.SetBool(VertiAttack, true);
|
||||
_attackRoutine = _enemyController.StartCoroutine(VerticalAttackSequence());
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
}
|
||||
|
||||
private IEnumerator VerticalAttackSequence()
|
||||
{
|
||||
// 1. 전조 이펙트 생성
|
||||
_enemyAttackController.TriggerRandomWarning(_enemyController.transform.position, _enemyController.transform.rotation);
|
||||
// 2. 검을 들어올림
|
||||
yield return new WaitForSeconds(3f);
|
||||
|
||||
// 3. 대기(전조와 검 들어올리는 애니메이션을 위함)
|
||||
|
||||
// 4. 검 휘두르기
|
||||
_animator.SetTrigger(VertiSlash);
|
||||
_enemyAttackController.DestroyWarningArea();
|
||||
// TODO : 5. 공격 판정 발생
|
||||
|
||||
yield return new WaitForSeconds(1f);
|
||||
// 6. 애니메이션 트리거 종료 -> 애니메이터 상태 머신으로 처리
|
||||
_enemyController.SetState(EnemyState.Trace);
|
||||
}
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
if (_attackRoutine != null)
|
||||
{
|
||||
_enemyController.StopCoroutine(_attackRoutine);
|
||||
_attackRoutine = null;
|
||||
}
|
||||
_animator.SetBool(VertiAttack, false);
|
||||
_animator = null;
|
||||
_enemyAttackController = null;
|
||||
_enemyController = null;
|
||||
}
|
||||
}
|
@ -5,7 +5,7 @@
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
_enemyController.EnemyAnimator.SetTrigger("Dead");
|
||||
_enemyController.SetAnimation(EnemyController.Dead);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
|
@ -1,19 +0,0 @@
|
||||
public class EnemyStateGetHit: IEnemyState
|
||||
{
|
||||
private EnemyController _enemyController;
|
||||
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
_enemyController = null;
|
||||
}
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7067b1b0eacf490c863a4cb68c290d3a
|
||||
timeCreated: 1744799049
|
@ -2,13 +2,14 @@
|
||||
|
||||
public class EnemyStateIdle: IEnemyState
|
||||
{
|
||||
private static readonly int Idle = Animator.StringToHash("Idle");
|
||||
|
||||
private EnemyController _enemyController;
|
||||
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
_enemyController.EnemyAnimator.SetBool(Idle, true);
|
||||
Debug.Log("## Idle 상태 진입");
|
||||
_enemyController.SetAnimation(EnemyController.Idle, true);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
@ -22,7 +23,7 @@ public class EnemyStateIdle: IEnemyState
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
_enemyController.EnemyAnimator.SetBool(Idle, false);
|
||||
_enemyController.SetAnimation(EnemyController.Idle, false);
|
||||
_enemyController = null;
|
||||
}
|
||||
}
|
@ -1,19 +0,0 @@
|
||||
public class EnemyStateMove : IEnemyState
|
||||
{
|
||||
private EnemyController _enemyController;
|
||||
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
_enemyController = null;
|
||||
}
|
||||
}
|
@ -1,3 +0,0 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 5abb29c9137942fe95bc66670d8ef521
|
||||
timeCreated: 1744799142
|
@ -2,9 +2,6 @@
|
||||
|
||||
public class EnemyStateTrace : IEnemyState
|
||||
{
|
||||
private static readonly int MoveSpeed = Animator.StringToHash("MoveSpeed");
|
||||
private static readonly int Trace = Animator.StringToHash("Trace");
|
||||
|
||||
private EnemyController _enemyController;
|
||||
private Transform _detectPlayerTransform;
|
||||
|
||||
@ -14,7 +11,7 @@ public class EnemyStateTrace : IEnemyState
|
||||
public void Enter(EnemyController enemyController)
|
||||
{
|
||||
_enemyController = enemyController;
|
||||
|
||||
Debug.Log("## Trace 상태 진입");
|
||||
_detectPlayerTransform = _enemyController.TraceTargetTransform;
|
||||
if (!_detectPlayerTransform)
|
||||
{
|
||||
@ -28,24 +25,31 @@ public class EnemyStateTrace : IEnemyState
|
||||
_enemyController.Agent.SetDestination(_detectPlayerTransform.position);
|
||||
}
|
||||
|
||||
_enemyController.EnemyAnimator.SetBool(Trace, true);
|
||||
_enemyController.SetAnimation(EnemyController.Trace, true);
|
||||
}
|
||||
|
||||
public void Update()
|
||||
{
|
||||
// 일정 주기로 찾은 플레이어의 위치를 갱신해서 갱신된 위치로 이동
|
||||
FindTargetPosition();
|
||||
if(_enemyController.IsMeleeCombat) return;
|
||||
if (_enemyController.Agent.enabled != true) return;
|
||||
|
||||
PlayerTracking();
|
||||
|
||||
if (_enemyController.Agent.remainingDistance <= _enemyController.Agent.stoppingDistance)
|
||||
{
|
||||
// TODO: 타겟에 도착함 -> 공격 준비
|
||||
_enemyController.SetState(EnemyState.Attack);
|
||||
// _enemyController.SetState(EnemyState.Attack);
|
||||
}
|
||||
}
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
_detectPlayerTransform = null;
|
||||
_enemyController.SetAnimation(EnemyController.Trace, false);
|
||||
_enemyController = null;
|
||||
}
|
||||
|
||||
// 일정 주기로 찾은 플레이어의 위치를 갱신해서 갱신된 위치로 이동
|
||||
private void FindTargetPosition()
|
||||
{
|
||||
if (_detectPlayerInCircleWaitTime > MaxDetectPlayerInCircleWaitTime)
|
||||
@ -67,26 +71,16 @@ public class EnemyStateTrace : IEnemyState
|
||||
// 플레이어를 추적하는 속도를 제어하는 함수
|
||||
private void PlayerTracking()
|
||||
{
|
||||
FindTargetPosition();
|
||||
|
||||
float distance = (_detectPlayerTransform.position - _enemyController.transform.position).magnitude;
|
||||
|
||||
if (distance > 5f)
|
||||
{
|
||||
// 먼 거리: 뛰기
|
||||
_enemyController.Agent.speed = _enemyController.RunSpeed;
|
||||
_enemyController.Agent.acceleration = 20f;
|
||||
_enemyController.Agent.angularSpeed = 270f;
|
||||
// _enemyController.EnemyAnimator.SetFloat("MoveSpeed", 1f); // 애니메이션도 Run으로
|
||||
|
||||
// NavMeshAgent 회전에 맡기기
|
||||
_enemyController.Agent.updateRotation = true;
|
||||
}
|
||||
else if (distance > 2f)
|
||||
if (distance > 2f)
|
||||
{
|
||||
// 가까운 거리: 걷기
|
||||
_enemyController.Agent.speed = _enemyController.WalkSpeed;
|
||||
_enemyController.Agent.speed = _enemyController.MoveSpeed;
|
||||
_enemyController.Agent.acceleration = 8f;
|
||||
_enemyController.Agent.angularSpeed = 720f;
|
||||
// _enemyController.EnemyAnimator.SetFloat("MoveSpeed", 0.4f); // Walk 애니메이션
|
||||
|
||||
_enemyController.Agent.updateRotation = true;
|
||||
}
|
||||
@ -107,23 +101,7 @@ public class EnemyStateTrace : IEnemyState
|
||||
Time.deltaTime * 10f // 회전 속도
|
||||
);
|
||||
}
|
||||
|
||||
// _enemyController.Agent.angularSpeed = 1080f;
|
||||
// _enemyController.Agent.acceleration = 999f;
|
||||
|
||||
// _enemyController.EnemyAnimator.SetFloat("MoveSpeed", 0f);
|
||||
}
|
||||
|
||||
// 실제 속도 기반으로 애니메이션 제어
|
||||
float currentSpeed = _enemyController.Agent.velocity.magnitude;
|
||||
_enemyController.EnemyAnimator.SetFloat(MoveSpeed, currentSpeed);
|
||||
}
|
||||
|
||||
public void Exit()
|
||||
{
|
||||
_detectPlayerTransform = null;
|
||||
_enemyController.EnemyAnimator.SetBool(Trace, false);
|
||||
_enemyController = null;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1,7 +1,208 @@
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using Unity.VisualScripting;
|
||||
using UnityEngine;
|
||||
using UnityEngine.Serialization;
|
||||
using Random = UnityEngine.Random;
|
||||
|
||||
public class PldDogController : EnemyController
|
||||
{
|
||||
private static readonly int WindUp = Animator.StringToHash("WindUp");
|
||||
private static readonly int Slash = Animator.StringToHash("Slash");
|
||||
private static readonly int BoomShot = Animator.StringToHash("BoomShot");
|
||||
|
||||
[Header("공격 패턴 관련")]
|
||||
[SerializeField] private float patternInterval = 3f;
|
||||
[SerializeField] private float meleeRange = 2f;
|
||||
[SerializeField] private float bombTriggerDelay = 1.5f;
|
||||
|
||||
[Header("폭탄 패턴 설정")]
|
||||
[SerializeField] private int bombCount = 1;
|
||||
[SerializeField] private Vector3 bombScale = new Vector3(5f, 5f, 5f);
|
||||
|
||||
[Header("각종 데미지 이펙트 세트")]
|
||||
[SerializeField] private GameObject chariotSlashWarning;
|
||||
[SerializeField] private GameObject chariotSlash;
|
||||
[SerializeField] private GameObject boomExplosion;
|
||||
|
||||
[Space(10)]
|
||||
[SerializeField] private GameObject verticalWarning;
|
||||
[SerializeField] private GameObject verticalSlash;
|
||||
|
||||
[Space(10)]
|
||||
[SerializeField] private GameObject horizontalWarning;
|
||||
[SerializeField] private GameObject horizontalSlash;
|
||||
|
||||
private float _patternTimer = 0f;
|
||||
private int _currentPatternIndex = 0;
|
||||
private bool _isPatternRunning = false;
|
||||
private bool _isFirstAttack = true;
|
||||
|
||||
private List<Action> _patternActions;
|
||||
|
||||
protected override void Awake()
|
||||
{
|
||||
base.Awake();
|
||||
|
||||
_patternActions = new List<Action>
|
||||
{
|
||||
ChariotSlashPattern,
|
||||
VerticalSlashPattern,
|
||||
HorizontalSlashPattern
|
||||
};
|
||||
}
|
||||
|
||||
protected override void Update()
|
||||
{
|
||||
base.Update();
|
||||
|
||||
if (CurrentState != EnemyState.Trace || _isPatternRunning)
|
||||
return;
|
||||
|
||||
float distanceToPlayer = Vector3.Distance(transform.position, TraceTargetTransform.position);
|
||||
|
||||
if (distanceToPlayer <= meleeRange) // 근접 범위
|
||||
{
|
||||
if (!Agent.isStopped) Agent.isStopped = true;
|
||||
_patternTimer += Time.deltaTime;
|
||||
|
||||
if (!_isPatternRunning && (_isFirstAttack || _patternTimer >= patternInterval))
|
||||
{
|
||||
ExecutePattern(_currentPatternIndex);
|
||||
|
||||
_isFirstAttack = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Agent.isStopped) Agent.isStopped = false;
|
||||
Agent.SetDestination(TraceTargetTransform.position);
|
||||
_patternTimer += Time.deltaTime;
|
||||
|
||||
if (!_isPatternRunning && _patternTimer >= patternInterval)
|
||||
{
|
||||
BombThrowPattern();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ExecutePattern(int patternIndex)
|
||||
{
|
||||
_isPatternRunning = true;
|
||||
Agent.isStopped = true;
|
||||
IsMeleeCombat = true;
|
||||
|
||||
_patternActions[_currentPatternIndex]?.Invoke();
|
||||
|
||||
_currentPatternIndex = (_currentPatternIndex + 1) % _patternActions.Count; // 패턴 순환
|
||||
}
|
||||
|
||||
// 순환 패턴과 별개로 동작하는 특수 패턴
|
||||
private void BombThrowPattern()
|
||||
{
|
||||
Debug.Log("BombThrowPattern: 보스가 폭탄을 던집니다.");
|
||||
SetAnimation(BoomShot);
|
||||
_isPatternRunning = true;
|
||||
Agent.isStopped = true;
|
||||
|
||||
for (int i = 0; i < bombCount; i++)
|
||||
{
|
||||
Vector3 targetPos = TraceTargetTransform.position;
|
||||
targetPos.y = 0.1f; // 지면에 맞춤
|
||||
|
||||
var warning = Instantiate(chariotSlashWarning, targetPos, Quaternion.identity);
|
||||
warning.transform.localScale = bombScale;
|
||||
var aoe = warning.GetComponent<BoomAoeController>();
|
||||
|
||||
var effectData = new DamageEffectData
|
||||
{
|
||||
damage = (int)attackPower,
|
||||
radius = bombScale.x,
|
||||
delay = bombTriggerDelay,
|
||||
targetLayer = TargetLayerMask,
|
||||
explosionEffectPrefab = boomExplosion
|
||||
};
|
||||
|
||||
aoe.SetEffect(effectData, null, PatternClear);
|
||||
}
|
||||
}
|
||||
|
||||
private void ChariotSlashPattern()
|
||||
{
|
||||
Debug.Log("ChariotSlashPattern: 보스가 차지 슬래시를 사용합니다.");
|
||||
WindUpAnimation();
|
||||
|
||||
var warning = Instantiate(chariotSlashWarning, transform.position, Quaternion.identity)
|
||||
.GetComponent<ChariotAoeController>();
|
||||
|
||||
var effectData = new DamageEffectData
|
||||
{
|
||||
damage = (int)attackPower,
|
||||
radius = 7.5f,
|
||||
delay = 2.5f,
|
||||
targetLayer = TargetLayerMask,
|
||||
explosionEffectPrefab = chariotSlash
|
||||
};
|
||||
|
||||
warning.SetEffect(effectData, SlashAnimationPlay, PatternClear);
|
||||
}
|
||||
|
||||
private void VerticalSlashPattern()
|
||||
{
|
||||
Debug.Log("VerticalSlashPattern: 보스가 수직 슬래시를 사용합니다.");
|
||||
WindUpAnimation();
|
||||
|
||||
var warning = Instantiate(verticalWarning, transform.position, transform.rotation)
|
||||
.GetComponent<VerticalAoeController>();
|
||||
|
||||
var effectData = new DamageEffectData
|
||||
{
|
||||
damage = (int)attackPower,
|
||||
radius = 5f,
|
||||
delay = 2f,
|
||||
targetLayer = TargetLayerMask,
|
||||
explosionEffectPrefab = verticalSlash
|
||||
};
|
||||
|
||||
warning.SetEffect(effectData, SlashAnimationPlay, PatternClear);
|
||||
}
|
||||
|
||||
private void HorizontalSlashPattern()
|
||||
{
|
||||
Debug.Log("HorizontalSlashPattern: 보스가 횡적 슬래시를 사용합니다.");
|
||||
WindUpAnimation();
|
||||
|
||||
var warning = Instantiate(horizontalWarning, transform.position, transform.rotation)
|
||||
.GetComponent<HorizontalAoeController>();
|
||||
|
||||
var effectData = new DamageEffectData
|
||||
{
|
||||
damage = (int)attackPower,
|
||||
radius = 15f,
|
||||
delay = 2f,
|
||||
targetLayer = TargetLayerMask,
|
||||
explosionEffectPrefab = horizontalSlash
|
||||
};
|
||||
|
||||
warning.SetEffect(effectData, SlashAnimationPlay, PatternClear);
|
||||
}
|
||||
|
||||
private void WindUpAnimation()
|
||||
{
|
||||
SetAnimation(WindUp);
|
||||
}
|
||||
|
||||
private void SlashAnimationPlay()
|
||||
{
|
||||
SetAnimation(Slash);
|
||||
}
|
||||
|
||||
private void PatternClear()
|
||||
{
|
||||
_isPatternRunning = false;
|
||||
IsMeleeCombat = false;
|
||||
_patternTimer = 0f;
|
||||
Agent.isStopped = false;
|
||||
}
|
||||
}
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user