31 Commits

Author SHA1 Message Date
a82d78f0fb GAS 적용시도 2023-10-30 00:04:36 +09:00
9c071ad3fc 레전드 복잡해서 자고 일어나서 해야겠다. 2023-10-28 03:31:01 +09:00
832a889afd 저장 2023-10-27 23:19:33 +09:00
fbc5e4d30e 저장 2023-10-27 22:54:37 +09:00
64a9f38c30 Merge branch 'Peter' into HappyTanuki
# Conflicts:
#	Content/Character/Allium/BP_Allium.uasset
#	Content/Character/Lb/Animation/ABP_Lb.uasset
#	Content/Character/Lb/BP_Lb.uasset
#	Content/Character/Lb/LB_Bolla_Throw.uasset
#	Content/Character/Notify/Rotating.uasset
#	Content/Character/Riana/Animation/Skill4_3_Anim.uasset
#	Content/Effect/LB/Arrow/Arrow.uasset
#	Content/Effect/LB/Arrow/Arrow_Flash.uasset
#	Content/Effect/LB/Arrow/Arrow_PhysicsAsset.uasset
#	Content/Effect/LB/LB_Skill/LB_Arrow.uasset
#	Content/Effect/LB/LB_Skill/Q/LB_Q.uasset
#	Content/Effect/LB/LB_Sprint.uasset
#	Content/Maps/DevMap.umap
#	Content/StarterContent/Materials/M_Basic_Floor.uasset
#	Content/StarterContent/Particles/Materials/M_Radial_Gradient.uasset
#	Content/StarterContent/Particles/Materials/M_Spark.uasset
#	Content/StarterContent/Particles/Materials/M_radial_ramp.uasset
#	Content/StarterContent/Particles/Materials/m_flare_01.uasset
#	Source/Promether/PlayerGeneric/DefaultPlayerController.cpp
#	Source/Promether/PlayerGeneric/DefaultPlayerController.h
2023-10-27 21:50:08 +09:00
cf98a38684 Merge branch 'ssasin' into HappyTanuki
# Conflicts:
#	Content/Maps/DevMap.umap
2023-10-27 21:42:53 +09:00
053c56f37c 호-밍 공격 및 선택 시스템 구현 2023-10-25 02:40:51 +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
727478c286 bug fix 2023-10-22 01:58:42 +09:00
c3e1bb932d 머지 및 버그픽스 대충 완료 2023-10-22 00:43:43 +09:00
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
fe6d559697 코스트 체크 완성 2023-10-10 23:59:57 +09:00
2a22ff140f 0뎀은 데미지가 아니에요!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! 2023-10-10 23:38:27 +09:00
3615e7be0a 머지 완료, 데미지 관련 간단 구현 2023-10-10 23:35:41 +09:00
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
ae124e49f0 타이먼 기반 땜빵 코딩 2023-10-08 18:59:33 +09:00
69852b9541 스탯이 이제 stats와 동기화됩니다. 2023-10-08 05:12:55 +09:00
52e4c37ee5 코드 정리 + stats FName구현체 2023-10-08 04:45:12 +09:00
SJW1024
64d92be895 리아나 전체 모션 및 파운드 궁극기 모션 삽입 2023-10-07 22:26:53 +09:00
deef14d8b5 이상한 맵 삭제 및 abp 구조 수정 2023-10-07 20:45:53 +09:00
326ae353d3 회전방향 동기화 2023-10-07 20:13:01 +09:00
280 changed files with 1917 additions and 1251 deletions

View File

@@ -57,6 +57,7 @@ bAuthorizeAutomaticWidgetVariableCreation=False
+ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/Promether") +ActiveGameNameRedirects=(OldGameName="TP_Blank",NewGameName="/Script/Promether")
+ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/Promether") +ActiveGameNameRedirects=(OldGameName="/Script/TP_Blank",NewGameName="/Script/Promether")
+ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="PrometherGameModeBase") +ActiveClassRedirects=(OldClassName="TP_BlankGameModeBase",NewClassName="PrometherGameModeBase")
AssetManagerClassName=/Script/Promether.DefaultAssetManager
[/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings] [/Script/AndroidFileServerEditor.AndroidFileServerRuntimeSettings]
bEnablePlugin=True bEnablePlugin=True

View File

@@ -1,7 +1,22 @@
[/Script/EngineSettings.GeneralProjectSettings] [/Script/EngineSettings.GeneralProjectSettings]
ProjectID=34DF7AAB4D4B8D6A39DEBFAED8629849 ProjectID=34DF7AAB4D4B8D6A39DEBFAED8629849
[StartupActions] [StartupActions]
bAddPacks=True bAddPacks=True
InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent") InsertPack=(PackSource="StarterContent.upack",PackName="StarterContent")
[/Script/Engine.AssetManagerSettings]
-PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass=/Script/Engine.World,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
-PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass=/Script/Engine.PrimaryAssetLabel,bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="Map",AssetBaseClass="/Script/Engine.World",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game/Maps")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="PrimaryAssetLabel",AssetBaseClass="/Script/Engine.PrimaryAssetLabel",bHasBlueprintClasses=False,bIsEditorOnly=True,Directories=((Path="/Game")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=Unknown))
+PrimaryAssetTypesToScan=(PrimaryAssetType="GameFeatureData",AssetBaseClass="/Script/GameFeatures.GameFeatureData",bHasBlueprintClasses=False,bIsEditorOnly=False,Directories=((Path="/Game/Unused")),SpecificAssets=,Rules=(Priority=-1,ChunkId=-1,bApplyRecursively=True,CookRule=AlwaysCook))
bOnlyCookProductionAssets=False
bShouldManagerDetermineTypeAndName=False
bShouldGuessTypeAndNameInEditor=True
bShouldAcquireMissingChunksOnLoad=False
bShouldWarnAboutInvalidAssets=True
MetaDataTagsForAssetRegistry=()

View File

@@ -0,0 +1,23 @@
[/Script/GameplayTags.GameplayTagsSettings]
ImportTagsFromConfig=True
WarnOnInvalidTags=True
ClearInvalidTags=False
AllowEditorTagUnloading=True
AllowGameTagUnloading=False
FastReplication=False
InvalidTagCharacters=
NumBitsForContainerSize=6
NetIndexFirstBitSegment=16
+GameplayTagList=(Tag="State.Buff.Regenerate.Health",DevComment="")
+GameplayTagList=(Tag="State.Buff.Regenerate.Mana",DevComment="")
+GameplayTagList=(Tag="State.Buff.Shield",DevComment="")
+GameplayTagList=(Tag="State.Dead",DevComment="")
+GameplayTagList=(Tag="State.Debuff.Burning",DevComment="")
+GameplayTagList=(Tag="State.Debuff.Root",DevComment="")
+GameplayTagList=(Tag="State.Debuff.Slow",DevComment="")
+GameplayTagList=(Tag="State.Debuff.Stun",DevComment="")
+GameplayTagList=(Tag="State.Return",DevComment="")
+GameplayTagList=(Tag="Team.Black",DevComment="")
+GameplayTagList=(Tag="Team.Neutral",DevComment="")
+GameplayTagList=(Tag="Team.White",DevComment="")

View File

@@ -67,7 +67,9 @@ bCaptureMouseOnLaunch=True
bEnableLegacyInputScales=True bEnableLegacyInputScales=True
bEnableMotionControls=True bEnableMotionControls=True
bFilterInputByPlatformUser=False bFilterInputByPlatformUser=False
bEnableInputDeviceSubsystem=True
bShouldFlushPressedKeysOnViewportFocusLost=True bShouldFlushPressedKeysOnViewportFocusLost=True
bEnableDynamicComponentInputBinding=True
bAlwaysShowTouchInterface=False bAlwaysShowTouchInterface=False
bShowConsoleOnFourFingerTap=True bShowConsoleOnFourFingerTap=True
bEnableGestureRecognizer=False bEnableGestureRecognizer=False

BIN
Content/Blueprints/BP_Deathmatch.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

BIN
Content/Blueprints/Bp_DefaultplayerController.uasset (Stored with Git LFS) Normal file

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/ETC/MAT_Allium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/PHY_Allium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/SKM_Allium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/SKT_Allium.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/TEX_Allium_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/TEX_Allium_Emissive.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Allium/ETC/TEX_Allium_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Character/Lb/Ability/BP_BaseAttack.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/ETC/MAT_LB_Body.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/MAT_LB_Head.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/PHY_Lb.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/SKM_Lb.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/SKT_Lb.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/TEX_LB_Body_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/TEX_LB_Body_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Character/Lb/ETC/TEX_LB_Head_BaseColor.uasset (Stored with Git LFS) Normal file

Binary file not shown.

BIN
Content/Character/Lb/ETC/TEX_LB_Head_Normal.uasset (Stored with Git LFS) Normal file

Binary file not shown.

Binary file not shown.

BIN
Content/Character/Lb/Effect/Missile.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

BIN
Content/Character/Lb/Skeleton/Lb.uasset (Stored with Git LFS)

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

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