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

๐Ÿ”” 0.1.0 ๋ฒ„์ „ ๐Ÿ”” #105

Merged
merged 296 commits into from
Sep 1, 2022
Merged
Changes from 3 commits
Commits
Show all changes
296 commits
Select commit Hold shift + click to select a range
517429a
์ค‘๋ณต๋˜๋Š” ๋‚จ๋ชจ ์Šคํ”„๋ผ์ดํŠธ ์‚ญ์ œ
hhtboy Jul 31, 2022
1eba439
๋‚จ๋ชจ ํฌ๊ธฐ ๋ณ€๊ฒฝ
hhtboy Jul 31, 2022
ca13f4c
Update .gitignore
hhtboy Jul 31, 2022
ef833d3
Merge remote-tracking branch 'upstream/develop' into develop
hhtboy Jul 31, 2022
008198c
ํฌ๊ธฐ ์ˆ˜์ •
hhtboy Jul 31, 2022
18b1764
์ƒˆ๋กœ์šด ๋ฐœํŒ(๋ฒฝ)ํ˜•ํƒœ ์ถ”๊ฐ€
hhtboy Jul 31, 2022
7a35e0a
player sight ํฌ๊ธฐ ์ƒ‰์ƒ ์กฐ์ •
hhtboy Jul 31, 2022
c6ae29d
ํฌ๊ธฐ ์กฐ์ •
hhtboy Jul 31, 2022
152f277
์ „์žฅ์˜ ์•ˆ๊ฐœ ์ ์šฉ
hhtboy Jul 31, 2022
e340e71
Merge pull request #108 from hhtboy/develop
dongcheolpark Aug 1, 2022
fe13b07
commit
kimmoonwoong Aug 1, 2022
de459f4
commit
kimmoonwoong Aug 1, 2022
6a95319
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 1, 2022
45282d2
์ƒˆ๋กœ์šด ๋งต ์˜ค๋ธŒ์ ํŠธ ์ถ”๊ฐ€
hhtboy Aug 1, 2022
c53cf5e
๋ฐœํŒ ํฌ๊ธฐ ์กฐ์ •
hhtboy Aug 1, 2022
3b7ba36
๋งต ๊ตฌ์กฐ ๋ณ€๊ฒฝ
hhtboy Aug 1, 2022
1273737
๋งต ์ˆ˜์ •
hhtboy Aug 1, 2022
a286f20
bug-fix : ์  ํƒ์ง€ ํ•ด๊ฒฐ
dongcheolpark Aug 2, 2022
6da8d05
feature : tmp
dongcheolpark Aug 2, 2022
e08fbf4
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 2, 2022
0581967
Merge pull request #110 from dongcheolpark/develop
kimmoonwoong Aug 2, 2022
09888cf
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 2, 2022
b005d9e
Merge pull request #107 from dongcheolpark/bug-fix
kjhcocomi Aug 2, 2022
35afa98
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 2, 2022
6e61cd8
Merge branch 'GAMPOT-DEV:develop' into develop
hhtboy Aug 2, 2022
1831c08
์  ์œ ๋‹› Hp UI ๊ตฌํ˜„
kjhcocomi Aug 2, 2022
09cb3ca
Merge pull request #111 from kjhcocomi/develop
dongcheolpark Aug 2, 2022
79a8a76
feature : SceneProfile ์ƒ์„ฑ
dongcheolpark Aug 2, 2022
3265ecd
feature : ํ•ด์ƒ๋„ ์ถ”๊ฐ€
dongcheolpark Aug 2, 2022
c6661d4
bug-fix : ํŒŒ๋™ ์ด๋ฒคํŠธ ์ˆ˜์ •
dongcheolpark Aug 2, 2022
c6698a3
Merge pull request #113 from dongcheolpark/develop
kjhcocomi Aug 2, 2022
c2b8c2b
์ ์•ก์งˆ ์ถ”๊ฐ€
hhtboy Aug 2, 2022
468c58c
Update ํ™ฉํ˜„ํƒ.unity
hhtboy Aug 2, 2022
d872a27
Merge branch 'develop' of https://github.com/hhtboy/Project_Blind intโ€ฆ
hhtboy Aug 2, 2022
abb8320
์  ์œ ๋‹›๊ณผ ํ”Œ๋ ˆ์ด์–ด ์‚ฌ์ด์— ์ง€ํ˜•์ด ์žˆ์œผ๋ฉด Hp UI ๋ณด์ด์ง€ ์•Š๋„๋ก ์ˆ˜์ •
kjhcocomi Aug 3, 2022
fbc78a8
๋ฉ”์ธ ์”ฌ UI ์ด๋ฏธ์ง€ ์ ์šฉ
kjhcocomi Aug 3, 2022
e9e71f8
Merge pull request #115 from kjhcocomi/develop
dongcheolpark Aug 3, 2022
e5de59c
์ˆฒ ๋งต ์˜ค๋ธŒ์ ํŠธ ์ถ”๊ฐ€
Yeogiwon Aug 4, 2022
c04ee52
feature: Hurt ์ƒํƒœ์—์„œ ๋งž์œผ๋ฉด ๋‹ค์‹œ Hurt ์• ๋‹ˆ๋ฉ”์ด์…˜์ด ์‹คํ–‰๋˜๊ฒŒ ๊ตฌํ˜„, ์ ํ”„ ์ค‘ ํŒจ๋ง ์‚ฌ์šฉ ์‹œ ๊ณต์ค‘์— ์žˆ๊ฒŒ ๊ตฌํ˜„โ€ฆ
kimmoonwoong Aug 4, 2022
d6c4d7e
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 4, 2022
7486736
Merge pull request #116 from kimmoonwoong/develop
kimmoonwoong Aug 5, 2022
544f889
commit
kimmoonwoong Aug 5, 2022
539dd0c
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 5, 2022
a44fb25
์ ์•ก์งˆ ์ถ”๊ฐ€
hhtboy Aug 5, 2022
dbc698d
์ ์•ก์งˆ ๊ด€๋ จ ๋””๋ฒ„ํ”„ ์ƒํƒœ ์ถ”๊ฐ€
hhtboy Aug 5, 2022
4129c02
๋””๋ฒ„ํ”„ ๊ด€๋ จ ์ƒํƒœ๋จธ์‹  ์ถ”๊ฐ€
hhtboy Aug 5, 2022
e3a4bb0
์ ์•ก์งˆ ์ฝ”๋“œ ์ถ”๊ฐ€
hhtboy Aug 5, 2022
4f0c8fd
์”ฌ ์ ์•ก์งˆ ํฌ๊ธฐ ์ˆ˜์ •
hhtboy Aug 5, 2022
aba5105
๋กœ๋”ฉ ํ…Œ์ŠคํŠธ ์ถ”๊ฐ€
hhtboy Aug 5, 2022
72f58c8
๋ฒ„๊ทธ ์ˆ˜์ •
hhtboy Aug 5, 2022
d7b812f
๋กœ๋”ฉ์‹œ fade out fade in ํ•˜๋„๋ก ๋ณ€๊ฒฝ
hhtboy Aug 5, 2022
e1a8066
Merge branch 'develop' into develop
hhtboy Aug 5, 2022
b0280d0
lava ํƒœ๊ทธ ์ถ”๊ฐ€
hhtboy Aug 5, 2022
034608c
Merge branch 'develop' of https://github.com/hhtboy/Project_Blind intโ€ฆ
hhtboy Aug 5, 2022
2d68bf9
์บ๋ฆญํ„ฐ ์Šคํ”„๋ผ์ดํŠธ ํฌ๊ธฐ ์กฐ์ •
hhtboy Aug 6, 2022
e5771b2
๋ฐœํŒ ์œ„์น˜ ์ˆ˜์ •
hhtboy Aug 6, 2022
ed0d670
์ ์•ก์งˆ์—์„œ ๋„ํŠธ๋”œ์ด ๋“ค์–ด์˜ด
hhtboy Aug 6, 2022
7db1680
๋‹จ์„œ UI ๊ธฐ๋ณธ ํ‹€ ๊ตฌํ˜„
kjhcocomi Aug 6, 2022
441d16a
Merge pull request #117 from hhtboy/develop
kjhcocomi Aug 7, 2022
3e9d7c4
๋‹จ์„œ UI ๋ณด์™„, ์Šคํฌ๋กค๋กœ ์กฐ์ž‘ํ•  ์ˆ˜ ์žˆ๋„๋ก ๋ณ€๊ฒฝ
kjhcocomi Aug 7, 2022
82a38a4
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 7, 2022
e8d57be
fix : ํ”„๋ฆฌํŒน ํด๋” ์ •๋ฆฌ
dongcheolpark Aug 7, 2022
6de9114
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 7, 2022
bcfae5e
feature : GlowStone.cs ์ƒ์„ฑ
dongcheolpark Aug 7, 2022
b499248
Merge pull request #118 from dongcheolpark/develop
kjhcocomi Aug 7, 2022
bacff6e
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 7, 2022
f908c9d
feature : WaveFX.cs ์ถ”๊ฐ€
dongcheolpark Aug 7, 2022
75dee03
ํŒŒ๋™์„ ์ƒํ˜ธ์ž‘์šฉ
kjhcocomi Aug 7, 2022
207cd7e
Merge pull request #119 from dongcheolpark/develop
kjhcocomi Aug 7, 2022
0053686
Merge branch 'GAMPOT-DEV:develop' into develop
kjhcocomi Aug 7, 2022
7a1618a
Merge pull request #120 from kjhcocomi/develop
kjhcocomi Aug 7, 2022
c402088
feature : ์‹œ์•ผ์„ ์†๋„ ๋ณ€๊ฒฝ
dongcheolpark Aug 7, 2022
0593dcf
๋‹จ์„œ UI ๊ตฌํ˜„
kjhcocomi Aug 7, 2022
d99db8e
Merge pull request #121 from dongcheolpark/develop
kjhcocomi Aug 7, 2022
30b29ef
Merge branch 'GAMPOT-DEV:develop' into develop
kjhcocomi Aug 7, 2022
0356ca1
feature: ๊ฐ•๊ณต๊ฒฉ ๊ตฌํ˜„, ์ ํ”„์ƒํƒœ ๊ณต๊ฒฉ ์ˆ˜์ •
kimmoonwoong Aug 7, 2022
6153955
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 7, 2022
498c3d3
bug-fix : glowstone ์ƒํ˜ธ์ž‘์šฉ ์•ˆ๋˜๋Š” ๋ฒ„๊ทธ ์ˆ˜์ •
dongcheolpark Aug 7, 2022
2268dc5
Merge pull request #122 from kjhcocomi/develop
dongcheolpark Aug 7, 2022
6f33dc1
Merge remote-tracking branch 'upstream/develop' into develop
dongcheolpark Aug 7, 2022
e0766f8
Merge pull request #123 from dongcheolpark/develop
dongcheolpark Aug 7, 2022
a8740a5
feature : ์›๊ฑฐ๋ฆฌ ๋ชฌ์Šคํ„ฐ ์ถ”๊ฐ€
ch-0012 Aug 7, 2022
64936cd
feature : ํˆฌ์‚ฌ์ฒด ํŒจ๋ง ์‹œ ๋ฐ˜์‚ฌ
ch-0012 Aug 7, 2022
9841bd0
commit
kimmoonwoong Aug 7, 2022
4b731f8
Merge branch 'GAMPOT-DEV:develop' into develop
kimmoonwoong Aug 7, 2022
e0050f8
ํˆฌ๋ช…๋ฐœํŒ ๊ตฌํ˜„
hhtboy Aug 8, 2022
9489c57
ํˆฌ๋ช…๋ฐœํŒ ์ถ”๊ฐ€
hhtboy Aug 8, 2022
ed90581
ํˆฌ๋ช…๋ฐœํŒ ์Šคํฌ๋ฆฝํŠธ ์ถ”๊ฐ€
hhtboy Aug 8, 2022
61a4c02
ํˆฌ๋ช…๋ฐœํŒ ํƒœ๊ทธ ์ถ”๊ฐ€
hhtboy Aug 8, 2022
d7c73d7
refactor : Monster ๋ถ€๋ชจ ํด๋ž˜์Šค ์ƒ์„ฑ
ch-0012 Aug 8, 2022
05cdce2
Merge branch 'GAMPOT-DEV:develop' into develop
ch-0012 Aug 8, 2022
bfbde47
refactor : Enemy ์ƒ์œ„ ํด๋ž˜์Šค์— Init ์ถ”๊ฐ€
ch-0012 Aug 8, 2022
386cdc9
refactor : BatMonster -> EnemyCharacter ๋ณ€๊ฒฝ
ch-0012 Aug 8, 2022
910aaf8
fix : ์˜ค๋ฅ˜ ์ˆ˜์ •
ch-0012 Aug 8, 2022
450f640
commit
kimmoonwoong Aug 9, 2022
96bab07
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 9, 2022
e0aa91e
Merge pull request #124 from kimmoonwoong/develop
dongcheolpark Aug 9, 2022
5628b58
Merge pull request #125 from hhtboy/develop
dongcheolpark Aug 9, 2022
42fc61f
feature: ๊ณต๊ฒฉ ํžˆํŠธ๋ฐ•์Šค ์˜ค๋ฅ˜ ํ•ด๊ฒฐ, UnitHp๋กœ ํ†ต์ผ
kimmoonwoong Aug 9, 2022
d640765
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 9, 2022
0518306
๋„ํŠธ๋ฐ๋ฏธ์ง€ UnitHP๋ฅผ ์ด์šฉํ•˜๋Š” ๊ฒƒ์œผ๋กœ ์ˆ˜์ •
hhtboy Aug 9, 2022
6d28420
Merge pull request #126 from kimmoonwoong/develop
kjhcocomi Aug 10, 2022
481503e
Merge pull request #127 from hhtboy/develop
kjhcocomi Aug 10, 2022
4f542fe
์ˆฒ ๋งต ์ˆ˜์ •
Yeogiwon Aug 10, 2022
793dbc2
commit
kimmoonwoong Aug 10, 2022
0baaebd
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 10, 2022
f73bc23
feature: ํŒŒ๋™ํƒ„ ๊ธฐ๋Šฅ ๊ตฌํ˜„
kimmoonwoong Aug 10, 2022
267e289
UI ํ‚ค ์ž…๋ ฅ๋ฐ›๋Š”๋ถ€๋ถ„ ์ตœ์ ํ™”
kjhcocomi Aug 11, 2022
6504739
UI ์ž…๋ ฅ ์ตœ์ ํ™” 2
kjhcocomi Aug 11, 2022
ea0ece1
GameData์—์„œ ๋ฐ์ดํ„ฐ ๊ฐ€์ ธ์˜ค๋Š”๋ถ€๋ถ„ ์ตœ์ ํ™”
kjhcocomi Aug 11, 2022
3c3eec7
ํ•จ์ˆ˜ ์ด๋ฆ„ ์ˆ˜์ •
kjhcocomi Aug 11, 2022
a705090
feature: ํŒŒ๋™ํƒ„ ๊ธฐ๋Šฅ ๋งˆ๋ฌด๋ฆฌ(์ง€์† ์‹œ๊ฐ„๋งŒ ๋„ฃ์œผ๋ฉด ๋)
kimmoonwoong Aug 11, 2022
bbc5dea
Merge pull request #129 from kimmoonwoong/develop
dongcheolpark Aug 11, 2022
71ccef3
Merge pull request #128 from kjhcocomi/develop
dongcheolpark Aug 11, 2022
c2de338
refactor : HP ๋ณ€์ˆ˜ ํ†ต์ผ
ch-0012 Aug 12, 2022
8f531bc
feature : Enemy ํ”ผ๊ฒฉ ์‹œ ํ–‰๋™ ์ถ”๊ฐ€
ch-0012 Aug 12, 2022
0b8677e
fix : Sprite Flip ์•ˆ ๋˜๋Š” ๋ฒ„๊ทธ ์ˆ˜์ •
ch-0012 Aug 12, 2022
36326aa
fix : ํˆฌ์‚ฌ์ฒด ์œ„์น˜ ์ด๋™ ๋ฒ„๊ทธ ์ˆ˜์ •
ch-0012 Aug 12, 2022
140b034
fix : ํˆฌ์‚ฌ์ฒด ์†๋„ ์ผ์ •ํ•˜๊ฒŒ ๋ณ€๊ฒฝ
ch-0012 Aug 12, 2022
1aaa13c
resource : ์ž„์‹œ ํˆฌ์‚ฌ์ฒด prefab
ch-0012 Aug 12, 2022
0d16807
feature : ํˆฌ์‚ฌ์ฒด ๋ฐœ์‚ฌ ๋ฐฉํ–ฅ์— ๋”ฐ๋ฅธ ํˆฌ์‚ฌ์ฒด ํšŒ์ „ ์ถ”๊ฐ€
ch-0012 Aug 12, 2022
db7ccf0
Merge branch 'develop' into develop
ch-0012 Aug 12, 2022
4d55fc6
Merge pull request #130 from ch-0012/develop
kjhcocomi Aug 12, 2022
53446e2
commit
kimmoonwoong Aug 12, 2022
84b3fd6
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 12, 2022
8f5cd98
feature : ์  ์…ฐ์ด๋” ๋ณ€๊ฒฝ
dongcheolpark Aug 13, 2022
23bf4bd
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 13, 2022
58258d2
feature: ํŒŒ๋™ํƒ„ ๊ธฐ๋Šฅ ์™„๋ฃŒ, ๊ฐ์ข… ์˜ค๋ฅ˜ ์ˆ˜์ •
kimmoonwoong Aug 13, 2022
b660f47
Merge pull request #131 from kimmoonwoong/develop
dongcheolpark Aug 13, 2022
899e6c4
test
dongcheolpark Aug 13, 2022
873359b
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 13, 2022
86cbb03
feature : ์•„์›ƒ๋ผ์ธ ๊น”๋”ํ•˜๊ฒŒ ๋ณ€๊ฒฝ
dongcheolpark Aug 14, 2022
c096bd7
feature : fog ์ „๊ฒฝ ์…ฐ์ด๋” ์ƒ์„ฑ
dongcheolpark Aug 14, 2022
cfdb228
์”ฌ ๋กœ๋”ฉ์‹œ ์ •ํ™•ํ•œ ์œ„์น˜๋กœ ์ด๋™ํ•˜๊ฒŒ ๋ณ€๊ฒฝ
hhtboy Aug 14, 2022
ee523da
์—ฌ๊ธฐ์› ๋งต ์ถ”๊ฐ€ ๋ฐ ๋นŒ๋“œ์„ธํŒ… ๋ณ€๊ฒฝ
hhtboy Aug 14, 2022
b03b4a4
feature: ํŒŒ๋™๊ฒŒ์ด์ง€ ๊ตฌํ˜„
kimmoonwoong Aug 15, 2022
e7821af
Merge pull request #134 from hhtboy/develop
dongcheolpark Aug 15, 2022
bd18dac
Merge pull request #135 from kimmoonwoong/develop
dongcheolpark Aug 15, 2022
ad3430c
Merge remote-tracking branch 'upstream/develop' into develop
dongcheolpark Aug 15, 2022
fedc813
ํŒŒ๋™๊ฒŒ์ด์ง€ UI๋ž‘ ์—ฐ๋™
kjhcocomi Aug 15, 2022
a93bee7
Merge pull request #133 from dongcheolpark/develop
kjhcocomi Aug 15, 2022
012c2a9
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 15, 2022
724cb0f
Merge pull request #136 from kjhcocomi/develop
dongcheolpark Aug 15, 2022
a9ea4c1
commit
kimmoonwoong Aug 16, 2022
4e3117f
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 16, 2022
05892f8
ํŒŒ๋™๊ฒŒ์ด์ง€ UI ์ˆ˜์ •
kjhcocomi Aug 16, 2022
bad006d
Merge branch 'GAMPOT-DEV:develop' into develop
kjhcocomi Aug 16, 2022
57ab310
Merge pull request #137 from kjhcocomi/develop
kimmoonwoong Aug 16, 2022
2d7fe6a
commit
kimmoonwoong Aug 16, 2022
4b9e53b
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 16, 2022
eafb759
์ˆฒ ์˜ค๋ธŒ์ ํŠธ ์ถ”๊ฐ€
Yeogiwon Aug 16, 2022
f221be4
๋ฉ”์ธํ™”๋ฉด ์›€์ง์ด๋Š” ๊ตฌ๋ฆ„ํšจ๊ณผ ์ถ”๊ฐ€
kjhcocomi Aug 16, 2022
55a36c3
Merge branch 'GAMPOT-DEV:develop' into develop
kjhcocomi Aug 16, 2022
dc14f8a
feature: ์ŠคํŒŒ์ธ ์• ๋‹ˆ๋ฉ”์ด์…˜ ๋Ÿฐํƒ€์ž„ ์„ค์น˜
kimmoonwoong Aug 16, 2022
f184b5c
Merge pull request #138 from kjhcocomi/develop
kimmoonwoong Aug 16, 2022
22a854e
Merge pull request #139 from kimmoonwoong/develop
kjhcocomi Aug 16, 2022
d85da30
commit
kimmoonwoong Aug 16, 2022
81ba8bf
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 16, 2022
4ecb7f5
feature : ํŒŒ๋™ ํƒ์ง€ ์• ๋‹ˆ๋ฉ”์ด์…˜ ์ถ”๊ฐ€
dongcheolpark Aug 17, 2022
fb28a38
์„ค์ • UI ์ ์šฉ
kjhcocomi Aug 17, 2022
fc7dd8f
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 17, 2022
9999c7b
Merge pull request #140 from kjhcocomi/develop
dongcheolpark Aug 17, 2022
9fb885a
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 18, 2022
c24f9f7
๋งต ์ด๋ฆ„ ๋ณ€๊ฒฝ
hhtboy Aug 18, 2022
b153969
๋งต ๊ด€๋ จ ํด๋” ์ƒ์„ฑ
hhtboy Aug 18, 2022
295cf51
๋งต ์ด๋ฆ„ ๋ณ€๊ฒฝ
hhtboy Aug 18, 2022
ee2e1dd
ํฌ๊ธฐ ์กฐ์ •
hhtboy Aug 18, 2022
d4f29c3
๋นŒ๋“œ์„ธํŒ… ์ถ”๊ฐ€
hhtboy Aug 18, 2022
39248cc
Merge pull request #141 from hhtboy/develop
dongcheolpark Aug 18, 2022
db7afd6
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 18, 2022
1ecb8c9
์ตœ์ข… ๋งต ์ถ”๊ฐ€
hhtboy Aug 19, 2022
5d47dad
๋งต ์—ฐ๊ฒฐ
hhtboy Aug 19, 2022
5858f4f
ํ•œ์˜ฅ ์ด๋ฏธ์ง€ ์ถ”๊ฐ€
hhtboy Aug 19, 2022
5359fc3
Merge pull request #142 from hhtboy/develop
kjhcocomi Aug 19, 2022
060cc65
์„ค์ • ui ์ˆ˜์ •, ์ธ๊ฒŒ์ž„ ui ์ ์šฉ
kjhcocomi Aug 20, 2022
03db8d0
Merge pull request #143 from kjhcocomi/develop
dongcheolpark Aug 20, 2022
8867ece
์ˆฒ ๋งต ์˜ค๋ธŒ์ ํŠธ ๋ฐฐ์น˜
Yeogiwon Aug 20, 2022
8e551e7
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
Yeogiwon Aug 20, 2022
4b6b3e2
event system ๋ฐ main์œผ๋กœ ๋Œ์•„๊ฐ€๋Š” transition ๋ฐฐ์น˜
hhtboy Aug 20, 2022
6d059eb
Merge branch 'develop' of https://github.com/hhtboy/Project_Blind intโ€ฆ
hhtboy Aug 20, 2022
a918eb6
์ˆฒ ๋งต์— event system ๋ฐ main์œผ๋กœ ๋Œ์•„๊ฐ€๋Š” transition ๋ฐฐ์น˜
hhtboy Aug 20, 2022
453cc78
Merge pull request #145 from hhtboy/develop
dongcheolpark Aug 20, 2022
9280b81
๋ฉ”์ธํ™”๋ฉด ๋Œ์•„๊ฐ€๋Š” ๊ธฐ๋Šฅ, ui ๊ตฌํ˜„
kjhcocomi Aug 21, 2022
b2ec9ff
feature: ํŒจ๋ง์‹œ์Šคํ…œ ๋กœ์ง ๋ณ€๊ฒฝ, ์• ๋‹ˆ๋ฉ”์ด์…˜๊ณผ ํ”Œ๋ ˆ์ด์–ด ๋กœ์ง ์—ฐ๊ฒฐ ํ…Œ์ŠคํŠธ, ํ”Œ๋ ˆ์ด์–ด ์กฐ์ž‘ํ‚ค ๋ณ€๊ฒฝํ•จ์ˆ˜ ์ถ”๊ฐ€
kimmoonwoong Aug 21, 2022
e3b2ea5
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 21, 2022
f120208
Merge pull request #146 from kjhcocomi/develop
kimmoonwoong Aug 22, 2022
56e28e4
commit
kimmoonwoong Aug 22, 2022
ae50918
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 22, 2022
d145636
Merge pull request #147 from kimmoonwoong/develop
kimmoonwoong Aug 23, 2022
6f389e9
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 23, 2022
fc62c6a
save
dongcheolpark Aug 23, 2022
58ee627
save
dongcheolpark Aug 23, 2022
129cfe8
feature : ์žฅ์‚ฐ๋ฒ” ์ „์ฒด์ ์ธ ํ‹€ ์ƒ์„ฑ
dongcheolpark Aug 26, 2022
70adc08
feature: ํ”Œ๋ ˆ์ด์–ด ์ด๋™ ์ฝ”๋“œ ๋ฐ ๋Œ€์‰ฌ ์ฝ”๋“œ ์ˆ˜์ •, ๋ณด์Šค ํŒจํ„ด ํด๋ž˜์Šค ๊ตฌํ˜„
kimmoonwoong Aug 26, 2022
1b025ec
Merge pull request #148 from dongcheolpark/develop
kimmoonwoong Aug 26, 2022
52e3922
commit
kimmoonwoong Aug 26, 2022
2dcc5e5
commit
kimmoonwoong Aug 26, 2022
4de9546
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 26, 2022
dee63ae
feature: ๋ฉ”์ธ ํด๋ž˜์Šค์™€ ํŒจํ„ดํด๋ž˜์Šค ๋ณ‘ํ•ฉ
kimmoonwoong Aug 26, 2022
9049256
Merge pull request #149 from kimmoonwoong/develop
kimmoonwoong Aug 26, 2022
55f02c6
feature : webgl ๋นŒ๋“œ ํ…Œ์ŠคํŠธ
dongcheolpark Aug 27, 2022
5df0558
commit
kimmoonwoong Aug 27, 2022
dc733ef
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 27, 2022
84aad34
feature: ์ŠคํŒŒ์ธ ์• ๋‹ˆ๋ฉ”์ด์…˜ ์ ์šฉ
kimmoonwoong Aug 28, 2022
dc0936f
Merge pull request #151 from kimmoonwoong/develop
kimmoonwoong Aug 28, 2022
dd974ab
featuer: ๋ณด์Šค ํŒจํ„ด2 ์ดˆ๊ธฐ๋ฒ„์ „
kimmoonwoong Aug 29, 2022
9c19ddc
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Aug 29, 2022
f8bebf8
Merge pull request #152 from kimmoonwoong/develop
kjhcocomi Aug 30, 2022
2e76cff
feature : webgl ๋นŒ๋“œ ํ…Œ์ŠคํŠธ
dongcheolpark Aug 30, 2022
ac2bbd7
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 30, 2022
8080f5e
ํ‚ค์…‹ํŒ… ui ์ธํ„ฐํŽ˜์ด์Šค๋งŒ ๊ตฌํ˜„ (๊ธฐ๋Šฅ์€ x)
kjhcocomi Aug 30, 2022
0604148
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 30, 2022
14f7ba3
Merge pull request #153 from kjhcocomi/develop
kimmoonwoong Aug 30, 2022
e421941
featue: ํ‚ค ์…‹ํŒ… ๋ณ€๊ฒฝ
kimmoonwoong Aug 30, 2022
c527db1
Merge pull request #154 from kimmoonwoong/develop
kjhcocomi Aug 30, 2022
2a92437
.
kjhcocomi Aug 30, 2022
da8c09b
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 30, 2022
b8a411d
fix : ํŒŒ์ผ ๊ตฌ์กฐ ์ˆ˜์ •
dongcheolpark Aug 30, 2022
cc31780
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Aug 30, 2022
6164f45
Merge pull request #155 from dongcheolpark/develop
kimmoonwoong Aug 30, 2022
7e916be
.
kjhcocomi Aug 30, 2022
5ec0b81
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Aug 30, 2022
5fbdc67
feature : playerHP ๋ณ€๊ฒฝ
dongcheolpark Aug 30, 2022
be8903f
feature : enemyhp ์ˆ˜์ •
dongcheolpark Aug 30, 2022
c5d5ab3
Merge pull request #157 from dongcheolpark/develop
kimmoonwoong Aug 31, 2022
ecb960f
์ˆ˜์ •
kjhcocomi Sep 1, 2022
f4bc6d9
Merge branch 'develop' of https://github.com/kjhcocomi/Project_Blind โ€ฆ
kjhcocomi Sep 1, 2022
f120191
ํ‚ค์…‹ํŒ… ui ํ‚ค์ž…๋ ฅ ๊ตฌํ˜„
kjhcocomi Sep 1, 2022
299d33a
Merge pull request #158 from kjhcocomi/develop
dongcheolpark Sep 1, 2022
59e7fa7
feature : ๋ฌผ๊ธฐ ํŒจํ„ด ์ถ”๊ฐ€
dongcheolpark Sep 1, 2022
a6acc46
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Sep 1, 2022
dff1be1
๋งต ์˜ค๋ธŒ์ ํŠธ ์ถ”๊ฐ€
hhtboy Sep 1, 2022
7b676b5
์ฑ„์ƒ‰ ์˜ค๋ธŒ์ ํŠธ ๋Œ€์ฒด
hhtboy Sep 1, 2022
de399a5
๋งต ์˜ค๋ธŒ์ ํŠธ ์ถ”๊ฐ€
hhtboy Sep 1, 2022
7d8f17b
์ฑ„์ƒ‰ ์†Œ๋‚˜๋ฌด ์ถ”๊ฐ€
hhtboy Sep 1, 2022
6c3e933
Merge pull request #162 from hhtboy/develop
dongcheolpark Sep 1, 2022
9398681
์ˆฒ ๋งต์—์„œ ๋™๊ตด ๋งต์œผ๋กœ ์ด๋™์‹œ ๋ฉ”์ธํ™”๋ฉด์œผ๋กœ ๋„˜์–ด๊ฐ€๋Š” ๋ฒ„๊ทธ ์ˆ˜์ •
hhtboy Sep 1, 2022
7383731
feature : ๋ชฝ๋‘ฅ์ด ์ถ”๊ฐ€
dongcheolpark Sep 1, 2022
1b73d5b
Merge pull request #163 from hhtboy/develop
dongcheolpark Sep 1, 2022
63a0d3b
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Sep 1, 2022
97fe551
feature : ๋ชฝ๋‘ฅ์ด ์‚ฐ์  material ๋ณ€๊ฒฝ
dongcheolpark Sep 1, 2022
693cdb4
์ˆฒ ๋งต ํƒ€์ผ ์ถ”๊ฐ€
hhtboy Sep 1, 2022
6ada814
Merge pull request #164 from hhtboy/develop
dongcheolpark Sep 1, 2022
8e719d4
Merge branch 'develop' of https://github.com/GAMPOT-DEV/Project_Blindโ€ฆ
dongcheolpark Sep 1, 2022
2fa66a6
feature : light ์ถ”๊ฐ€
dongcheolpark Sep 1, 2022
35f1c67
feature: ๊ฐ•๊ณต๊ฒฉ ์˜ค๋ฅ˜ ํ•ด๊ฒฐ
kimmoonwoong Sep 1, 2022
6c0cdf3
commit
kimmoonwoong Sep 1, 2022
780059d
Merge branch 'develop' of https://github.com/kimmoonwoong/Project_Bliโ€ฆ
kimmoonwoong Sep 1, 2022
9c915fe
Merge pull request #165 from kimmoonwoong/develop
dongcheolpark Sep 1, 2022
d0a0dcd
Merge pull request #160 from dongcheolpark/develop
dongcheolpark Sep 1, 2022
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
58 changes: 58 additions & 0 deletions Project_Blind/Assets/Material/FX.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: FX
m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3}
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _AlphaTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
8 changes: 8 additions & 0 deletions Project_Blind/Assets/Material/FX.mat.meta

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

Loading