Code

Feature/pages 업데이트#303

Code

Merged

bryanjang merged 121 commits intomasterkookmin-sw/capstone-2024-21:masterfrom feature/pageskookmin-sw/capstone-2024-21:feature/pagesCopy head branch name to clipboardMay 24, 2024

+4,890-878

Commits

Commits on May 19, 2024

• 호출 직전까지

  bryanjang

  committed
  100d458

  Copy full SHA for 100d458

• Revert "호출 직전까지"

  Show description for 2652f7b
  bryanjang

  committed
  2652f7b

  Copy full SHA for 2652f7b

• Merge branch 'develop' into feature/sound2222

  bryanjang

  committed
  516ef8d

  Copy full SHA for 516ef8d

• 호출 전까지

  bryanjang

  committed
  4110ef8

  Copy full SHA for 4110ef8

• Update AudioManager.cs

  Show description for a89de62
  bryanjang

  committed
  a89de62

  Copy full SHA for a89de62

• 임시저장

  youjin-43

  committed
  6c6b04a

  Copy full SHA for 6c6b04a

Commits on May 21, 2024

• 스태미너를 소진해도 계속 달리는 버그 해결

  Show description for da6eb82
  Noewewwwew

  committed
  da6eb82

  Copy full SHA for da6eb82

• Merge pull request #274 from kookmin-sw/bugfix/스태미너를-소진해도-달리는-버그

  Show description for a91e4e0
  dydwo0809

  authored
  a91e4e0

  Copy full SHA for a91e4e0

• 씬 로드 로직 수정

  Show description for f4eb3af
  dydwo0809

  committed
  f4eb3af

  Copy full SHA for f4eb3af

• temp

  bryanjang

  committed
  81bc307

  Copy full SHA for 81bc307

• Merge pull request #275 from kookmin-sw/bugfix/lobby

  Show description for 5da7f55
  dydwo0809

  authored
  5da7f55

  Copy full SHA for 5da7f55

• Merge branch 'develop' into feature/LocateAdditionalSpawners

  youjin-43

  committed
  38a02db

  Copy full SHA for 38a02db

Commits on May 22, 2024

• Merge branch 'master' into feature/sound2222

  bryanjang

  committed
  3208c88

  Copy full SHA for 3208c88

• jump sound test

  bryanjang

  committed
  ac00cb4

  Copy full SHA for ac00cb4

• Merge branch 'develop' into feature/sound2222

  bryanjang

  committed
  5012c1e

  Copy full SHA for 5012c1e

• sfx added2

  bryanjang

  committed
  3d1521a

  Copy full SHA for 3d1521a

• hiddenItem 추가 및 기타 버그 수정

  youjin-43

  committed
  5fd20f0

  Copy full SHA for 5fd20f0

• 스포너들 더 추가

  youjin-43

  committed
  8545976

  Copy full SHA for 8545976

• 네트워크 수정

  youjin-43

  committed
  b9fc435

  Copy full SHA for b9fc435

• 모두가 죽는 버그 해결

  Noewewwwew

  committed
  ee002d6

  Copy full SHA for ee002d6

• 게임오버 갱신 추가

  Show description for 5ce6ea7
  shware10

  committed
  5ce6ea7

  Copy full SHA for 5ce6ea7

• hp 매니저 수정

  Show description for 8663847
  shware10

  committed
  8663847

  Copy full SHA for 8663847

• 수정중

  youjin-43

  committed
  1a449b1

  Copy full SHA for 1a449b1

• hp매니저 수정

  shware10

  committed
  cdbcaa9

  Copy full SHA for cdbcaa9

• 수정 2차

  shware10

  committed
  98c48f1

  Copy full SHA for 98c48f1

• 수정 3차

  shware10

  committed
  dd0e5f1

  Copy full SHA for dd0e5f1

• 수정 4차

  shware10

  committed
  957616c

  Copy full SHA for 957616c

• SFX update 111

  Show description for 2bbe570
  bryanjang

  committed
  2bbe570

  Copy full SHA for 2bbe570

• 수정중

  youjin-43

  committed
  979bbed

  Copy full SHA for 979bbed

• hit sfx update

  Show description for 9ca18c5
  bryanjang

  committed
  9ca18c5

  Copy full SHA for 9ca18c5

• 디버그 추가

  youjin-43

  committed
  b18a37f

  Copy full SHA for b18a37f

• Merge pull request #276 from kookmin-sw/bugfix/너가죽으면나도죽어

  Show description for 55e7759
  dydwo0809

  authored
  55e7759

  Copy full SHA for 55e7759

• Merge pull request #277 from kookmin-sw/feature/LocateAdditionalSpawners

  Show description for fcd2034
  dydwo0809

  authored
  fcd2034

  Copy full SHA for fcd2034

• 사운드 RPC달았어용

  Noewewwwew

  committed
  d766452

  Copy full SHA for d766452

• Revert "Feature/locate additional spawners"

  dydwo0809

  authored
  e2b97d3

  Copy full SHA for e2b97d3

• Merge pull request #278 from kookmin-sw/revert-277-feature/LocateAdditionalSpawners

  Show description for 0dc581f
  dydwo0809

  authored
  0dc581f

  Copy full SHA for 0dc581f

• ismine

  Noewewwwew

  committed
  3158ebd

  Copy full SHA for 3158ebd

• 인게임씬 디벨롭에 적용해야함!!!!

  youjin-43

  committed
  b7e9400

  Copy full SHA for b7e9400

• Merge branch 'develop' into feature/LocateAdditionalSpawners

  youjin-43

  committed
  90adc9b

  Copy full SHA for 90adc9b

• 조합 아이템 이펙트 적용

  Show description for 2cf9a44
  shware10

  committed
  2cf9a44

  Copy full SHA for 2cf9a44

• Merge pull request #279 from kookmin-sw/feature/LocateAdditionalSpawners

  Show description for e6a4e2e
  dydwo0809

  authored
  e6a4e2e

  Copy full SHA for e6a4e2e

• 파라미터 변경

  Noewewwwew

  committed
  931558c

  Copy full SHA for 931558c

• 1차수정

  Noewewwwew

  committed
  aab35df

  Copy full SHA for aab35df

• 2차수정

  Noewewwwew

  committed
  709b894

  Copy full SHA for 709b894

• 3차수정

  Noewewwwew

  committed
  437dc5d

  Copy full SHA for 437dc5d

• 상대방에게 파라미터를 보내지 않는 버그 해결

  Show description for 09bf644
  Noewewwwew

  committed
  09bf644

  Copy full SHA for 09bf644

• 스폰 시점 동기화 실험

  youjin-43

  committed
  e607c35

  Copy full SHA for e607c35

• 스폰 함수 위치 변경해봄

  youjin-43

  committed
  8e3001d

  Copy full SHA for 8e3001d

• 조합무기 풀리퀘

  Show description for 2a32075
  shware10

  committed
  2a32075

  Copy full SHA for 2a32075

• Merge branch 'develop' into feature/CheckMapItemNetwork

  youjin-43

  committed
  f84abfc

  Copy full SHA for f84abfc

• 코드 정리중

  youjin-43

  committed
  954977b

  Copy full SHA for 954977b

• Merge pull request #280 from kookmin-sw/feature/CheckMapItemNetwork

  Show description for 7f9f6bd
  youjin-43

  authored
  7f9f6bd

  Copy full SHA for 7f9f6bd

• 코드 정리 완료 및 로비에서는 템 안나오게

  youjin-43

  committed
  28903ce

  Copy full SHA for 28903ce

• 인게임씬 변경

  youjin-43

  committed
  47ae114

  Copy full SHA for 47ae114

• 추가 수정

  youjin-43

  committed
  df9e221

  Copy full SHA for df9e221

• Merge pull request #281 from kookmin-sw/feature/CheckMapItemNetwork

  Show description for cbf37ba
  youjin-43

  authored
  cbf37ba

  Copy full SHA for cbf37ba

Commits on May 23, 2024

• Merge branch 'develop' into CraftEffect

  shware10

  committed
  ed879c3

  Copy full SHA for ed879c3

• Merge pull request #282 from kookmin-sw/CraftEffect

  Show description for fd80e4f
  dydwo0809

  authored
  fd80e4f

  Copy full SHA for fd80e4f

• 무기 이펙트 네트워크

  shware10

  committed
  e5c4803

  Copy full SHA for e5c4803

• Merge pull request #283 from kookmin-sw/CraftEffect

  Show description for abdbfd7
  dydwo0809

  authored
  abdbfd7

  Copy full SHA for abdbfd7

• 무기 버리는 로직 수정

  Show description for 18fc98a
  dydwo0809

  committed
  18fc98a

  Copy full SHA for 18fc98a

• 아이템 버리기 네트워크 구현

  Show description for c480f6c
  dydwo0809

  committed
  c480f6c

  Copy full SHA for c480f6c

• 아이템 버리기에 pv.isMine 추가

  dydwo0809

  committed
  c777cba

  Copy full SHA for c777cba

• 아이템 이름에 띄어쓰기 추가

  dydwo0809

  committed
  83cfc6d

  Copy full SHA for 83cfc6d

• 도끼 이름 수정

  Show description for 1e6c1b9
  shware10

  committed
  1e6c1b9

  Copy full SHA for 1e6c1b9

• Merge pull request #284 from kookmin-sw/bugfix/abandonNetwork

  Show description for 66544c8
  dydwo0809

  authored
  66544c8

  Copy full SHA for 66544c8

• 데스캠 버튼 삭제/몬스터 스폰 위치 수정

  Show description for f0b9f80
  shware10

  committed
  f0b9f80

  Copy full SHA for f0b9f80

• Merge pull request #285 from kookmin-sw/CraftEffect

  Show description for 08a058f
  dydwo0809

  authored
  08a058f

  Copy full SHA for 08a058f

• Merge branch 'develop' into bugfix/공격-파라미터를-상대방한테-보내지-않는-버그

  Noewewwwew

  committed
  75089a2

  Copy full SHA for 75089a2

• 기존 어택파라미터 제거

  Noewewwwew

  committed
  40e097b

  Copy full SHA for 40e097b

• Merge pull request #286 from kookmin-sw/bugfix/공격-파라미터를-상대방한테-보내지-않는-버그

  Show description for 19642cb
  dydwo0809

  authored
  19642cb

  Copy full SHA for 19642cb

• 배터리 및 진통제에 pv 추가

  Show description for 483c2ef
  dydwo0809

  committed
  483c2ef

  Copy full SHA for 483c2ef

• 자동으로 생기는거 커밋

  dydwo0809

  committed
  54052ba

  Copy full SHA for 54052ba

• Merge pull request #287 from kookmin-sw/bugfix/abandonNetwork

  Show description for 07fa639
  dydwo0809

  authored
  07fa639

  Copy full SHA for 07fa639

• 1차 수정

  Noewewwwew

  committed
  26798ab

  Copy full SHA for 26798ab

• 2차수정

  Noewewwwew

  committed
  a3ac1b4

  Copy full SHA for a3ac1b4

• 3차수정

  Noewewwwew

  committed
  717e6c4

  Copy full SHA for 717e6c4

• 4차수정

  Noewewwwew

  committed
  a27e2db

  Copy full SHA for a27e2db

• 맵 매니저 painkiller 스폰안되는 버그 수정 외 기타

  Show description for 3bc8543
  youjin-43

  committed
  3bc8543

  Copy full SHA for 3bc8543

• Merge pull request #288 from kookmin-sw/bugfix/때린만큼-반응해줘

  Show description for 752d39e
  dydwo0809

  authored
  752d39e

  Copy full SHA for 752d39e

• Merge branch 'develop' into fix/MapDoor

  youjin-43

  committed
  ad5aa6e

  Copy full SHA for ad5aa6e

• Merge pull request #290 from kookmin-sw/fix/MapDoor

  Show description for 9d645da
  dydwo0809

  authored
  9d645da

  Copy full SHA for 9d645da

• 최대 인원 2인 -> 4인 변경

  dydwo0809

  committed
  c0d8764

  Copy full SHA for c0d8764

• Merge pull request #291 from kookmin-sw/fix/ChangeNumOfPeople

  Show description for 5f001ab
  dydwo0809

  authored
  5f001ab

  Copy full SHA for 5f001ab

• 조합 무기 데미지 증가 적용

  Show description for 4b4f2c0
  shware10

  committed
  4b4f2c0

  Copy full SHA for 4b4f2c0

• Merge pull request #292 from kookmin-sw/feature/craftWeaponDamage

  Show description for 98ebef2
  dydwo0809

  authored
  98ebef2

  Copy full SHA for 98ebef2

• Merge branch 'develop' into feature/sound2222

  Noewewwwew

  committed
  7120092

  Copy full SHA for 7120092

• 무기 버릴 때 스폰 위치 변경

  Show description for 526d75b
  shware10

  committed
  526d75b

  Copy full SHA for 526d75b

• 무기데미지 수정

  Show description for 85b0265
  shware10

  committed
  85b0265

  Copy full SHA for 85b0265

• Merge pull request #293 from kookmin-sw/feature/craftWeaponDamage

  Show description for 114740f
  dydwo0809

  authored
  114740f

  Copy full SHA for 114740f

• itemdata 포톤 없을때만 넣도록 수정

  youjin-43

  committed
  25c4b15

  Copy full SHA for 25c4b15

• Merge pull request #294 from kookmin-sw/hotfix

  Show description for 1b00c32
  youjin-43

  authored
  1b00c32

  Copy full SHA for 1b00c32

• 다른 상태로 넘어갈 때 소리 없애는 기능 추가

  Noewewwwew

  committed
  50b05b6

  Copy full SHA for 50b05b6

• Merge branch 'develop' into feature/sound2222

  Noewewwwew

  committed
  c6a8b11

  Copy full SHA for c6a8b11

• Merge pull request #296 from kookmin-sw/feature/sound2222

  Show description for e29424d
  dydwo0809

  authored
  e29424d

  Copy full SHA for e29424d

• 아이템 스폰 로직 수정

  Show description for 443aeea
  dydwo0809

  committed
  443aeea

  Copy full SHA for 443aeea

• Merge pull request #297 from kookmin-sw/bugfix/spawn

  Show description for 0332a8c
  dydwo0809

  authored
  0332a8c

  Copy full SHA for 0332a8c

• 몬스터 버그 픽스 완료

  Show description for f467366
  shware10

  committed
  f467366

  Copy full SHA for f467366

• Merge pull request #298 from kookmin-sw/bugfix/MonsterBug

  Show description for 761a2e1
  dydwo0809

  authored
  761a2e1

  Copy full SHA for 761a2e1

• 처음 생성되는 로직 변경

  Show description for 28dfeaf
  dydwo0809

  committed
  28dfeaf

  Copy full SHA for 28dfeaf

• Merge pull request #299 from kookmin-sw/bugfix/allocatePV

  Show description for d3ada3d
  dydwo0809

  authored
  d3ada3d

  Copy full SHA for d3ada3d

• 사망 시 아이템 드롭 기능

  Show description for 2613020
  shware10

  committed
  2613020

  Copy full SHA for 2613020

• 카운트 다운 UI 추가

  Show description for f8fab93
  shware10

  committed
  f8fab93

  Copy full SHA for f8fab93

• 카운트 다운 RPC 추가

  Show description for 09dd560
  shware10

  committed
  09dd560

  Copy full SHA for 09dd560

• 수정 1차

  Show description for 28e419f
  shware10

  committed
  28e419f

  Copy full SHA for 28e419f

• 수정 2차

  shware10

  committed
  a93628c

  Copy full SHA for a93628c

• 수정 3차

  Show description for 1df786f
  shware10

  committed
  1df786f

  Copy full SHA for 1df786f

• 몬스터 스폰 숫자 수정/몬스터 떠나니는 버그 수정

  Show description for ff5ca24
  shware10

  committed
  ff5ca24

  Copy full SHA for ff5ca24

• 수정 5차

  Show description for baf9627
  shware10

  committed
  baf9627

  Copy full SHA for baf9627

• 아이템 뿜기

  Show description for cf29f0e
  shware10

  committed
  cf29f0e

  Copy full SHA for cf29f0e

• 최대 인원수 4명으로 변경

  dydwo0809

  committed
  dbcf9eb

  Copy full SHA for dbcf9eb

• Merge pull request #300 from kookmin-sw/bugfix/allocatePV

  Show description for e21ae6f
  dydwo0809

  authored
  e21ae6f

  Copy full SHA for e21ae6f

• 수정 6차

  shware10

  committed
  841b311

  Copy full SHA for 841b311

• Merge branch 'develop' into feature/CountDown

  shware10

  committed
  57bf889

  Copy full SHA for 57bf889

• Merge pull request #301 from kookmin-sw/feature/CountDown

  Show description for 2170683
  dydwo0809

  authored
  2170683

  Copy full SHA for 2170683

• 사용하지 않는 함수 삭제

  dydwo0809

  committed
  3ddb7b8

  Copy full SHA for 3ddb7b8

• Merge pull request #302 from kookmin-sw/bugfix/allocatePV

  Show description for b5a7f13
  dydwo0809

  authored
  b5a7f13

  Copy full SHA for b5a7f13

Commits on May 24, 2024

• index.md 수정

  bryanjang

  committed
  f37215d

  Copy full SHA for f37215d

• index.md 수정 2

  bryanjang

  committed
  429a0e9

  Copy full SHA for 429a0e9

• index.md update

  Show description for e26dfca
  bryanjang

  committed
  e26dfca

  Copy full SHA for e26dfca

• Update README.md

  bryanjang

  committed
  f6838da

  Copy full SHA for f6838da