diff --git a/ProjectFish/Content/ART/Environment/Props/Meshes/SM_Combined_53DBAA4F.uasset b/ProjectFish/Content/ART/Environment/Props/Meshes/SM_Combined_53DBAA4F.uasset index 8d3fada..1a119af 100644 Binary files a/ProjectFish/Content/ART/Environment/Props/Meshes/SM_Combined_53DBAA4F.uasset and b/ProjectFish/Content/ART/Environment/Props/Meshes/SM_Combined_53DBAA4F.uasset differ diff --git a/ProjectFish/Content/ART/Map/fishing.umap b/ProjectFish/Content/ART/Map/fishing.umap index ef6d22a..4a7c1e5 100644 Binary files a/ProjectFish/Content/ART/Map/fishing.umap and b/ProjectFish/Content/ART/Map/fishing.umap differ diff --git a/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset b/ProjectFish/Content/Gameplay/Ship/BP_Ship.uasset index c641030..4f8f04f 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/Content/Maps/ChildLevel_Ship.umap b/ProjectFish/Content/Maps/ChildLevel_Ship.umap new file mode 100644 index 0000000..c8f7ee7 Binary files /dev/null and b/ProjectFish/Content/Maps/ChildLevel_Ship.umap differ diff --git a/ProjectFish/Content/Maps/Ship.umap b/ProjectFish/Content/Maps/Ship.umap index a2244d6..bc5bbb0 100644 Binary files a/ProjectFish/Content/Maps/Ship.umap and b/ProjectFish/Content/Maps/Ship.umap differ diff --git a/ProjectFish/Source/ProjectFish/Definations.h b/ProjectFish/Source/ProjectFish/Definations.h index b0b9ea8..5a91593 100644 --- a/ProjectFish/Source/ProjectFish/Definations.h +++ b/ProjectFish/Source/ProjectFish/Definations.h @@ -214,14 +214,17 @@ struct FShipDataConfig { GENERATED_BODY() - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体长度")) - int32 ShipLength = 100; - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体宽度")) - int32 ShipWidth = 100; - - UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体高度")) - int32 ShipHeight = 100; + // UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体长度")) + // int32 ShipLength = 100; + // + // UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体宽度")) + // int32 ShipWidth = 100; + // + // UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (ForceUnits = "cm", ToolTip = "船体高度")) + // int32 ShipHeight = 100; + + UPROPERTY(EditAnywhere, BlueprintReadWrite, Category = "Ship", meta = (FToolTip = "船体缩放")) + FVector ShipScale = FVector::One(); /*** Movement ***/ UPROPERTY(EditAnywhere, BlueprintReadWrite, meta = (ForceUnits = "cm/s", Category = "Character|Movement", ToolTip = "正常速度")) float BaseSpeed = 600.f; diff --git a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp index 8e94dd7..1e73780 100644 --- a/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp +++ b/ProjectFish/Source/ProjectFish/Gameplay/Ship/Shipbase.cpp @@ -175,8 +175,9 @@ void AShipbase::StopSprintMove() void AShipbase::ApplyShipSize() { - GetCapsuleComponent()->SetCapsuleSize(FMath::Min(ShipData.ShipHeight/2.f, 100.f), ShipData.ShipHeight/2.f); - ShipMesh->SetWorldScale3D(FVector(ShipData.ShipLength/100.f, ShipData.ShipWidth/100.f, ShipData.ShipHeight/100.f)); + // GetCapsuleComponent()->SetCapsuleSize(FMath::Min(ShipData.ShipHeight/2.f, 100.f), ShipData.ShipHeight/2.f); + // ShipMesh->SetWorldScale3D(FVector(ShipData.ShipLength/100.f, ShipData.ShipWidth/100.f, ShipData.ShipHeight/100.f)); + ShipMesh->SetWorldScale3D(ShipData.ShipScale); } void AShipbase::ApplyMovementSettings() diff --git a/ProjectFish/移动和镜头相关配置.docx b/ProjectFish/移动和镜头相关配置.docx index 36b2be4..cc92a23 100644 Binary files a/ProjectFish/移动和镜头相关配置.docx and b/ProjectFish/移动和镜头相关配置.docx differ