重新导入插件

2025-05-28 11:26:34 +08:00
parent ecd25ce410
commit 69c57e3a39
261 changed files with 180 additions and 40970 deletions
--- a/Assets/Samples/Crest/5.4.2/Boats/Scenes/Boat.unity
+++ b/Assets/Samples/Crest/5.4.2/Boats/Scenes/Boat.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 9
  m_Fog: 0
  m_FogColor: {r: 0.83137256, g: 0.92941177, b: 0.93333334, a: 1}
  m_FogMode: 3
@@ -42,8 +42,8 @@ RenderSettings:
 --- !u!157 &4
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 1
+  serializedVersion: 12
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
@@ -66,6 +66,9 @@ LightmapSettings:
    m_LightmapParameters: {fileID: 0}
    m_LightmapsBakeMode: 1
    m_TextureCompression: 0
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 1024
    m_ReflectionCompression: 2
    m_MixedBakeMode: 1
    m_BakeBackend: 0
@@ -93,8 +96,9 @@ LightmapSettings:
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: a9aaa093ea2c9384a99c17e8dde45116, type: 2}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735, type: 2}
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735,
+    type: 2}
 --- !u!196 &5
 NavMeshSettings:
  serializedVersion: 2
@@ -127,47 +131,58 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1427589541763392806, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 1427589541763392806, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_Name
      value: Scene
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f, type: 3}
+    - target: {fileID: 6852310033111569586, guid: 5f56bf99bb225486c996f58f9288c20f,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
--- a/Assets/Samples/Crest/5.4.2/Boats/Scenes/Boats.unity
+++ b/Assets/Samples/Crest/5.4.2/Boats/Scenes/Boats.unity
@@ -13,7 +13,7 @@ OcclusionCullingSettings:
 --- !u!104 &2
 RenderSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 10
+  serializedVersion: 9
  m_Fog: 0
  m_FogColor: {r: 0.83137256, g: 0.92941177, b: 0.93333334, a: 1}
  m_FogMode: 3
@@ -42,8 +42,8 @@ RenderSettings:
 --- !u!157 &4
 LightmapSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 13
-  m_BakeOnSceneLoad: 1
+  serializedVersion: 12
+  m_GIWorkflowMode: 0
  m_GISettings:
    serializedVersion: 2
    m_BounceScale: 1
@@ -66,6 +66,9 @@ LightmapSettings:
    m_LightmapParameters: {fileID: 0}
    m_LightmapsBakeMode: 1
    m_TextureCompression: 0
+    m_FinalGather: 0
+    m_FinalGatherFiltering: 1
+    m_FinalGatherRayCount: 1024
    m_ReflectionCompression: 2
    m_MixedBakeMode: 1
    m_BakeBackend: 0
@@ -93,8 +96,9 @@ LightmapSettings:
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 112000000, guid: 03e5840ae8fb1e343855b182b17e5fa6, type: 2}
-  m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735, type: 2}
+  m_LightingDataAsset: {fileID: 0}
+  m_LightingSettings: {fileID: 4890085278179872738, guid: 6e72aca972f324f7886200f86939d735,
+    type: 2}
 --- !u!196 &5
 NavMeshSettings:
  serializedVersion: 2
@@ -127,47 +131,58 @@ PrefabInstance:
    serializedVersion: 3
    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 5165285943062863725, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 5165285943062863725, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_Name
      value: Scene
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalPosition.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalPosition.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalRotation.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalRotation.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalRotation.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e, type: 3}
+    - target: {fileID: 6866301169458832456, guid: e0085283eb1c64097ad21966be22734e,
+        type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
--- a/Assets/Samples/Crest/5.4.2/Boats/Scripts/PlayerControl.cs
+++ b/Assets/Samples/Crest/5.4.2/Boats/Scripts/PlayerControl.cs
@@ -102,8 +102,8 @@ namespace WaveHarmonic.Crest.Watercraft.Examples
                input.z += Keyboard.current[_DriveBackward].isPressed ? -1f : 0f;
                input.x += Keyboard.current[_SteerLeftward].isPressed ? -1f : 0f;
                input.x += Keyboard.current[_SteerRightward].isPressed ? 1f : 0f;
-                // input.y += Keyboard.current[_FloatUpward].isPressed ? 1f : 0f;
-                // input.y += Keyboard.current[_FloatDownward].isPressed ? -1f : 0f;
+                input.y += Keyboard.current[_FloatUpward].isPressed ? 1f : 0f;
+                input.y += Keyboard.current[_FloatDownward].isPressed ? -1f : 0f;
 #else
                input.z = UnityEngine.Input.GetAxis(_DriveInputAxis);
                input.x = UnityEngine.Input.GetAxis(_SteerInputAxis);
--- a/Assets/Samples/Crest/5.4.2/Boats/Scripts/WaveHarmonic.Crest.Samples.Boats.asmdef
+++ b/Assets/Samples/Crest/5.4.2/Boats/Scripts/WaveHarmonic.Crest.Samples.Boats.asmdef
@@ -3,8 +3,7 @@
    "rootNamespace": "",
    "references": [
        "GUID:75469ad4d38634e559750d17036d5f7c",
-        "GUID:7c347618730f5467f86a58f333ce21df",
-        "WaveHarmonic.Crest"
+        "GUID:7c347618730f5467f86a58f333ce21df"
    ],
    "includePlatforms": [],
    "excludePlatforms": [],