A-Rival/Promether
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: A-Rival:Peter
Branches Tags
A-Rival:master A-Rival:SJW1024 A-Rival:ssasin A-Rival:HappyTanuki A-Rival:develop A-Rival:Peter
A-Rival:server A-Rival:debug_client A-Rival:client
..
compare: A-Rival:master
Branches Tags
A-Rival:SJW1024 A-Rival:ssasin A-Rival:HappyTanuki A-Rival:develop A-Rival:master A-Rival:Peter
A-Rival:server A-Rival:debug_client A-Rival:client

24 Commits
Peter ... master

Author SHA1 Message Date
HappyTanuki
ed5b49ebae Merge branch 'develop' 2023-10-22 00:46:21 +09:00
HappyTanuki
c3e1bb932d 머지 및 버그픽스 대충 완료 2023-10-22 00:43:43 +09:00
HappyTanuki
ef12cf0dbd Merge branch 'SJW1024' into develop 
# Conflicts:
#	Content/Maps/DevMap.umap
 2023-10-21 23:14:00 +09:00
ssasin3801
7340756d96 맵 기본 틀 잡기 
# Conflicts:
#	Content/Maps/DevMap.umap
 2023-10-21 23:11:42 +09:00
SJW1024
5ad7df473b 버프 시스템 샘플 -완- 2023-10-16 02:51:26 +09:00
SJW1024
0fc3bf0ec9 평타 알고리즘 최종(duration 초기화/적 캐릭터만 지정 기능 추가 필요) 
캐릭터 체력바 UI 추가(실시간 업데이트 구현 실패)
MaxStats Enum 추가, stats에 경험치 관련 스탯 추가
 2023-10-15 23:11:06 +09:00
SJW1024
1e14efdea4 평타 알고리즘 최종(duration 초기화/적 캐릭터만 지정 기능 추가 필요) 2023-10-15 23:06:32 +09:00
SJW1024
f9d36a2824 평타알고리즘 최종(반복 사이클만 설정하면 끝) 2023-10-15 19:25:18 +09:00
SJW1024
a201059fbb 평타 알고리즘 22 2023-10-15 01:23:33 +09:00
SJW1024
d3025bfbfa 기본 공격 알고리즘 설계중 2023-10-15 00:35:56 +09:00
HappyTanuki
fe6d559697 코스트 체크 완성 2023-10-10 23:59:57 +09:00
HappyTanuki
2a22ff140f 0뎀은 데미지가 아니에요!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2023-10-10 23:38:27 +09:00
HappyTanuki
3615e7be0a 머지 완료, 데미지 관련 간단 구현 2023-10-10 23:35:41 +09:00
HappyTanuki
39e95c5cf8 Merge branch 'HappyTanuki' into SJW1024 
# Conflicts:
#	Content/Character/BP_Folder/DefaultClass.uasset
#	Content/Character/Lb/Animation/ABP_Lb.uasset
#	Content/Character/Lb/Animation/R2_Anim.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.h
 2023-10-10 20:53:38 +09:00
HappyTanuki
ae124e49f0 타이먼 기반 땜빵 코딩 2023-10-08 18:59:33 +09:00
HappyTanuki
69852b9541 스탯이 이제 stats와 동기화됩니다. 2023-10-08 05:12:55 +09:00
HappyTanuki
52e4c37ee5 코드 정리 + stats FName구현체 2023-10-08 04:45:12 +09:00
SJW1024
64d92be895 리아나 전체 모션 및 파운드 궁극기 모션 삽입 2023-10-07 22:26:53 +09:00
HappyTanuki
deef14d8b5 이상한 맵 삭제 및 abp 구조 수정 2023-10-07 20:45:53 +09:00
HappyTanuki
326ae353d3 회전방향 동기화 2023-10-07 20:13:01 +09:00
HappyTanuki
359231da00 Merge branch 'develop' 2023-10-03 22:26:46 +09:00
HappyTanuki
58785ac8a3 Merge branch 'develop' 2023-10-03 22:24:21 +09:00
HappyTanuki
5cd15e1bde Merge branch 'develop' 2023-10-03 21:43:38 +09:00
HappyTanuki
0a7e29868d Merge branch 'develop' 2023-09-26 01:55:27 +09:00
192 changed files with 667 additions and 804 deletions
Expand all files Collapse all files

BIN
Content/Blueprints/BP_DefaultPlayerCharacter.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/DefaultClass.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/ContinueActing.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/ContinueAttack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/ContinueMoving.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/ContinueSkilluse.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/Rotating.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/StopActing.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/StopAttack.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/StopMoving.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/StopSkilluse.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/Notify/WallEnd.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/NameBar_UI/Hp_UI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Q_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_Skill2.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Alium_W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/ABP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/AttackCombo.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Animation/Skill4_2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/BP_Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Material/Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/Allium_BaseColor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/Allium_Emissive.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/Allium_Normal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/Allium_OcclusionRoughnessMetallic.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/알리움_리토폴로지조립_Allium_BaseColor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/알리움_리토폴로지조립_Allium_Emissive.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/알리움_리토폴로지조립_Allium_Normal.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Texture/알리움_리토폴로지조립_Allium_OcclusionRoughnessMetallic.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/ABP_Lb.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/Q_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/R1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/R2_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/Treasure_Attack1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/BP_Lb.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/EskillBuff.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Lb/LB_Bolla_Throw.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Golem/Animation/Golem_Dead_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Golem/Animation/Golem_Regen2_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Golem/PhysicsAsset/Golem_Dead_PhysicsAsset.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Golem/SkeletalMesh/Golem_Dead.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Golem/Skeleton/Golem_Dead_Skeleton.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Monster/Knight/Weapon/Material/Material__23.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/ContinueActing.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/ContinueAttack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/ContinueMoving.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/ContinueSkilluse.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/Rotating.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/StopActing.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/StopAttack.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/StopMoving.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/StopSkilluse.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Notify/WallEnd.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/ABP_Riana.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill3_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_1_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_2_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_3_Anim.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Riana/Animation/Skill4_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Riana/BP_Riana.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Alium_E.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Alium_Sprint.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Alium_Sprint_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Alium_Sprint_PhysicsAsset.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Alium_Sprint_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_E/Allium.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_Q/Aliun_Q_Fx.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_Q_2.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_W.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Alium_W/Alium_W.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Alium/Aliun_E.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Arrow.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Burning.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Burning/Burning.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/ComBackHome.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/ComeBackHome.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Effect/ETC/ComeBackHome/ComeBackHome.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Debuff_Simbol/Cursor_IC.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Effect/ETC/Debuff_Simbol/M_Cursor.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Effect/ETC/Hit_Critical.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Hit_FX/Hit_Critical.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Hit_FX/Hit_nomal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Hit_nomal.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Shield.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Shield/Shield_MT.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Shield/Shield_Texture.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Speed_Down.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Speed_Down/Cursor_IC.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Speed_Down/M_Cursor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/ETC/Speed_Down/Speed_Down.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/GolAttackSample.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/Gol_big_Attack/Box001_default.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/Gol_big_Attack/Golem_Attack2_Dust_Mt.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/Gol_big_Attack/Golem_Attack2_Dust_Texture.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/Gol_big_Attack/Golem_Attack2_FX.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Effect/Golam/Gol_big_Attack/Golem_Attack2_FX_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More