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

Compare commits

base: A-Rival:develop
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:HappyTanuki
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

12 Commits
develop ... HappyTanuk

Author SHA1 Message Date
HappyTanuki
a82d78f0fb GAS 적용시도 2023-10-30 00:04:36 +09:00
HappyTanuki
9c071ad3fc 레전드 복잡해서 자고 일어나서 해야겠다. 2023-10-28 03:31:01 +09:00
HappyTanuki
832a889afd 저장 2023-10-27 23:19:33 +09:00
HappyTanuki
fbc5e4d30e 저장 2023-10-27 22:54:37 +09:00
HappyTanuki
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
HappyTanuki
cf98a38684 Merge branch 'ssasin' into HappyTanuki 
# Conflicts:
#	Content/Maps/DevMap.umap
 2023-10-27 21:42:53 +09:00
HappyTanuki
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
PeterPan
9d07b34c06 복원 2023-10-21 16:08:53 +09:00
348 changed files with 1902 additions and 1107 deletions
Expand all files Collapse all files

1
Config/DefaultEngine.ini
View File

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

15
Config/DefaultGame.ini
View File

@@ -1,7 +1,22 @@
[/Script/EngineSettings.GeneralProjectSettings]
ProjectID=34DF7AAB4D4B8D6A39DEBFAED8629849
[StartupActions]
bAddPacks=True
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=()

23
Config/DefaultGameplayTags.ini Normal file
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="")

2
Config/DefaultInput.ini
View File

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

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

Binary file not shown.

BIN
Content/Blueprints/BP_DefaultPlayerCharacter.uasset (Stored with Git LFS)
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/DefaultClass.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Animation/Run_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_1_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/Attack1_Skeleton.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Allium/Skill4_2_Skeleton.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/알리움_리토폴로지조립_Box001_001_BaseColor.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Ability/BP_BaseAttack.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/E_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

BIN
Content/Character/Lb/Animation/Idle_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/Treasure_Dead_Anim.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

BIN
Content/Character/Lb/EskillBuff.uasset (Stored with Git LFS)
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/Material/Material__428.uasset (Stored with Git LFS)
View File

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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

Binary file not shown.

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