Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

이서윤_3_31_DogKnight 과제 제출 #30

Open
wants to merge 27 commits into
base: seoyoon
Choose a base branch
from
Open

이서윤_3_31_DogKnight 과제 제출 #30

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
63acc1a
Update README.md
tehokim Mar 28, 2022
e434e59
3.28_DogKnight
tehokim Mar 28, 2022
487c6aa
3.28_DogKnight
tehokim Mar 29, 2022
2477096
feat: implement atttack and damage feature
jessi68 Mar 29, 2022
ab9f69c
feat: add enemy and player to gamemanager
jessi68 Mar 29, 2022
bbe062d
feat: player, enemy attack feature and motion
jessi68 Mar 29, 2022
4a7574d
fix: fix error that call init method twice
jessi68 Mar 29, 2022
7f363b0
fix: fix add observer not speccfied to specific character
jessi68 Mar 29, 2022
fbfd074
feat: call end method when game end
jessi68 Mar 29, 2022
8f5e294
0331_DogKnight_skeleton
tehokim Mar 31, 2022
b9ef236
Merge remote-tracking branch 'upstream/teho_0331_skeleton' into seoyoon
jessi68 Mar 31, 2022
9b8ae70
fix: fix error when merge with 3.30 assignment
jessi68 Mar 31, 2022
8dff3ec
feat: implement gameround image that text value changes as round changes
jessi68 Apr 2, 2022
a4360de
feat: implement class that update hp bar of player and enemy
jessi68 Apr 2, 2022
39f0e32
fix: fix hp update function from private to public
jessi68 Apr 2, 2022
019d8ae
fix: fix hp type int to float
jessi68 Apr 2, 2022
298da3a
feat: updated hp shown with ui
jessi68 Apr 3, 2022
8ce615a
fix: fix error that hp changes before attack motioon finished
jessi68 Apr 3, 2022
afd8893
feat: make attack button disabled and color changded until turn finished
jessi68 Apr 3, 2022
808875a
feat: add flame item and heal item with grid and meta ui
jessi68 Apr 3, 2022
0860fc6
feat: heal item and flame item feature
jessi68 Apr 4, 2022
f922b1a
feat: inventory open button
jessi68 Apr 4, 2022
00ab966
feat: inventory close button feature
jessi68 Apr 4, 2022
dcc3b01
feat: make inventory button only can opened when playr turn
jessi68 Apr 4, 2022
4350768
feat: game over text ui featurre
jessi68 Apr 4, 2022
f739ac5
feat: restore previous
jessi68 Apr 4, 2022
9da84f8
fix: fix error that items are overlapped
jessi68 Apr 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions Assets/DogKnight/Animator/DogControl.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -42,7 +42,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.70000005
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -64,7 +64,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.70000005
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -89,7 +89,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -108,25 +108,25 @@ AnimatorController:
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsSpecialAttack
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: GetHit
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
- m_Name: IsDead
m_Type: 9
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_Controller: {fileID: 9100000}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
Expand Down Expand Up @@ -160,7 +160,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down Expand Up @@ -353,7 +353,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.70000005
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand All @@ -378,7 +378,7 @@ AnimatorStateTransition:
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
Expand Down
8 changes: 8 additions & 0 deletions Assets/Resources/UI.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions Assets/Resources/UI/Popup.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading