合并分支

Assets/Scripts/Core/Fort23.Core.asmdef

@@ -12,7 +12,7 @@
         "GUID:5efd170ecd8084500bed5692932fe14e",
         "GUID:a5baed0c9693541a5bd947d336ec7659",
         "GUID:3b570a5146f9d4f0fa107ed4559471a3",
-        "DownloadSystem"
+        "GUID:c03a7518d60db354c9d04ea9d1517aa1"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Scripts/GameLogic/Fort23.GameLogic.asmdef

@@ -10,9 +10,9 @@
         "GUID:fdb14afa911c65e4982db867bfd7afce",
         "GUID:d8b63aba1907145bea998dd612889d6b",
         "GUID:5efd170ecd8084500bed5692932fe14e",
-        "PotingSkd",
-        "Protocol",
-        "NetCoreBasic"
+        "GUID:097df4f93bd329c408144db3d97c0d92",
+        "GUID:8097be56b8f8a81458fa9b1971038cec",
+        "GUID:9aacf4a871662084382dfb2f67105436"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/Scripts/GameUI/Fort23.Mono.asmdef

@@ -15,7 +15,7 @@
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
         "GUID:c03a7518d60db354c9d04ea9d1517aa1",
         "GUID:097df4f93bd329c408144db3d97c0d92",
-        "Protocol"
+        "GUID:8097be56b8f8a81458fa9b1971038cec"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

Assets/xiuxian/FXV/VolumeFog/Shaders/FXVVolumeFog.shader

@@ -41,7 +41,7 @@ Shader "FXV/FXVVolumeFog"
 			#pragma multi_compile_fog
             #pragma multi_compile_instancing 
 
-			#define FXV_VOLUMEFOG_URP 
+			#define FXV_VOLUMEFOG_BUILTIN 
 
 #if defined(FXV_VOLUMEFOG_URP)
 			#include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/Core.hlsl"

Assets/xiuxian/FXV/VolumeFog/URP/Shaders/FXVVolumetricFogLitURP.shader

@@ -53,7 +53,7 @@ Shader "FXV/FXVVolumeFogLitURP"
         
         HLSLPROGRAM
 
-#define FXV_VOLUMEFOG_URP 
+#define FXV_VOLUMEFOG_BUILTIN 
 
 #if defined(FXV_VOLUMEFOG_URP)
         // Pragmas
@@ -134,7 +134,7 @@ Shader "FXV/FXVVolumeFogLitURP"
         #include "Packages/com.unity.render-pipelines.universal/ShaderLibrary/DBuffer.hlsl"
         #include "Packages/com.unity.render-pipelines.universal/Editor/ShaderGraph/Includes/ShaderPass.hlsl"
         
-        #define FXV_VOLUMEFOG_URP 
+        #define FXV_VOLUMEFOG_BUILTIN 
 
 		#include "../../Shaders/FXVVolumeFog.cginc"
 

ProjectSettings/ShaderGraphSettings.asset

@@ -2,7 +2,7 @@
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
@@ -12,6 +12,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: de02f9e1d18f588468e474319d09a723, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  shaderVariantLimit: 128
+  shaderVariantLimit: 2048
   customInterpolatorErrorThreshold: 32
   customInterpolatorWarningThreshold: 16