Code

🔔 0.3.0 버전 🔔#204

Code

Merged

dongcheolpark merged 143 commits intomainGAMPOT-DEV/Project_Blind:mainfrom developGAMPOT-DEV/Project_Blind:developCopy head branch name to clipboardSep 25, 2022

+1,875,901-39,142

Commits

Commits on Sep 15, 2022

• commit

  kimmoonwoong

  committed
  bd7760f

  Copy full SHA for bd7760f

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 4521f91
  kimmoonwoong

  committed
  4521f91

  Copy full SHA for 4521f91

Commits on Sep 17, 2022

• feature : 플레이어 공격 이펙트 추가 (임시)

  dongcheolpark

  committed
  908630d

  Copy full SHA for 908630d

Commits on Sep 18, 2022

• Merge pull request #202 from dongcheolpark/develop

  Show description for 69c17a8
  kjhcocomi

  authored
  69c17a8

  Copy full SHA for 69c17a8

• 단서 UI 수정

  kjhcocomi

  committed
  ab48de3

  Copy full SHA for ab48de3

• Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind into develop

  kjhcocomi

  committed
  e74bc03

  Copy full SHA for e74bc03

• 단서 UI 수정

  kjhcocomi

  committed
  cae22bf

  Copy full SHA for cae22bf

• Merge pull request #203 from kjhcocomi/develop

  Show description for f65a2c5
  dongcheolpark

  authored
  f65a2c5

  Copy full SHA for f65a2c5

• fix : 이미지 레이어 fx로 변경

  dongcheolpark

  committed
  2ce1e30

  Copy full SHA for 2ce1e30

• asset : 1번 에셋 import

  dongcheolpark

  committed
  a374e9e

  Copy full SHA for a374e9e

• Merge pull request #205 from dongcheolpark/develop

  Show description for 91fe4c3
  Yeogiwon

  authored
  91fe4c3

  Copy full SHA for 91fe4c3

• asset : 3번 에셋 추가

  dongcheolpark

  committed
  8920172

  Copy full SHA for 8920172

• asset : 4번 에셋 추가

  dongcheolpark

  committed
  65d2c87

  Copy full SHA for 65d2c87

• feature : 근접 공격 변경

  dongcheolpark

  committed
  7992937

  Copy full SHA for 7992937

• feature : 맞는 FX 추가

  dongcheolpark

  committed
  f8a5a16

  Copy full SHA for f8a5a16

• feature : 전경 풀 움직이게

  dongcheolpark

  committed
  68ab8bf

  Copy full SHA for 68ab8bf

• feature : 심연 스테이지 구성

  dongcheolpark

  committed
  309288d

  Copy full SHA for 309288d

• Merge pull request #209 from dongcheolpark/develop

  Show description for 68d51bd
  hhtboy

  authored
  68d51bd

  Copy full SHA for 68d51bd

• 대사 ui 오류 수정

  kjhcocomi

  committed
  8f26854

  Copy full SHA for 8f26854

• Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind into develop

  kjhcocomi

  committed
  efd51d1

  Copy full SHA for efd51d1

• Merge pull request #210 from kjhcocomi/develop

  Show description for 56eab9b
  hhtboy

  authored
  56eab9b

  Copy full SHA for 56eab9b

• feature: 캐릭터 조작감 해결

  kimmoonwoong

  committed
  e824993

  Copy full SHA for e824993

• commit

  kimmoonwoong

  committed
  081913e

  Copy full SHA for 081913e

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into 0.2.1

  Show description for 3ba0d9d
  kimmoonwoong

  committed
  3ba0d9d

  Copy full SHA for 3ba0d9d

• Merge pull request #213 from kimmoonwoong/0.2.1

  Show description for 3ff8d4d
  dongcheolpark

  authored
  3ff8d4d

  Copy full SHA for 3ff8d4d

• feature : 카메라 세팅

  dongcheolpark

  committed
  3e643fd

  Copy full SHA for 3e643fd

• feature : animation3로 변경

  dongcheolpark

  committed
  2cff363

  Copy full SHA for 2cff363

• Merge pull request #214 from dongcheolpark/develop

  Show description for e758d49
  kimmoonwoong

  authored
  e758d49

  Copy full SHA for e758d49

• fix : transition 수정

  dongcheolpark

  committed
  b5840f1

  Copy full SHA for b5840f1

• Merge pull request #216 from dongcheolpark/develop

  Show description for 6535f84
  kimmoonwoong

  authored
  6535f84

  Copy full SHA for 6535f84

Commits on Sep 19, 2022

• 특정 아이템을 보유하고 있는지 확인할 수 있는 함수 추가

  kjhcocomi

  committed
  51a10c7

  Copy full SHA for 51a10c7

• .

  kjhcocomi

  committed
  0b16a51

  Copy full SHA for 0b16a51

• 로직 조금 수정

  kjhcocomi

  committed
  e447dfb

  Copy full SHA for e447dfb

• feature : 캐릭터 이펙트 및 여러가지

  dongcheolpark

  committed
  fddd57f

  Copy full SHA for fddd57f

• Merge pull request #217 from kjhcocomi/develop

  Show description for 8914123
  dongcheolpark

  authored
  8914123

  Copy full SHA for 8914123

• resource : 무녀 몬스터 애니메이션

  ch-0012

  committed
  b2502b7

  Copy full SHA for b2502b7

• feature : 무녀 애니메이션

  ch-0012

  committed
  0240908

  Copy full SHA for 0240908

• fix : Attack 타이밍 수정 중

  ch-0012

  committed
  b074c27

  Copy full SHA for b074c27

• bug: 뛰는 중 대쉬 버그 해결

  kimmoonwoong

  committed
  2c39328

  Copy full SHA for 2c39328

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  4e1daa2

  Copy full SHA for 4e1daa2

• Merge pull request #218 from dongcheolpark/develop

  Show description for 060dc0d
  kimmoonwoong

  authored
  060dc0d

  Copy full SHA for 060dc0d

Commits on Sep 20, 2022

• feature: 캐릭터 공격 수정

  kimmoonwoong

  committed
  8ccee20

  Copy full SHA for 8ccee20

• fix : 몽둥이 타격 타이밍 조정

  ch-0012

  committed
  0fc1d8c

  Copy full SHA for 0fc1d8c

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for d1f7781
  kimmoonwoong

  committed
  d1f7781

  Copy full SHA for d1f7781

• Merge pull request #220 from kimmoonwoong/develop

  Show description for 84d584c
  dongcheolpark

  authored
  84d584c

  Copy full SHA for 84d584c

• fix : 화랑 타격 타이밍 수정

  ch-0012

  committed
  50a7671

  Copy full SHA for 50a7671

• Merge branch 'GAMPOT-DEV:develop' into develop

  ch-0012

  authored
  bd0d4d1

  Copy full SHA for bd0d4d1

• Merge pull request #221 from ch-0012/develop

  Show description for f74d89d
  dongcheolpark

  authored
  f74d89d

  Copy full SHA for f74d89d

Commits on Sep 22, 2022

• feature : 게임 수치 변경

  dongcheolpark

  committed
  0bd349b

  Copy full SHA for 0bd349b

• resource : 화랑 애니메이션 ver.2

  ch-0012

  committed
  e02efde

  Copy full SHA for e02efde

• feature : 몬스터와 닿으면 피격 판정

  ch-0012

  committed
  02fe818

  Copy full SHA for 02fe818

• Merge pull request #222 from dongcheolpark/develop

  Show description for 0132fc3
  Yeogiwon

  authored
  0132fc3

  Copy full SHA for 0132fc3

• feature : 무녀 애니메이션 적용

  Show description for d0fb983
  ch-0012

  committed
  d0fb983

  Copy full SHA for d0fb983

• 카메라 및 빛 수정

  Yeogiwon

  committed
  77f4c95

  Copy full SHA for 77f4c95

• feature : Die 애니메이션 실행

  ch-0012

  committed
  26ed95e

  Copy full SHA for 26ed95e

• feature : 산적 피격, 사망 적용

  ch-0012

  committed
  4f1a35c

  Copy full SHA for 4f1a35c

• Merge pull request #223 from Yeogiwon/develop

  Show description for 8229a39
  dongcheolpark

  authored
  8229a39

  Copy full SHA for 8229a39

• bug: 각종 버그 해결

  kimmoonwoong

  committed
  cc3df37

  Copy full SHA for cc3df37

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 9962b57
  kimmoonwoong

  committed
  9962b57

  Copy full SHA for 9962b57

• Merge pull request #224 from kimmoonwoong/develop

  Show description for 4779747
  dongcheolpark

  authored
  4779747

  Copy full SHA for 4779747

• feature : 화랑 피격, 사망 적용

  ch-0012

  committed
  3b85e45

  Copy full SHA for 3b85e45

• Merge remote-tracking branch 'upstream/develop' into develop

  ch-0012

  committed
  4d9ae41

  Copy full SHA for 4d9ae41

• fix : 오류 수정

  ch-0012

  committed
  9a30036

  Copy full SHA for 9a30036

Commits on Sep 23, 2022

• commit

  kimmoonwoong

  committed
  4c80f33

  Copy full SHA for 4c80f33

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for cca22e4
  kimmoonwoong

  committed
  cca22e4

  Copy full SHA for cca22e4

• Merge pull request #225 from ch-0012/develop

  Show description for 1e8fb73
  kjhcocomi

  authored
  1e8fb73

  Copy full SHA for 1e8fb73

• feature : 숲 맵 테스트로 첫 맵 변경

  dongcheolpark

  committed
  ec1dc5a

  Copy full SHA for ec1dc5a

• 이펙트 제거

  dongcheolpark

  committed
  932f329

  Copy full SHA for 932f329

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  dongcheolpark

  committed
  b64b31e

  Copy full SHA for b64b31e

• feature : Stage.cs 상속으로 변경

  dongcheolpark

  committed
  dd62fbb

  Copy full SHA for dd62fbb

• feature : 적을 죽여아 되는 스테이지 추가

  dongcheolpark

  committed
  41104d2

  Copy full SHA for 41104d2

• feature : 적을 죽여아 되는 스테이지 추가

  dongcheolpark

  committed
  61bca73

  Copy full SHA for 61bca73

• Merge remote-tracking branch 'origin/develop' into develop

  dongcheolpark

  committed
  5119e7c

  Copy full SHA for 5119e7c

• feature : 동굴맵 전체적인 수정

  dongcheolpark

  committed
  f62ef85

  Copy full SHA for f62ef85

• feature : 동굴 임시 석순 배치

  dongcheolpark

  committed
  6a5796c

  Copy full SHA for 6a5796c

• feature : 그림자 제거

  dongcheolpark

  committed
  5516735

  Copy full SHA for 5516735

• 석순 대충 배치

  dongcheolpark

  committed
  bf858d3

  Copy full SHA for bf858d3

• 심연 에셋 추가

  hhtboy

  committed
  6c28886

  Copy full SHA for 6c28886

• 심연맵 테스트용 스크립트 추가

  hhtboy

  committed
  4b47c89

  Copy full SHA for 4b47c89

• 심연맵 에셋 추가

  hhtboy

  committed
  73658a2

  Copy full SHA for 73658a2

• Merge pull request #227 from hhtboy/develop

  dongcheolpark

  authored
  212645a

  Copy full SHA for 212645a

Commits on Sep 24, 2022

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 8c6abff
  dongcheolpark

  committed
  8c6abff

  Copy full SHA for 8c6abff

• fix : 애니메이션 관련 버그 수정

  ch-0012

  committed
  598fa90

  Copy full SHA for 598fa90

• Merge branch 'develop' of https://github.com/ch-0012/Project_Blind into develop

  ch-0012

  committed
  0ac5ebe

  Copy full SHA for 0ac5ebe

• Merge pull request #228 from ch-0012/develop

  Show description for 3e25d52
  Yeogiwon

  authored
  3e25d52

  Copy full SHA for 3e25d52

• feature : 심연 머지

  dongcheolpark

  committed
  1de2311

  Copy full SHA for 1de2311

• Merge pull request #226 from dongcheolpark/develop

  Show description for 8357863
  kimmoonwoong

  authored
  8357863

  Copy full SHA for 8357863

• grab 애니메이션 수정 중

  ch-0012

  committed
  fbd8c7d

  Copy full SHA for fbd8c7d

• Merge branch 'develop' of https://github.com/ch-0012/Project_Blind into develop

  ch-0012

  committed
  0ae61c2

  Copy full SHA for 0ae61c2

• Merge branch 'develop' into develop

  ch-0012

  authored
  80c7826

  Copy full SHA for 80c7826

• Merge pull request #229 from ch-0012/develop

  Show description for dc06361
  dongcheolpark

  authored
  dc06361

  Copy full SHA for dc06361

• commit

  kimmoonwoong

  committed
  e936ff4

  Copy full SHA for e936ff4

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 103fb8b
  kimmoonwoong

  committed
  103fb8b

  Copy full SHA for 103fb8b

• feature : 패링까지

  ch-0012

  committed
  47249f4

  Copy full SHA for 47249f4

• Merge branch 'develop' of https://github.com/ch-0012/Project_Blind into develop

  ch-0012

  committed
  1a103cd

  Copy full SHA for 1a103cd

• Update 맵테스트.unity

  Show description for 88997e9
  Yeogiwon

  committed
  88997e9

  Copy full SHA for 88997e9

• Merge branch 'develop' of https://github.com/Yeogiwon/Project_Blind into develop

  Yeogiwon

  committed
  cdcf8f8

  Copy full SHA for cdcf8f8

• fix : 스턴 후 안 움직임, HP 수정

  ch-0012

  committed
  1b06862

  Copy full SHA for 1b06862

• fix : 스턴 후 공격 안 되는 문제 수정

  ch-0012

  committed
  69446bf

  Copy full SHA for 69446bf

• feature : hp 이동 변경

  dongcheolpark

  committed
  750a966

  Copy full SHA for 750a966

• Merge pull request #231 from Yeogiwon/develop

  Show description for be3e63e
  Yeogiwon

  authored
  be3e63e

  Copy full SHA for be3e63e

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  Show description for 5869787
  dongcheolpark

  committed
  5869787

  Copy full SHA for 5869787

• Merge pull request #230 from ch-0012/develop

  Show description for f78ea4e
  kimmoonwoong

  authored
  f78ea4e

  Copy full SHA for f78ea4e

• Merge pull request #232 from dongcheolpark/develop

  Show description for f92af48
  kimmoonwoong

  authored
  f92af48

  Copy full SHA for f92af48

• bug: 각종 오류 해결

  kimmoonwoong

  committed
  fa9b43c

  Copy full SHA for fa9b43c

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 6a355f3
  kimmoonwoong

  committed
  6a355f3

  Copy full SHA for 6a355f3

• Revert "Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop"

  Show description for 0a04e6b
  kimmoonwoong

  committed
  0a04e6b

  Copy full SHA for 0a04e6b

• Revert "Revert "Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop""

  Show description for 0d5c532
  kimmoonwoong

  committed
  0d5c532

  Copy full SHA for 0d5c532

• 화랑 공격 애니메이션 수정

  ch-0012

  committed
  4502547

  Copy full SHA for 4502547

• Merge pull request #233 from ch-0012/develop

  Show description for dbe2cd0
  kimmoonwoong

  authored
  dbe2cd0

  Copy full SHA for dbe2cd0

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  09fcf7e

  Copy full SHA for 09fcf7e

• fix : 스턴 후 공격 안 되는 문제 수정

  Show description for 62d9d89
  

  ch-0012

  authored and

  kimmoonwoong

  committed
  62d9d89

  Copy full SHA for 62d9d89

• commit

  kimmoonwoong

  committed
  c7acb0d

  Copy full SHA for c7acb0d

• Merge pull request #234 from kimmoonwoong/develop

  Show description for 2a6cdd4
  dongcheolpark

  authored
  2a6cdd4

  Copy full SHA for 2a6cdd4

• feature : 몬스터 사후처리

  ch-0012

  committed
  3c7c154

  Copy full SHA for 3c7c154

• feature : 몬스터 무게 100톤

  ch-0012

  committed
  c459865

  Copy full SHA for c459865

• Merge branch 'develop' into develop

  ch-0012

  authored
  3c04ffe

  Copy full SHA for 3c04ffe

• Merge pull request #235 from ch-0012/develop

  Show description for 7d20db6
  kimmoonwoong

  authored
  7d20db6

  Copy full SHA for 7d20db6

• feature: 원거리 패링 구현

  kimmoonwoong

  committed
  75b1cb5

  Copy full SHA for 75b1cb5

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  kimmoonwoong

  committed
  f2ce3a1

  Copy full SHA for f2ce3a1

• Merge pull request #236 from kimmoonwoong/develop

  Show description for b86ea30
  ch-0012

  authored
  b86ea30

  Copy full SHA for b86ea30

• 숲 맵 1.5차시

  Show description for 5229a75
  Yeogiwon

  committed
  5229a75

  Copy full SHA for 5229a75

• Merge branch 'develop' of https://github.com/Yeogiwon/Project_Blind into develop

  Yeogiwon

  committed
  fb7615d

  Copy full SHA for fb7615d

• Merge pull request #237 from Yeogiwon/develop

  dongcheolpark

  authored
  54e1bce

  Copy full SHA for 54e1bce

• feature : 투사체 패링 관련

  ch-0012

  committed
  116f269

  Copy full SHA for 116f269

Commits on Sep 25, 2022

• Merge pull request #238 from ch-0012/develop

  Show description for acbb37f
  dongcheolpark

  authored
  acbb37f

  Copy full SHA for acbb37f

• commit

  kimmoonwoong

  committed
  50af277

  Copy full SHA for 50af277

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 19d9b5f
  kimmoonwoong

  committed
  19d9b5f

  Copy full SHA for 19d9b5f

• resources : 에셋 추가

  dongcheolpark

  committed
  4160b4f

  Copy full SHA for 4160b4f

• Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blind into develop

  dongcheolpark

  committed
  fbe0ede

  Copy full SHA for fbe0ede

• feature : attackFx 변경

  dongcheolpark

  committed
  ad81f58

  Copy full SHA for ad81f58

• resource : 산적 공격 애니메이션 ver 3

  ch-0012

  committed
  6c5d72c

  Copy full SHA for 6c5d72c

• fix : 사운드 추가

  dongcheolpark

  committed
  d7d64af

  Copy full SHA for d7d64af

• Merge pull request #239 from dongcheolpark/develop

  Show description for c7a0013
  Yeogiwon

  authored
  c7a0013

  Copy full SHA for c7a0013

• Merge pull request #240 from ch-0012/develop

  Show description for ab12370
  dongcheolpark

  authored
  ab12370

  Copy full SHA for ab12370

• fix : 빌드에 맞춰 수정

  dongcheolpark

  committed
  37e8d26

  Copy full SHA for 37e8d26

• Merge pull request #241 from dongcheolpark/develop

  Show description for c1e68eb
  Yeogiwon

  authored
  c1e68eb

  Copy full SHA for c1e68eb

• bug: 각종 버그 수정

  kimmoonwoong

  committed
  f650b20

  Copy full SHA for f650b20

• Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Blind into develop

  Show description for 271bcff
  kimmoonwoong

  committed
  271bcff

  Copy full SHA for 271bcff

• commit

  kimmoonwoong

  committed
  fde1beb

  Copy full SHA for fde1beb

• Merge pull request #242 from kimmoonwoong/develop

  Show description for e171459
  dongcheolpark

  authored
  e171459

  Copy full SHA for e171459

• commit

  kimmoonwoong

  committed
  b875f1a

  Copy full SHA for b875f1a

• Merge pull request #245 from kimmoonwoong/develop

  Show description for 134b1a3
  dongcheolpark

  authored
  134b1a3

  Copy full SHA for 134b1a3