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:SJW1024
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

50 Commits
Peter ... SJW1024

Author SHA1 Message Date
SJW1024
d6c58e8c15 Merge remote-tracking branch 'origin/ssasin' into SJW1024 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
 2023-11-15 04:14:43 +09:00
HappyTanuki
8276b4f3f0 맵 병합 2023-11-15 03:41:11 +09:00
HappyTanuki
a1d0304ea8 Merge remote-tracking branch 'origin/ssasin' into SJW1024 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/Bp_DefaultplayerController.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Lb/Lb_RskillBurst.uasset
#	Content/Character/Lb/Lb_WskillDebuff.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
 2023-11-15 02:17:44 +09:00
SJW1024
6691dfd3fa 캐릭터 스킬 최종 2023-11-15 02:14:46 +09:00
HappyTanuki
598a21efc3 머지 완료 2023-11-14 02:44:53 +09:00
HappyTanuki
24932cdd2b Merge branch 'HappyTanuki2' into SJW1024 
# Conflicts:
#	Content/Character/Allium/Alium_Q.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Q_Arrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/GameModeBase/Deathmatch.cpp
 2023-11-14 02:27:19 +09:00
SJW1024
334064270f 알리움 사운드 수정,. 리아나 스킬 제작중 2023-11-14 01:10:43 +09:00
HappyTanuki
db63221d3d 머지 완료 2023-11-14 01:00:29 +09:00
ssasin3801
70812516f0 맵 완성 2023-11-13 23:38:00 +09:00
HappyTanuki
a21c1378f1 Merge branch 'SJW1024' into HappyTanuki2 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Riana/BP_Riana.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerCharacter.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
 2023-11-13 22:58:56 +09:00
SJW1024
b27742e32f 복구 2023-11-13 22:37:54 +09:00
SJW1024
9a6fc93fa1 삭제 2023-11-13 22:35:11 +09:00
SJW1024
4c3356ffc2 파운드 100%, 알리움 대상 지정 제외 전체 완성 2023-11-13 06:53:58 +09:00
ssasin3801
de923d0d4e 임시 2023-11-13 02:24:19 +09:00
HappyTanuki
8e4677250e 평타 구현 완료 2023-11-10 00:22:09 +09:00
HappyTanuki
1cd43f4527 저장 2023-11-09 22:51:12 +09:00
SJW1024
27a20d9573 작업 전 최신화 2023-11-09 20:13:59 +09:00
HappyTanuki
f085e924bb Merge branch 'ForShowcase' into HappyTanuki2 
# Conflicts:
#	Content/Blueprints/BP_DefaultPlayerCharacter.uasset
#	Content/Blueprints/UI/NameBar_UI/NameBar_UI.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/BaseArrow.uasset
#	Content/Character/Lb/EskillBuff.uasset
#	Content/Maps/DevMap.umap
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
 2023-11-09 20:05:38 +09:00
SJW1024
8eff7f8757 123345 2023-11-07 23:26:47 +09:00
SJW1024
10dd576239 캐릭터에 이펙트 적용 2023-11-05 18:41:30 +09:00
HappyTanuki
56c68e85d0 쇼케이스용 중간 결과물 2023-10-30 01:08:42 +09:00
SJW1024
19f157e032 이펙트 개선, 파운드 R스킬 수정 2023-10-27 22:26:36 +09:00
HappyTanuki
cf98a38684 Merge branch 'ssasin' into HappyTanuki 
# Conflicts:
#	Content/Maps/DevMap.umap
 2023-10-27 21:42:53 +09:00
SJW1024
08c70b5df3 파운드 스킬구현 1차 완 2023-10-27 01:19:16 +09:00
HappyTanuki
053c56f37c 호-밍 공격 및 선택 시스템 구현 2023-10-25 02:40:51 +09:00
SJW1024
9f1e6e5d5d Ap/Ad 구분 완 2023-10-24 01:44:07 +09:00
SJW1024
3d59b3d336 이펙트 다운로드, 평타 수정중 2023-10-24 01:26:08 +09:00
ssasin3801
8a08d4b487 맵 기초틀 변경 2023-10-24 00:11:56 +09:00
SJW1024
19d7095a43 재업 2023-10-23 00:52:39 +09:00
SJW1024
d64a725306 캐릭터 애니메이션 통제(특정 행동 도중 스킬/이동/공격 불가 설정), 평타 알고리즘 완성 2023-10-22 22:44:14 +09:00
HappyTanuki
727478c286 bug fix 2023-10-22 01:58:42 +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
1625 changed files with 5523 additions and 692 deletions
Expand all files Collapse all files

7
Config/DefaultEngine.ini
View File

@@ -1,8 +1,9 @@
[/Script/EngineSettings.GameMapsSettings]
GameDefaultMap=/Game/Maps/DevMap.DevMap
EditorStartupMap=/Game/Maps/DevMap.DevMap
GameDefaultMap=/Game/Maps/MiniMap.MiniMap
EditorStartupMap=/Game/Maps/MiniMap.MiniMap
GameInstanceClass=/Script/Promether.DefaultGameInstance
ServerDefaultMap=/Game/Maps/DevMap.DevMap
ServerDefaultMap=/Game/Maps/MiniMap.MiniMap
TransitionMap=/Game/Maps/MiniMap.MiniMap
[/Script/WindowsTargetPlatform.WindowsTargetSettings]
DefaultGraphicsRHI=DefaultGraphicsRHI_DX12

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Blueprints/Bp_DefaultplayerController.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/Blueprints/UI/NewWidgetBlueprint.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나_P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/리아나_W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/메인_UI.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/불투명_ver_.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/스킬칸.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/알리움P.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/알리움R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/체력+마나_배경_.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/체력바.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드E.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드Q.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드R.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Blueprints/UI/fddfd/파운드W.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Alium_W.uasset (Stored with Git LFS)
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/Alium_w_debuff.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

BIN
Content/Character/Allium/Aliun_E_Effect.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/Attack1_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Animation/Attack3_Anim.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/sound/AL_A_1.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/BP_Folder/DefaultClass.uasset (Stored with Git LFS)
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/E_Anim.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/Animation/W_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/BaseArrow.uasset (Stored with Git LFS) Normal file
View File

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/Effect/MP_Toxic Goo.mp3 Normal file
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/Effect/T_H_W_Tied.uasset (Stored with Git LFS) Normal file
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)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/SkeletalMesh/Lb.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