Fixes and improvements

aevien · May 19, 2024 · bce1345 · bce1345
1 parent 1f2d776
commit bce1345
Show file tree

Hide file tree

Showing 21 changed files with 1,102 additions and 62 deletions.
diff --git a/...terServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/LightingData.asset b/...terServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/LightingData.asset
diff --git a/...rverToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/LightingData.asset.meta b/...rverToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/LightingData.asset.meta
diff --git a/...t/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_dir.png b/...t/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_dir.png
diff --git a/...oolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_dir.png.meta b/...oolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_dir.png.meta
diff --git a/...erToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_light.exr b/...erToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_light.exr
diff --git a/...lkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_light.exr.meta b/...lkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/Lightmap-0_comp_light.exr.meta
diff --git a/...ServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/ReflectionProbe-0.exr b/...ServerToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/ReflectionProbe-0.exr
diff --git a/...rToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/ReflectionProbe-0.exr.meta b/...rToolkit/Bridges/FishNet/BasicRoomsAndLobbies/Scenes/Room/Room/ReflectionProbe-0.exr.meta
diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Materials/1m_grid.mat b/Assets/MasterServerToolkit/Bridges/Shared/Materials/1m_grid.mat
@@ -22,6 +22,8 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: 1m_grid
   m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords:
   - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
   m_InvalidKeywords: []
@@ -33,6 +35,7 @@ Material:
     RenderType: Opaque
   disabledShaderPasses:
   - MOTIONVECTORS
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -145,7 +148,7 @@ Material:
     - _ZWrite: 1
     m_Colors:
     - _BaseColor: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1}
-    - _Color: {r: 0.62264144, g: 0.62264144, b: 0.62264144, a: 1}
+    - _Color: {r: 0.6226415, g: 0.6226415, b: 0.6226415, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
   m_BuildTextureStacks: []
diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab.meta b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/Button.prefab.meta
diff --git a/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab.meta b/Assets/MasterServerToolkit/Bridges/Shared/Prefabs/UI/Components/ButtonWithIcon.prefab.meta