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.

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

Feature/pages 업데이트 #303

Merged
merged 121 commits into from
May 24, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
121 commits
Select commit Hold shift + click to select a range
100d458
호출 직전까지
bryanjang May 19, 2024
2652f7b
Revert "호출 직전까지"
bryanjang May 19, 2024
516ef8d
Merge branch 'develop' into feature/sound2222
bryanjang May 19, 2024
4110ef8
호출 전까지
bryanjang May 19, 2024
a89de62
Update AudioManager.cs
bryanjang May 19, 2024
6c6b04a
임시저장
youjin-43 May 19, 2024
da6eb82
스태미너를 소진해도 계속 달리는 버그 해결
Noewewwwew May 21, 2024
a91e4e0
Merge pull request #274 from kookmin-sw/bugfix/스태미너를-소진해도-달리는-버그
dydwo0809 May 21, 2024
f4eb3af
씬 로드 로직 수정
dydwo0809 May 21, 2024
81bc307
temp
bryanjang May 21, 2024
5da7f55
Merge pull request #275 from kookmin-sw/bugfix/lobby
dydwo0809 May 21, 2024
38a02db
Merge branch 'develop' into feature/LocateAdditionalSpawners
youjin-43 May 21, 2024
3208c88
Merge branch 'master' into feature/sound2222
bryanjang May 22, 2024
ac00cb4
jump sound test
bryanjang May 22, 2024
5012c1e
Merge branch 'develop' into feature/sound2222
bryanjang May 22, 2024
3d1521a
sfx added2
bryanjang May 22, 2024
5fd20f0
hiddenItem 추가 및 기타 버그 수정
youjin-43 May 22, 2024
8545976
스포너들 더 추가
youjin-43 May 22, 2024
b9fc435
네트워크 수정
youjin-43 May 22, 2024
ee002d6
모두가 죽는 버그 해결
Noewewwwew May 22, 2024
5ce6ea7
게임오버 갱신 추가
shware10 May 22, 2024
8663847
hp 매니저 수정
shware10 May 22, 2024
1a449b1
수정중
youjin-43 May 22, 2024
cdbcaa9
hp매니저 수정
shware10 May 22, 2024
98c48f1
수정 2차
shware10 May 22, 2024
dd0e5f1
수정 3차
shware10 May 22, 2024
957616c
수정 4차
shware10 May 22, 2024
2bbe570
SFX update 111
bryanjang May 22, 2024
979bbed
수정중
youjin-43 May 22, 2024
9ca18c5
hit sfx update
bryanjang May 22, 2024
b18a37f
디버그 추가
youjin-43 May 22, 2024
55e7759
Merge pull request #276 from kookmin-sw/bugfix/너가죽으면나도죽어
dydwo0809 May 22, 2024
fcd2034
Merge pull request #277 from kookmin-sw/feature/LocateAdditionalSpawners
dydwo0809 May 22, 2024
d766452
사운드 RPC달았어용
Noewewwwew May 22, 2024
e2b97d3
Revert "Feature/locate additional spawners"
dydwo0809 May 22, 2024
0dc581f
Merge pull request #278 from kookmin-sw/revert-277-feature/LocateAddi…
dydwo0809 May 22, 2024
3158ebd
ismine
Noewewwwew May 22, 2024
b7e9400
인게임씬 디벨롭에 적용해야함!!!!
youjin-43 May 22, 2024
90adc9b
Merge branch 'develop' into feature/LocateAdditionalSpawners
youjin-43 May 22, 2024
2cf9a44
조합 아이템 이펙트 적용
shware10 May 22, 2024
e6a4e2e
Merge pull request #279 from kookmin-sw/feature/LocateAdditionalSpawners
dydwo0809 May 22, 2024
931558c
파라미터 변경
Noewewwwew May 22, 2024
aab35df
1차수정
Noewewwwew May 22, 2024
709b894
2차수정
Noewewwwew May 22, 2024
437dc5d
3차수정
Noewewwwew May 22, 2024
09bf644
상대방에게 파라미터를 보내지 않는 버그 해결
Noewewwwew May 22, 2024
e607c35
스폰 시점 동기화 실험
youjin-43 May 22, 2024
8e3001d
스폰 함수 위치 변경해봄
youjin-43 May 22, 2024
2a32075
조합무기 풀리퀘
shware10 May 22, 2024
f84abfc
Merge branch 'develop' into feature/CheckMapItemNetwork
youjin-43 May 22, 2024
954977b
코드 정리중
youjin-43 May 22, 2024
7f9f6bd
Merge pull request #280 from kookmin-sw/feature/CheckMapItemNetwork
youjin-43 May 22, 2024
28903ce
코드 정리 완료 및 로비에서는 템 안나오게
youjin-43 May 22, 2024
47ae114
인게임씬 변경
youjin-43 May 22, 2024
df9e221
추가 수정
youjin-43 May 22, 2024
cbf37ba
Merge pull request #281 from kookmin-sw/feature/CheckMapItemNetwork
youjin-43 May 22, 2024
ed879c3
Merge branch 'develop' into CraftEffect
shware10 May 23, 2024
fd80e4f
Merge pull request #282 from kookmin-sw/CraftEffect
dydwo0809 May 23, 2024
e5c4803
무기 이펙트 네트워크
shware10 May 23, 2024
abdbfd7
Merge pull request #283 from kookmin-sw/CraftEffect
dydwo0809 May 23, 2024
18fc98a
무기 버리는 로직 수정
dydwo0809 May 23, 2024
c480f6c
아이템 버리기 네트워크 구현
dydwo0809 May 23, 2024
c777cba
아이템 버리기에 pv.isMine 추가
dydwo0809 May 23, 2024
83cfc6d
아이템 이름에 띄어쓰기 추가
dydwo0809 May 23, 2024
1e6c1b9
도끼 이름 수정
shware10 May 23, 2024
66544c8
Merge pull request #284 from kookmin-sw/bugfix/abandonNetwork
dydwo0809 May 23, 2024
f0b9f80
데스캠 버튼 삭제/몬스터 스폰 위치 수정
shware10 May 23, 2024
08a058f
Merge pull request #285 from kookmin-sw/CraftEffect
dydwo0809 May 23, 2024
75089a2
Merge branch 'develop' into bugfix/공격-파라미터를-상대방한테-보내지-않는-버그
Noewewwwew May 23, 2024
40e097b
기존 어택파라미터 제거
Noewewwwew May 23, 2024
19642cb
Merge pull request #286 from kookmin-sw/bugfix/공격-파라미터를-상대방한테-보내지-않는-버그
dydwo0809 May 23, 2024
483c2ef
배터리 및 진통제에 pv 추가
dydwo0809 May 23, 2024
54052ba
자동으로 생기는거 커밋
dydwo0809 May 23, 2024
07fa639
Merge pull request #287 from kookmin-sw/bugfix/abandonNetwork
dydwo0809 May 23, 2024
26798ab
1차 수정
Noewewwwew May 23, 2024
a3ac1b4
2차수정
Noewewwwew May 23, 2024
717e6c4
3차수정
Noewewwwew May 23, 2024
a27e2db
4차수정
Noewewwwew May 23, 2024
3bc8543
맵 매니저 painkiller 스폰안되는 버그 수정 외 기타
youjin-43 May 23, 2024
752d39e
Merge pull request #288 from kookmin-sw/bugfix/때린만큼-반응해줘
dydwo0809 May 23, 2024
ad5aa6e
Merge branch 'develop' into fix/MapDoor
youjin-43 May 23, 2024
9d645da
Merge pull request #290 from kookmin-sw/fix/MapDoor
dydwo0809 May 23, 2024
c0d8764
최대 인원 2인 -> 4인 변경
dydwo0809 May 23, 2024
5f001ab
Merge pull request #291 from kookmin-sw/fix/ChangeNumOfPeople
dydwo0809 May 23, 2024
4b4f2c0
조합 무기 데미지 증가 적용
shware10 May 23, 2024
98ebef2
Merge pull request #292 from kookmin-sw/feature/craftWeaponDamage
dydwo0809 May 23, 2024
7120092
Merge branch 'develop' into feature/sound2222
Noewewwwew May 23, 2024
526d75b
무기 버릴 때 스폰 위치 변경
shware10 May 23, 2024
85b0265
무기데미지 수정
shware10 May 23, 2024
114740f
Merge pull request #293 from kookmin-sw/feature/craftWeaponDamage
dydwo0809 May 23, 2024
25c4b15
itemdata 포톤 없을때만 넣도록 수정
youjin-43 May 23, 2024
1b00c32
Merge pull request #294 from kookmin-sw/hotfix
youjin-43 May 23, 2024
50b05b6
다른 상태로 넘어갈 때 소리 없애는 기능 추가
Noewewwwew May 23, 2024
c6a8b11
Merge branch 'develop' into feature/sound2222
Noewewwwew May 23, 2024
e29424d
Merge pull request #296 from kookmin-sw/feature/sound2222
dydwo0809 May 23, 2024
443aeea
아이템 스폰 로직 수정
dydwo0809 May 23, 2024
0332a8c
Merge pull request #297 from kookmin-sw/bugfix/spawn
dydwo0809 May 23, 2024
f467366
몬스터 버그 픽스 완료
shware10 May 23, 2024
761a2e1
Merge pull request #298 from kookmin-sw/bugfix/MonsterBug
dydwo0809 May 23, 2024
28dfeaf
처음 생성되는 로직 변경
dydwo0809 May 23, 2024
d3ada3d
Merge pull request #299 from kookmin-sw/bugfix/allocatePV
dydwo0809 May 23, 2024
2613020
사망 시 아이템 드롭 기능
shware10 May 23, 2024
f8fab93
카운트 다운 UI 추가
shware10 May 23, 2024
09dd560
카운트 다운 RPC 추가
shware10 May 23, 2024
28e419f
수정 1차
shware10 May 23, 2024
a93628c
수정 2차
shware10 May 23, 2024
1df786f
수정 3차
shware10 May 23, 2024
ff5ca24
몬스터 스폰 숫자 수정/몬스터 떠나니는 버그 수정
shware10 May 23, 2024
baf9627
수정 5차
shware10 May 23, 2024
cf29f0e
아이템 뿜기
shware10 May 23, 2024
dbcf9eb
최대 인원수 4명으로 변경
dydwo0809 May 23, 2024
e21ae6f
Merge pull request #300 from kookmin-sw/bugfix/allocatePV
dydwo0809 May 23, 2024
841b311
수정 6차
shware10 May 23, 2024
57bf889
Merge branch 'develop' into feature/CountDown
shware10 May 23, 2024
2170683
Merge pull request #301 from kookmin-sw/feature/CountDown
dydwo0809 May 23, 2024
3ddb7b8
사용하지 않는 함수 삭제
dydwo0809 May 23, 2024
b5a7f13
Merge pull request #302 from kookmin-sw/bugfix/allocatePV
dydwo0809 May 23, 2024
f37215d
index.md 수정
bryanjang May 24, 2024
429a0e9
index.md 수정 2
bryanjang May 24, 2024
e26dfca
index.md update
bryanjang May 24, 2024
f6838da
Update README.md
bryanjang May 24, 2024
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
Binary file modified .DS_Store
Binary file not shown.
14 changes: 14 additions & 0 deletions Assets/MonsterCollider.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;

public class MonsterCollider : MonoBehaviour
{
void OnCollisionEnter(Collision collision)
{
if (collision.gameObject.tag == "Player" || collision.gameObject.tag == "Monster")
{
Physics.IgnoreCollision(gameObject.GetComponent<Collider>(), collision.gameObject.GetComponent<Collider>());
}
}
}
11 changes: 11 additions & 0 deletions Assets/MonsterCollider.cs.meta

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

Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@ MonoBehaviour:
- EnableSpawnerWorkingRPC
- RpcGameOver
- RpcAllDie
- GameStart
- RPCEscapeWin
- RPCOnLightening
- RpcAbandonedItem
- AttackTrig
- SpawnItemAll
- SpawnItemSmall
- RpcAudio
- RpcHit
DisableAutoOpenWizard: 1
ShowSettings: 1
DevRegionSetOnce: 1
Loading
Loading