diff --git a/ProjectFish/Config/DefaultEngine.ini b/ProjectFish/Config/DefaultEngine.ini index 1113d63..0a10306 100644 --- a/ProjectFish/Config/DefaultEngine.ini +++ b/ProjectFish/Config/DefaultEngine.ini @@ -1,6 +1,6 @@ [/Script/EngineSettings.GameMapsSettings] GameDefaultMap=/Game/TopDown/Maps/TopDownMap.TopDownMap -EditorStartupMap=/Game/Maps/Dabaza.Dabaza +EditorStartupMap=/Game/ART/Map/fishing.fishing GlobalDefaultGameMode="/Script/ProjectFish.ProjectFishGameMode" [/Script/Engine.RendererSettings] diff --git a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset index 4f8f04f..25200c5 100644 Binary files a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset and b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset differ diff --git a/ProjectFish/Source/ProjectFish/Definations.h b/ProjectFish/Source/ProjectFish/Definations.h index 5a91593..8452d30 100644 --- a/ProjectFish/Source/ProjectFish/Definations.h +++ b/ProjectFish/Source/ProjectFish/Definations.h @@ -274,4 +274,7 @@ struct FShipDataConfig UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Camera|Collision", meta = (ForceUnits = "cm", ToolTip = "与角色的最小距离")) float CameraMinDistance = 500.0f; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Camera|Collision", meta = (ForceUnits = "cm", ToolTip = "碰撞时的相机抖动类型")) + TSubclassOf CollisionCameraShakeClass; }; diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp index 1e73780..cb96c10 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp @@ -120,6 +120,12 @@ void AShipbase::OnOverlapWall(UPrimitiveComponent* HitComp, AActor* OtherActor, { LaunchCharacter(GetCharacterMovement()->GetLastUpdateVelocity()*-1.f*ShipData.BounceFactor, true, true); + //Play Camera Shake + if (APlayerController* PC = GetController()) { + if (IsValid(ShipData.CollisionCameraShakeClass)) { + PC->PlayerCameraManager->StartCameraShake(ShipData.CollisionCameraShakeClass, 1.0f); + } + } } } diff --git a/ProjectFish/移动和镜头相关配置.docx b/ProjectFish/移动和镜头相关配置.docx index cc92a23..53ff456 100644 Binary files a/ProjectFish/移动和镜头相关配置.docx and b/ProjectFish/移动和镜头相关配置.docx differ