mcutegs2/M-Gameton-06
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev

Browse Source
This commit is contained in:
aube.lee
2025-02-26 01:31:37 +09:00
parent 0dac23ba4a 3677c848d2
commit 4479a2ef19
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Gameton-06/Assets/Gameton/Scripts/Monster/MonsterBase.cs
View File

@@ -36,8 +36,9 @@ namespace TON
{ {
_animator = GetComponent<Animator>(); // 애니메이터 컴포넌트 초기화 _animator = GetComponent<Animator>(); // 애니메이터 컴포넌트 초기화
_stateMachine = new StateMachine(new IdleState(), this, _textState); // TODO : 추후 제거 예정
// _stateMachine = new StateMachine(new IdleState(), this); // _stateMachine = new StateMachine(new IdleState(), this, _textState);
_stateMachine = new StateMachine(new IdleState(), this);
InitializeMonsterData(); // 몬스터 데이터 로드 및 적용 InitializeMonsterData(); // 몬스터 데이터 로드 및 적용

10
Gameton-06/Assets/Gameton/Scripts/Monster/StateMachine.cs
View File

@@ -10,8 +10,9 @@ namespace TON
private MonsterBase _monsterBase; private MonsterBase _monsterBase;
private TextMeshProUGUI _textState; private TextMeshProUGUI _textState;
public StateMachine(IState state, MonsterBase monsterBase, TextMeshProUGUI textState) // TODO : 추후 제거 예정
// public StateMachine(IState state, MonsterBase monsterBase) // public StateMachine(IState state, MonsterBase monsterBase, TextMeshProUGUI textState)
public StateMachine(IState state, MonsterBase monsterBase)
{ {
// 초기 상태 객체 생성 // 초기 상태 객체 생성
_monsterBase = monsterBase;; _monsterBase = monsterBase;;
@@ -19,8 +20,9 @@ namespace TON
_state = state; _state = state;
_state.Enter(_monsterBase); _state.Enter(_monsterBase);
_textState = textState; // TODO : 추후 제거 예정
_textState.text = _state.ToString(); // _textState = textState;
// _textState.text = _state.ToString();
} }
public void Update() public void Update()