better light map

Assets/Materials/BodyP1.mat

@@ -121,8 +121,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
+    - _BaseColor: {r: 0.85, g: 0.85, b: 0.85, a: 1}
-    - _Color: {r: 0.9, g: 0.9, b: 0.9, a: 1}
+    - _Color: {r: 0.85, g: 0.85, b: 0.85, 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: []

Assets/Materials/BodyP2.mat

@@ -108,8 +108,8 @@ Material:
     - _WorkflowMode: 1
     - _ZWrite: 1
     m_Colors:
-    - _BaseColor: {r: 0.9, g: 0.9, b: 0.9, a: 1}
+    - _BaseColor: {r: 0.85, g: 0.85, b: 0.85, a: 1}
-    - _Color: {r: 0.9, g: 0.9, b: 0.9, a: 1}
+    - _Color: {r: 0.85, g: 0.85, b: 0.85, 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: []

Assets/Materials/DisplayP1.mat

@@ -58,7 +58,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 6660365cd3c564f4582541b1cf6cce84, type: 3}
+        m_Texture: {fileID: 2800000, guid: 1be2e053bc7b1e14d83c6d345916cc9a, type: 3}
         m_Scale: {x: 1, y: -1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Materials/DisplayP2.mat

@@ -58,7 +58,7 @@ Material:
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _MainTex:
-        m_Texture: {fileID: 2800000, guid: 6660365cd3c564f4582541b1cf6cce84, type: 3}
+        m_Texture: {fileID: 2800000, guid: 1be2e053bc7b1e14d83c6d345916cc9a, type: 3}
         m_Scale: {x: 1, y: -1}
         m_Offset: {x: 0, y: 0}
     - _MetallicGlossMap:

Assets/Player/XRLocal.prefab

@@ -1621,7 +1621,7 @@ Camera:
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 503
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

Assets/Player/XRNetwork.prefab

@@ -861,7 +861,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RaySwitch: 1
-  Distance: 0.35
+  Distance: 0.4
 --- !u!114 &1675997575752368890
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1435,7 +1435,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   RaySwitch: 1
-  Distance: 0.35
+  Distance: 0.4
 --- !u!114 &8197275846363546882
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1814,7 +1814,7 @@ Camera:
   m_Depth: 0
   m_CullingMask:
     serializedVersion: 2
-    m_Bits: 4294967295
+    m_Bits: 503
   m_RenderingPath: -1
   m_TargetTexture: {fileID: 0}
   m_TargetDisplay: 0

Assets/Scripts/Configs/Locker.cs

@@ -21,7 +21,7 @@ public class Locker : MonoBehaviour
     }
 
     // Update is called once per frame
-    void ToggleLocker()
+    public void ToggleLocker()
     {
         ToggleButtons();
         ToggleLocalmotion();

Assets/Scripts/Configs/NoneVRSettingManager.cs

@@ -74,11 +74,15 @@ public class NoneVRSettingManager : MonoBehaviour
                 if (!NVRCameraObj.activeSelf)
                     NVRCameraObj.SetActive(true);
                 CameraSmooth.target = NVRCameraTargetFP;
+                NVRCamera.cullingMask |= 1 << LayerMask.NameToLayer("FPSBlock"); // Enable FPBlock
+                NVRCamera.cullingMask &=  ~(1 << LayerMask.NameToLayer("TPSBlock")); // Disable TPBlock
                 break;
             case 2:
                 if (!NVRCameraObj.activeSelf)
                     NVRCameraObj.SetActive(true);
                 CameraSmooth.target = NVRCameraTargetTP;
+                NVRCamera.cullingMask |= 1 << LayerMask.NameToLayer("TPSBlock"); // Enable TPBlock
+                NVRCamera.cullingMask &=  ~(1 << LayerMask.NameToLayer("FPSBlock")); // Disable FPBlock
                 break;
         }
         JsonConfig.SetInt("NVRMode", Dropdown.value);

Assets/Scripts/IOs/RayManager.cs

@@ -6,7 +6,7 @@ using UnityEngine.XR.Interaction.Toolkit;
 public class RayManager : MonoBehaviour
 {
     public bool RaySwitch = true;
-    public float Distance = 0.3f;
+    public float Distance = 0.4f;
     XRRayInteractor interactor;
     XRInteractorLineVisual lineVisual;
     LineRenderer lineRenderer;

Assets/Settings/RayManager.preset

@@ -0,0 +1,36 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!181963792 &2655988077585873504
+Preset:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: RayManager
+  m_TargetType:
+    m_NativeTypeID: 114
+    m_ManagedTypePPtr: {fileID: 11500000, guid: c5e2ccffa6e4f0e47abb7a70c7b6b8e0,
+      type: 3}
+    m_ManagedTypeFallback: 
+  m_Properties:
+  - target: {fileID: 0}
+    propertyPath: m_Enabled
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_EditorHideFlags
+    value: 0
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: m_EditorClassIdentifier
+    value: 
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: RaySwitch
+    value: 1
+    objectReference: {fileID: 0}
+  - target: {fileID: 0}
+    propertyPath: Distance
+    value: 0.4
+    objectReference: {fileID: 0}
+  m_ExcludedProperties: []

Assets/Settings/RayManager.preset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f3b60adc16e7d3942a3564727e79844f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2655988077585873504
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/PresetManager.asset

@@ -5,6 +5,46 @@ PresetManager:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_DefaultPresets:
+  - first:
+      m_NativeTypeID: 114
+      m_ManagedTypePPtr: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927,
+        type: 3}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 2655988077585873504, guid: 0caad3af14f9a414dbdf25ed41e5aa47,
+        type: 2}
+      m_Filter: 
+      m_Disabled: 0
+  - first:
+      m_NativeTypeID: 114
+      m_ManagedTypePPtr: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791,
+        type: 3}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 2655988077585873504, guid: 2c3e7ff9ab352b74da862a5a8779b276,
+        type: 2}
+      m_Filter: 
+      m_Disabled: 0
+  - first:
+      m_NativeTypeID: 114
+      m_ManagedTypePPtr: {fileID: 11500000, guid: c5e2ccffa6e4f0e47abb7a70c7b6b8e0,
+        type: 3}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 2655988077585873504, guid: f3b60adc16e7d3942a3564727e79844f,
+        type: 2}
+      m_Filter: 
+      m_Disabled: 0
+  - first:
+      m_NativeTypeID: 114
+      m_ManagedTypePPtr: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12,
+        type: 3}
+      m_ManagedTypeFallback: 
+    second:
+    - m_Preset: {fileID: 2655988077585873504, guid: 18697d253d848974aa7052cba872c9f0,
+        type: 2}
+      m_Filter: 
+      m_Disabled: 0
   - first:
       m_NativeTypeID: 114
       m_ManagedTypePPtr: {fileID: 11500000, guid: 0bf296fc962d7184ab14ad1841598d5f,
@@ -29,33 +69,3 @@ PresetManager:
         type: 2}
       m_Filter: left
       m_Disabled: 0
-  - first:
-      m_NativeTypeID: 114
-      m_ManagedTypePPtr: {fileID: 11500000, guid: 2213c36610e3b1c4bbf886810ed9db12,
-        type: 3}
-      m_ManagedTypeFallback: 
-    second:
-    - m_Preset: {fileID: 2655988077585873504, guid: 18697d253d848974aa7052cba872c9f0,
-        type: 2}
-      m_Filter: 
-      m_Disabled: 0
-  - first:
-      m_NativeTypeID: 114
-      m_ManagedTypePPtr: {fileID: 11500000, guid: 919e39492806b334982b6b84c90dd927,
-        type: 3}
-      m_ManagedTypeFallback: 
-    second:
-    - m_Preset: {fileID: 2655988077585873504, guid: 0caad3af14f9a414dbdf25ed41e5aa47,
-        type: 2}
-      m_Filter: 
-      m_Disabled: 0
-  - first:
-      m_NativeTypeID: 114
-      m_ManagedTypePPtr: {fileID: 11500000, guid: ab68ce6587aab0146b8dabefbd806791,
-        type: 3}
-      m_ManagedTypeFallback: 
-    second:
-    - m_Preset: {fileID: 2655988077585873504, guid: 2c3e7ff9ab352b74da862a5a8779b276,
-        type: 2}
-      m_Filter: 
-      m_Disabled: 0

ProjectSettings/ProjectSettings.asset

@@ -192,6 +192,8 @@ PlayerSettings:
   - {fileID: 0}
   - {fileID: 0}
   - {fileID: 0}
+  - {fileID: 0}
+  - {fileID: 0}
   - {fileID: -6018045015233401694, guid: 3999ab811e936714280a476b3a032d86, type: 2}
   - {fileID: 6536100391545742739, guid: 55d1ec7a4296de343b6d3bb6f9a19731, type: 2}
   metroInputSource: 0

ProjectSettings/TagManager.asset

@@ -14,8 +14,8 @@ TagManager:
   - Water
   - UI
   - TPSBlock
-  - 
+  - RTLight
-  - 
+  - RTBody
   - 
   - 
   -