Merge pull request #148 from F7822/main

add playerOnGUI\destroy picked items\add armor and firearm ui
thuasta · May 8, 2024 · 6f7515d · 6f7515d
2 parents 11ae844 + 8d3fb8a
commit 6f7515d
Show file tree

Hide file tree

Showing 23 changed files with 93 additions and 2,046 deletions.
diff --git a/client/.DS_Store b/client/.DS_Store
diff --git a/client/Assets/.DS_Store b/client/Assets/.DS_Store
diff --git a/client/Assets/AnimationScene.unity b/client/Assets/AnimationScene.unity
diff --git a/client/Assets/AnimationScene.unity.meta b/client/Assets/AnimationScene.unity.meta
diff --git a/client/Assets/Resources/.DS_Store b/client/Assets/Resources/.DS_Store
diff --git a/client/Assets/Resources/Player/.DS_Store b/client/Assets/Resources/Player/.DS_Store
diff --git a/client/Assets/Resources/Player/Animation - single/.DS_Store b/client/Assets/Resources/Player/Animation - single/.DS_Store
diff --git a/client/Assets/Resources/Player/animation.meta b/client/Assets/Resources/Player/animation.meta
diff --git a/client/Assets/Resources/Player/animation/demo_combat_idle.FBX b/client/Assets/Resources/Player/animation/demo_combat_idle.FBX
diff --git a/client/Assets/Resources/Player/animation/demo_combat_idle.FBX.meta b/client/Assets/Resources/Player/animation/demo_combat_idle.FBX.meta
diff --git a/client/Assets/Resources/Player/animation/demo_combat_run.FBX b/client/Assets/Resources/Player/animation/demo_combat_run.FBX