diff --git a/Content/Assets/Objects/Blue_Jelly/Material_001.uasset b/Content/Assets/Objects/Blue_Jelly/Material_001.uasset index a6f03fa..641aca7 100644 --- a/Content/Assets/Objects/Blue_Jelly/Material_001.uasset +++ b/Content/Assets/Objects/Blue_Jelly/Material_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4cfaa4f57bf66b81bb79bc771e9dc4a12e839f7013713c576f2cc0f0d6fec17b -size 7982 +oid sha256:0c9e918806117b72c3e34ff6dae5243b0a00f9b05c04d9bdf7f73ae2360ca76d +size 8012 diff --git a/Content/Assets/Objects/Red_Jelly/Material_001.uasset b/Content/Assets/Objects/Red_Jelly/Material_001.uasset index 19cf8df..191b68e 100644 --- a/Content/Assets/Objects/Red_Jelly/Material_001.uasset +++ b/Content/Assets/Objects/Red_Jelly/Material_001.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ed9efc59130655d42cf557ef3026512a72c7582dfd28e4088cb8e899e6ca8572 -size 7326 +oid sha256:968a044f976275650426bde61236e05e43b46fb3ac05d4ecd0e31f6c90f819b1 +size 8078 diff --git a/Content/Blueprints/Combat_UI/CombatCharacter.uasset b/Content/Blueprints/Combat_UI/CombatCharacter.uasset index 19fa2d7..3b2c174 100644 --- a/Content/Blueprints/Combat_UI/CombatCharacter.uasset +++ b/Content/Blueprints/Combat_UI/CombatCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:63ffe695a167ea9d14b24022d7317a22856fe7684815f5f46350a7a4afc9beb8 -size 72319 +oid sha256:585edb5a7d5ed873e905c5150c3d20757177b5741d22806730b54a47415d472d +size 72618 diff --git a/Content/Blueprints/Player/BP_MyTempCharacter.uasset b/Content/Blueprints/Player/BP_MyTempCharacter.uasset index f1f038b..d369a35 100644 --- a/Content/Blueprints/Player/BP_MyTempCharacter.uasset +++ b/Content/Blueprints/Player/BP_MyTempCharacter.uasset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be58819ba52b5638a31c272d4b3d2b93cfd6c75d2ad1717183b971c1c9d78234 -size 54639 +oid sha256:0954984bc9728f0b7488017e75a199b474190a8b9ff5412cc7869aece4c93b46 +size 54779 diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp index 543908c..8b2a14f 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.cpp @@ -15,6 +15,11 @@ UHoldToInitCombat::UHoldToInitCombat() static ConstructorHelpers::FClassFinder HUDWidgetClass(TEXT("/Game/Blueprints/Combat_UI/CombatInit")); InitCombatWidgetClass = HUDWidgetClass.Class; } + if (GunEffect == nullptr) + { + static ConstructorHelpers::FObjectFinder GunEffectAsset(TEXT("/Game/Blueprints/Combat_UI/NS_GunEffect")); + GunEffect = GunEffectAsset.Object; + } } diff --git a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h index c29c0ca..6ac7e3c 100644 --- a/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h +++ b/Source/the_twilight_abyss/TurnBasedCombatV2/HoldToInitCombat.h @@ -23,7 +23,7 @@ public: UPROPERTY() TSubclassOf InitCombatWidgetClass; - UPROPERTY(EditDefaultsOnly) + UPROPERTY() UNiagaraSystem* GunEffect; protected: