various upgrade bug fixes, lighting tweaks

shnok · Aug 26, 2024 · c87fa8d · c87fa8d
1 parent ab41dff
commit c87fa8d
Show file tree

Hide file tree

Showing 169 changed files with 15,507 additions and 9,469 deletions.
diff --git a/l2-unity/Assets/DefaultVolumeProfile.asset → ...sets/Rendering/DefaultVolumeProfile.asset b/l2-unity/Assets/DefaultVolumeProfile.asset → ...sets/Rendering/DefaultVolumeProfile.asset
diff --git a/...ty/Assets/DefaultVolumeProfile.asset.meta → ...Rendering/DefaultVolumeProfile.asset.meta b/...ty/Assets/DefaultVolumeProfile.asset.meta → ...Rendering/DefaultVolumeProfile.asset.meta
diff --git a/l2-unity/Assets/Rendering/URP/URP.asset b/l2-unity/Assets/Rendering/URP/URP.asset
@@ -43,7 +43,7 @@ MonoBehaviour:
   m_ProbeVolumeSHBands: 1
   m_MainLightRenderingMode: 1
   m_MainLightShadowsSupported: 1
-  m_MainLightShadowmapResolution: 4096
+  m_MainLightShadowmapResolution: 8192
   m_AdditionalLightsRenderingMode: 1
   m_AdditionalLightsPerObjectLimit: 8
   m_AdditionalLightShadowsSupported: 1

diff --git a/...ssets/Resources/WaterSystemSettings.asset → ...ssets/Rendering/WaterSystemSettings.asset b/...ssets/Resources/WaterSystemSettings.asset → ...ssets/Rendering/WaterSystemSettings.asset
diff --git a/.../Resources/WaterSystemSettings.asset.meta → .../Rendering/WaterSystemSettings.asset.meta b/.../Resources/WaterSystemSettings.asset.meta → .../Rendering/WaterSystemSettings.asset.meta
diff --git a/l2-unity/Assets/Resources/Data/Effects/Impact/Impact.prefab b/l2-unity/Assets/Resources/Data/Effects/Impact/Impact.prefab
@@ -1,5 +1,37 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3805978201995458655
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
+  m_PrefabInstance: {fileID: 4039980462332740878}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4583078573151216357}
+  - component: {fileID: 1140488337230289819}
+  m_Layer: 0
+  m_Name: 'ImpactInner (Missing Prefab with guid: abd05761f668b6e499b8be26178afbfe)'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4583078573151216357
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
+  m_PrefabInstance: {fileID: 4039980462332740878}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3805978201995458655}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.068}
+  m_LocalScale: {x: 0.5, y: 0.5, z: 0.62}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3427604146219275960}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4262902584626890470
 GameObject:
   m_ObjectHideFlags: 0
@@ -4874,6 +4906,9 @@ ParticleSystemRenderer:
   m_ReflectionProbeUsage: 0
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4974,7 +5009,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5052020062255412497}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 8cdf6cb24a686d046bd7126cf40b62e0, type: 3}
   m_Name: 
@@ -9813,6 +9848,9 @@ ParticleSystemRenderer:
   m_ReflectionProbeUsage: 0
   m_RayTracingMode: 0
   m_RayTraceProcedural: 0
+  m_RayTracingAccelStructBuildFlagsOverride: 0
+  m_RayTracingAccelStructBuildFlags: 1
+  m_SmallMeshCulling: 1
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9870,6 +9908,38 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &9056581783114850310
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
+  m_PrefabInstance: {fileID: 8173497810945613143}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8567150002145983164}
+  - component: {fileID: 6762597262882917262}
+  m_Layer: 0
+  m_Name: 'ImpactOuter (Missing Prefab with guid: abd05761f668b6e499b8be26178afbfe)'
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8567150002145983164
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
+  m_PrefabInstance: {fileID: 8173497810945613143}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9056581783114850310}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3427604146219275960}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &4039980462332740878
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -9931,7 +10001,7 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -7511558181221131132, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: 6f82e23fccf7b8641b389d7f226429ad, type: 2}
     - target: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
@@ -9946,11 +10016,6 @@ PrefabInstance:
       insertIndex: -1
       addedObject: {fileID: 1140488337230289819}
   m_SourcePrefab: {fileID: 100100000, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
---- !u!1 &3805978201995458655 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-  m_PrefabInstance: {fileID: 4039980462332740878}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &1140488337230289819
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -9963,11 +10028,6 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 5274f29e34aa3c74e889b9f1a9bb60a2, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
---- !u!4 &4583078573151216357 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-  m_PrefabInstance: {fileID: 4039980462332740878}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4068072411006105747
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -10141,7 +10201,7 @@ PrefabInstance:
       value: 0
       objectReference: {fileID: 0}
     - target: {fileID: -7511558181221131132, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-      propertyPath: m_Materials.Array.data[0]
+      propertyPath: 'm_Materials.Array.data[0]'
       value: 
       objectReference: {fileID: 2100000, guid: 18147bdbf690a4b42ac381ed7b11a064, type: 2}
     - target: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
@@ -10156,16 +10216,6 @@ PrefabInstance:
       insertIndex: -1
       addedObject: {fileID: 6762597262882917262}
   m_SourcePrefab: {fileID: 100100000, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
---- !u!4 &8567150002145983164 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-  m_PrefabInstance: {fileID: 8173497810945613143}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &9056581783114850310 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: abd05761f668b6e499b8be26178afbfe, type: 3}
-  m_PrefabInstance: {fileID: 8173497810945613143}
-  m_PrefabAsset: {fileID: 0}
 --- !u!114 &6762597262882917262
 MonoBehaviour:
   m_ObjectHideFlags: 0

diff --git a/l2-unity/Assets/Resources/Data/Effects/Impact/ImpactMeshFX.fbx b/l2-unity/Assets/Resources/Data/Effects/Impact/ImpactMeshFX.fbx
diff --git a/l2-unity/Assets/Resources/Data/Effects/Impact/ImpactMeshFX.fbx.meta b/l2-unity/Assets/Resources/Data/Effects/Impact/ImpactMeshFX.fbx.meta
diff --git a/...esources/Data/UI/Assets/SkillBar/Old.meta → ...ources/Data/Effects/Impact/Materials.meta b/...esources/Data/UI/Assets/SkillBar/Old.meta → ...ources/Data/Effects/Impact/Materials.meta