game(scene/goodend,lighting): low-qual bake

game(scene/town,lighting): low-qual bake
game(materials): org water
2025-02-15 15:33:11 +08:00 · 2025-02-15 15:32:57 +08:00 · 2025-02-15 15:32:17 +08:00 · 2025-02-15 15:11:02 +08:00
46 changed files with 220 additions and 40 deletions
--- a/Game/Assets/Scenes/GoodEnding.unity
+++ b/Game/Assets/Scenes/GoodEnding.unity
@ -96,7 +96,7 @@ LightmapSettings:
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000000, guid: 7d2c07a649dc1204fb36ce4c8bef7d70, type: 2}
  m_LightingSettings: {fileID: 545922260}
 --- !u!196 &4
 NavMeshSettings:
@ -38568,7 +38568,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  timeToWait: 60
-  NextScene: Start
+  nextScene: 
 --- !u!4 &224137811
 Transform:
  m_ObjectHideFlags: 0
@ -103972,8 +103972,8 @@ LightingSettings:
  m_IndirectOutputScale: 1
  m_UsingShadowmask: 0
  m_BakeBackend: 2
-  m_LightmapMaxSize: 2048
-  m_BakeResolution: 20
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 10
  m_Padding: 2
  m_LightmapCompression: 2
  m_AO: 0
@ -103996,8 +103996,8 @@ LightingSettings:
  m_PVRCulling: 1
  m_PVRSampling: 1
  m_PVRDirectSampleCount: 32
-  m_PVRSampleCount: 256
-  m_PVREnvironmentSampleCount: 256
+  m_PVRSampleCount: 128
+  m_PVREnvironmentSampleCount: 128
  m_PVREnvironmentReferencePointCount: 2048
  m_LightProbeSampleCountMultiplier: 4
  m_PVRBounces: 1
@ -201254,6 +201254,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 068fbcec103081147a0588ec72e53ee0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  playerRig: {fileID: 0}
+  startPoint: {fileID: 0}
+  waypoints: []
+  speed: 3
+  rotationSpeed: 5
+  rotationOffset: {x: 0, y: 0, z: 0}
 --- !u!65 &1033478654
 BoxCollider:
  m_ObjectHideFlags: 0
@ -230241,6 +230247,12 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 068fbcec103081147a0588ec72e53ee0, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+  playerRig: {fileID: 0}
+  startPoint: {fileID: 0}
+  waypoints: []
+  speed: 3
+  rotationSpeed: 5
+  rotationOffset: {x: 0, y: 0, z: 0}
 --- !u!65 &1180841227
 BoxCollider:
  m_ObjectHideFlags: 0
--- a/Game/Assets/Scenes/Town.unity
+++ b/Game/Assets/Scenes/Town.unity
@ -96,7 +96,7 @@ LightmapSettings:
    m_ExportTrainingData: 0
    m_TrainingDataDestination: TrainingData
    m_LightProbeSampleCountMultiplier: 4
-  m_LightingDataAsset: {fileID: 0}
+  m_LightingDataAsset: {fileID: 112000000, guid: 2707e3d6f4d8b2940a04e140ac4a7c90, type: 2}
  m_LightingSettings: {fileID: 545922260}
 --- !u!196 &4
 NavMeshSettings:
@ -101876,8 +101876,8 @@ LightingSettings:
  m_IndirectOutputScale: 1
  m_UsingShadowmask: 0
  m_BakeBackend: 2
-  m_LightmapMaxSize: 2048
-  m_BakeResolution: 20
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 10
  m_Padding: 2
  m_LightmapCompression: 2
  m_AO: 0
@ -101900,8 +101900,8 @@ LightingSettings:
  m_PVRCulling: 1
  m_PVRSampling: 1
  m_PVRDirectSampleCount: 32
-  m_PVRSampleCount: 256
-  m_PVREnvironmentSampleCount: 256
+  m_PVRSampleCount: 128
+  m_PVREnvironmentSampleCount: 128
  m_PVREnvironmentReferencePointCount: 2048
  m_LightProbeSampleCountMultiplier: 4
  m_PVRBounces: 1
--- a/Game/Assets/Scenes/Town/LightingData.asset
+++ b/Game/Assets/Scenes/Town/LightingData.asset
--- a/Game/Assets/Scenes/Town/Lightmap-0_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-0_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-0_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-0_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-0_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-0_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-0_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-0_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-1_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-1_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-1_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-1_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-1_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-1_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-1_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-1_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-2_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-2_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-2_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-2_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-2_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-2_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-2_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-2_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-3_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-3_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-3_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-3_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-3_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-3_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-3_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-3_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-4_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-4_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-4_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-4_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-4_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-4_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-4_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-4_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-5_comp_dir.png
+++ b/Game/Assets/Scenes/Town/Lightmap-5_comp_dir.png
--- a/Game/Assets/Scenes/Town/Lightmap-5_comp_dir.png.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-5_comp_dir.png.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/Lightmap-5_comp_light.exr
+++ b/Game/Assets/Scenes/Town/Lightmap-5_comp_light.exr
--- a/Game/Assets/Scenes/Town/Lightmap-5_comp_light.exr.meta
+++ b/Game/Assets/Scenes/Town/Lightmap-5_comp_light.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scenes/Town/ReflectionProbe-0.exr
+++ b/Game/Assets/Scenes/Town/ReflectionProbe-0.exr
--- a/Game/Assets/Scenes/Town/ReflectionProbe-0.exr.meta
+++ b/Game/Assets/Scenes/Town/ReflectionProbe-0.exr.meta
@ -93,6 +93,19 @@ TextureImporter:
    ignorePlatformSupport: 0
    androidETC2FallbackOverride: 0
    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
  - serializedVersion: 3
    buildTarget: Android
    maxTextureSize: 2048
--- a/Game/Assets/Scripts/HelpBox.cs
+++ b/Game/Assets/Scripts/HelpBox.cs
@ -5,6 +5,7 @@
 */
 // https://discussions.unity.com/t/helpattribute-allows-you-to-use-helpbox-in-the-unity-inspector-window/659414/22

+#if UNITY_EDITOR
 using System;
 using UnityEditor;
 using UnityEngine;
@ -17,7 +18,6 @@ public enum HelpBoxMessageType
    Error
 }

-#if UNITY_EDITOR
 public class HelpBoxAttribute : PropertyAttribute
 {
    public readonly HelpBoxMessageType MessageType;
--- a/Game/Assets/images.meta
+++ b/Game/Assets/images.meta
--- a/Game/Assets/images/Water
+++ b/Game/Assets/images/Water
--- a/Game/Assets/images/Water
+++ b/Game/Assets/images/Water
--- a/Game/Assets/images/Water.mat
+++ b/Game/Assets/images/Water.mat
--- a/Game/Assets/images/Water.mat.meta
+++ b/Game/Assets/images/Water.mat.meta
--- a/Game/Assets/images/water_0.png
+++ b/Game/Assets/images/water_0.png
--- a/Game/Assets/images/water_0.png.meta
+++ b/Game/Assets/images/water_0.png.meta
--- a/Game/Assets/images/water_1.png
+++ b/Game/Assets/images/water_1.png
--- a/Game/Assets/images/water_1.png.meta
+++ b/Game/Assets/images/water_1.png.meta
--- a/Game/Assets/images/water_2.png
+++ b/Game/Assets/images/water_2.png
--- a/Game/Assets/images/water_2.png.meta
+++ b/Game/Assets/images/water_2.png.meta
--- a/Game/Assets/images/water_3.png
+++ b/Game/Assets/images/water_3.png
--- a/Game/Assets/images/water_3.png.meta
+++ b/Game/Assets/images/water_3.png.meta
--- a/Game/Assets/images/water_4.png
+++ b/Game/Assets/images/water_4.png
--- a/Game/Assets/images/water_4.png.meta
+++ b/Game/Assets/images/water_4.png.meta
--- a/Game/ProjectSettings/ProjectSettings.asset
+++ b/Game/ProjectSettings/ProjectSettings.asset
@ -141,8 +141,7 @@ PlayerSettings:
  visionOSBundleVersion: 1.0
  tvOSBundleVersion: 1.0
  bundleVersion: 0.1
-  preloadedAssets:
-  - {fileID: -64324148185763206, guid: a9a6963505ddf7f4d886008c6dc86122, type: 2}
+  preloadedAssets: []
  metroInputSource: 0
  wsaTransparentSwapchain: 0
  m_HolographicPauseOnTrackingLoss: 1
Author	SHA1	Message	Date
Mark Joshwel	fb9f65a48a	game(scene/goodend,lighting): low-qual bake	2025-02-15 15:33:11 +08:00
Mark Joshwel	4bba6fd28d	game(scene/town,lighting): low-qual bake	2025-02-15 15:32:57 +08:00
Mark Joshwel	b769d80031	game(materials): org water	2025-02-15 15:32:17 +08:00
Mark Joshwel	51937abbc8	game(scripts,opt): include using stmts in ifdef	2025-02-15 15:11:02 +08:00