fix ushaderbytecode ignore issue

hxhb · hxhb · Jun 4, 2023 · Dec 1, 2022 · Dec 1, 2022 · Dec 3, 2022
commit 2d9859c527ccfe7676a94c341bb1d5b996dd50a2
diff --git a/HotPatcher/Source/HotPatcherCore/Private/CreatePatch/PatcherProxy.cpp b/HotPatcher/Source/HotPatcherCore/Private/CreatePatch/PatcherProxy.cpp
@@ -504,7 +504,7 @@ namespace PatchWorker
 			{
 				for(auto& Chunk:Context.PakChunks)
 				{
-					FString SavePath = FPaths::Combine(Context.GetSettingObject()->GetSaveAbsPath(),Context.CurrentVersion.VersionId,TEXT("Metadatas"),Chunk.ChunkName,PlatformName);
+					FString SavePath = FPaths::Combine(Context.GetSettingObject()->GetSaveAbsPath(),Context.CurrentVersion.VersionId,PlatformName,TEXT("Metadatas"),PlatformName,TEXT("Metadata/ShaderLibrarySource"));
 					TArray<FString> FoundShaderLibs = UFlibShaderCodeLibraryHelper::FindCookedShaderLibByPlatform(PlatformName,SavePath);
 
 					if(Context.PakChunks.Num())

diff --git a/...atcher/Source/HotPatcherRuntime/Private/BaseTypes/AssetManager/FAssetDependenciesInfo.cpp b/...atcher/Source/HotPatcherRuntime/Private/BaseTypes/AssetManager/FAssetDependenciesInfo.cpp
@@ -39,11 +39,11 @@ bool FAssetDependenciesInfo::HasAsset(const FString& InAssetPackageName)const
 	return bHas;
 }
 
-TArray<FAssetDetail>& FAssetDependenciesInfo::GetAssetDetails()const
+TArray<FAssetDetail> FAssetDependenciesInfo::GetAssetDetails()const
 {
 	SCOPED_NAMED_EVENT_TEXT("FAssetDependenciesInfo::GetAssetDetails",FColor::Red);
 
-	AssetDetails.Empty();
+	TArray<FAssetDetail> AssetDetails;
 	TArray<FString> Keys;
 	AssetsDependenciesMap.GetKeys(Keys);
 
@@ -94,5 +94,25 @@ TArray<FString> FAssetDependenciesInfo::GetAssetLongPackageNames()const
 
 void FAssetDependenciesInfo::RemoveAssetDetail(const FAssetDetail& AssetDetail)
 {
-	AssetDetails.Remove(AssetDetail);
+	SCOPED_NAMED_EVENT_TEXT("FAssetDependenciesInfo::RemoveAssetDetail",FColor::Red);
+	FString LongPackageName = UFlibAssetManageHelper::PackagePathToLongPackageName(AssetDetail.PackagePath.ToString());
+	RemoveAssetDetail(LongPackageName);
+}
+
+void FAssetDependenciesInfo::RemoveAssetDetail(const FString& LongPackageName)
+{
+	FString BelongModuleName = UFlibAssetManageHelper::GetAssetBelongModuleName(LongPackageName);
+	if (AssetsDependenciesMap.Contains(BelongModuleName))
+	{
+		TMap<FString,FAssetDetail>& AssetDependencyDetails = AssetsDependenciesMap.Find(BelongModuleName)->AssetDependencyDetails;
+		bool bHas = AssetDependencyDetails.Contains(LongPackageName);
+		if(bHas)
+		{
+			AssetDependencyDetails.Remove(LongPackageName);
+			if(!AssetDependencyDetails.Num())
+			{
+				AssetsDependenciesMap.Remove(BelongModuleName);
+			}
+		}
+	}
 }
diff --git a/HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/AssetManager/FAssetDependenciesInfo.h b/HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/AssetManager/FAssetDependenciesInfo.h
@@ -18,11 +18,10 @@ struct HOTPATCHERRUNTIME_API FAssetDependenciesInfo
 
 	void AddAssetsDetail(const FAssetDetail& AssetDetail);
 	bool HasAsset(const FString& InAssetPackageName)const;
-	TArray<FAssetDetail>& GetAssetDetails()const;
+	TArray<FAssetDetail> GetAssetDetails()const;
 	bool GetAssetDetailByPackageName(const FString& InAssetPackageName,FAssetDetail& OutDetail)const;
 	TArray<FString> GetAssetLongPackageNames()const;
 	void RemoveAssetDetail(const FAssetDetail& AssetDetail);
-protected:
-	mutable TArray<FAssetDetail> AssetDetails;
+	void RemoveAssetDetail(const FString& LongPackageName);
 };
 
diff --git a/HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FAssetScanConfig.h b/HotPatcher/Source/HotPatcherRuntime/Public/BaseTypes/FAssetScanConfig.h
@@ -41,7 +41,7 @@ struct HOTPATCHERRUNTIME_API FAssetScanConfig
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
 	bool bAnalysisMaterialInstance = true;
 	UPROPERTY(EditAnywhere, BlueprintReadWrite)
-	bool bSupportWorldComposition = true;
+	bool bSupportWorldComposition = false;
 
     UPROPERTY(EditAnywhere, BlueprintReadWrite)
     bool bForceSkipContent = true;

diff --git a/Mods/HotMultiCooker b/Mods/HotMultiCooker