Skip to content

feat: 데스매치 구현 시도 #50

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

Merged
BeepBeepMaeae merged 8 commits into from
Mar 10, 2026
Merged

feat: 데스매치 구현 시도 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
70faf3f
feat: 데스매치 구현 시도
BeepBeepMaeae Mar 4, 2026
45d87f4
feat: 데스매치 공격 모션 추가
BeepBeepMaeae Mar 5, 2026
249f761
Merge branch 'main' into DeathMatchTemp
BeepBeepMaeae Mar 5, 2026
7d5e28a
Merge branch 'main' into DeathMatchTemp
BeepBeepMaeae Mar 5, 2026
77c5f9a
feat: 머지
BeepBeepMaeae Mar 6, 2026
ea5cba5
Merge branch 'main' into DeathMatchTemp
BeepBeepMaeae Mar 10, 2026
f60784f
feat: 데스매치 충돌 해결
BeepBeepMaeae Mar 10, 2026
155bc0a
데스매치 코드 누락
BeepBeepMaeae Mar 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6,732 changes: 6,732 additions & 0 deletions GGJ26/Assets/00. Scenes/DeathMatchGameScene.unity
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions GGJ26/Assets/00. Scenes/DeathMatchGameScene.unity.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 GGJ26/Assets/00. Scenes/GameScene.unity
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6458,6 +6458,14 @@ PrefabInstance:
propertyPath: SortKey
value: 1306395723
objectReference: {fileID: 0}
- target: {fileID: 8329258970861036553, guid: fe9646060860870468e10550124355b1, type: 3}
propertyPath: NetworkedBehaviours.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8329258970861036553, guid: fe9646060860870468e10550124355b1, type: 3}
propertyPath: 'NetworkedBehaviours.Array.data[1]'
value:
objectReference: {fileID: 0}
- target: {fileID: 8702735901867188176, guid: fe9646060860870468e10550124355b1, type: 3}
propertyPath: SortKey
value: 3600773910
Expand Down
8 changes: 8 additions & 0 deletions GGJ26/Assets/01. Scripts/Network/Deathmatch.meta
View file
Open in desktop

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

Loading