🔔 0.3.0 버전 🔔 #204

dongcheolpark · 2022-09-18T04:25:27Z

합의 전에 머지하지 말아주세요~

… into develop # Conflicts: # Project_Blind/Assets/Scenes/Boss.unity # Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset

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

…into develop

단서 UI 수정

FX 에셋 추가 및 기타

심연 씬 스테이지 추가

…into develop

대사 ui 수정

… into 0.2.1 # Conflicts: # Project_Blind/Assets/Scenes/최종맵/맵테스트.unity

0.2.1

여러가지

fix : transition 수정

몬스터 무게 100톤

… into develop

원거리 패링 구현

숲 오브젝트 배치

…nto develop

feature : 투사체 패링 관련

… into develop # Conflicts: # Project_Blind/Assets/Scripts/Core/Entity/Character/Enemy/Crowd/ProjecttileParing.cs

…into develop

에셋 사운드

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

fix : 빌드에 맞춰 수정

… into develop # Conflicts: # Project_Blind/Assets/Scripts/Manager/SceneController/GameManager.cs

각종 버그 수정

commit

kimmoonwoong and others added 30 commits September 15, 2022 16:39

commit

bd7760f

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

4521f91

… into develop # Conflicts: # Project_Blind/Assets/Scenes/Boss.unity # Project_Blind/ProjectSettings/RiderScriptEditorPersistedState.asset

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

908630d

Merge pull request #202 from dongcheolpark/develop

69c17a8

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

단서 UI 수정

ab48de3

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

e74bc03

…into develop

단서 UI 수정

cae22bf

Merge pull request #203 from kjhcocomi/develop

f65a2c5

단서 UI 수정

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

2ce1e30

asset : 1번 에셋 import

a374e9e

Merge pull request #205 from dongcheolpark/develop

91fe4c3

FX 에셋 추가 및 기타

asset : 3번 에셋 추가

8920172

asset : 4번 에셋 추가

65d2c87

feature : 근접 공격 변경

7992937

feature : 맞는 FX 추가

f8a5a16

feature : 전경 풀 움직이게

68ab8bf

feature : 심연 스테이지 구성

309288d

Merge pull request #209 from dongcheolpark/develop

68d51bd

심연 씬 스테이지 추가

대사 ui 오류 수정

8f26854

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

efd51d1

…into develop

Merge pull request #210 from kjhcocomi/develop

56eab9b

대사 ui 수정

feature: 캐릭터 조작감 해결

e824993

commit

081913e

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

3ba0d9d

… into 0.2.1 # Conflicts: # Project_Blind/Assets/Scenes/최종맵/맵테스트.unity

Merge pull request #213 from kimmoonwoong/0.2.1

3ff8d4d

0.2.1

feature : 카메라 세팅

3e643fd

feature : animation3로 변경

2cff363

Merge pull request #214 from dongcheolpark/develop

e758d49

여러가지

fix : transition 수정

b5840f1

Merge pull request #216 from dongcheolpark/develop

6535f84

fix : transition 수정

ch-0012 and others added 21 commits September 24, 2022 20:51

Merge branch 'develop' into develop

3c04ffe

Merge pull request #235 from ch-0012/develop

7d20db6

몬스터 무게 100톤

feature: 원거리 패링 구현

75b1cb5

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

f2ce3a1

… into develop

Merge pull request #236 from kimmoonwoong/develop

b86ea30

원거리 패링 구현

숲 맵 1.5차시

5229a75

숲 오브젝트 배치

Merge branch 'develop' of https://github.com/Yeogiwon/Project_Blind i…

fb7615d

…nto develop

Merge pull request #237 from Yeogiwon/develop

54e1bce

feature : 투사체 패링 관련

116f269

Merge pull request #238 from ch-0012/develop

acbb37f

feature : 투사체 패링 관련

commit

50af277

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

19d9b5f

… into develop # Conflicts: # Project_Blind/Assets/Scripts/Core/Entity/Character/Enemy/Crowd/ProjecttileParing.cs

resources : 에셋 추가

4160b4f

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

fbe0ede

…into develop

feature : attackFx 변경

ad81f58

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

6c5d72c

fix : 사운드 추가

d7d64af

Merge pull request #239 from dongcheolpark/develop

c7a0013

에셋 사운드

Merge pull request #240 from ch-0012/develop

ab12370

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

fix : 빌드에 맞춰 수정

37e8d26

Merge pull request #241 from dongcheolpark/develop

c1e68eb

fix : 빌드에 맞춰 수정

ch-0012 approved these changes Sep 25, 2022

View reviewed changes

kimmoonwoong and others added 4 commits September 25, 2022 17:27

bug: 각종 버그 수정

f650b20

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

271bcff

… into develop # Conflicts: # Project_Blind/Assets/Scripts/Manager/SceneController/GameManager.cs

commit

fde1beb

Merge pull request #242 from kimmoonwoong/develop

e171459

각종 버그 수정

kimmoonwoong approved these changes Sep 25, 2022

View reviewed changes

kimmoonwoong and others added 2 commits September 25, 2022 17:47

commit

b875f1a

Merge pull request #245 from kimmoonwoong/develop

134b1a3

commit

dongcheolpark merged commit 9aa1eba into main Sep 25, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🔔 0.3.0 버전 🔔 #204

🔔 0.3.0 버전 🔔 #204

dongcheolpark commented Sep 18, 2022

🔔 0.3.0 버전 🔔 #204

🔔 0.3.0 버전 🔔 #204

Conversation

dongcheolpark commented Sep 18, 2022

합의 전에 머지하지 말아주세요~