1
0
mirror of https://github.com/xiaopeng12138/MaiDXR.git synced 2024-11-24 03:50:10 +01:00

many fixs + clean code + 1p only

This commit is contained in:
xpeng 2022-03-09 20:52:38 +01:00
parent a8a923e923
commit 8ffaddf223
23 changed files with 195 additions and 278 deletions

View File

@ -9,30 +9,30 @@ LightingSettings:
m_Name: Default Light
serializedVersion: 3
m_GIWorkflowMode: 0
m_EnableBakedLightmaps: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_RealtimeEnvironmentLighting: 1
m_BounceScale: 1
m_AlbedoBoost: 1
m_IndirectOutputScale: 1
m_UsingShadowmask: 0
m_UsingShadowmask: 1
m_BakeBackend: 2
m_LightmapMaxSize: 512
m_BakeResolution: 32
m_LightmapMaxSize: 1024
m_BakeResolution: 40
m_Padding: 2
m_TextureCompression: 0
m_TextureCompression: 1
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAO: 0
m_MixedBakeMode: 0
m_MixedBakeMode: 2
m_LightmapsBakeMode: 1
m_FilterMode: 1
m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_RealtimeResolution: 1
m_RealtimeResolution: 2
m_ForceWhiteAlbedo: 0
m_ForceUpdates: 0
m_FinalGather: 0
@ -41,16 +41,16 @@ LightingSettings:
m_PVRCulling: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 256
m_PVRSampleCount: 512
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_LightProbeSampleCountMultiplier: 4
m_PVRBounces: 2
m_PVRMinBounces: 2
m_PVREnvironmentMIS: 0
m_PVRFilteringMode: 2
m_PVRDenoiserTypeDirect: 0
m_PVRDenoiserTypeIndirect: 0
m_PVRMinBounces: 1
m_PVREnvironmentMIS: 1
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0

View File

@ -8,7 +8,7 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Display
m_Shader: {fileID: 10752, guid: 0000000000000000f000000000000000, type: 0}
m_Shader: {fileID: 4800000, guid: 6661b5a6c9b5f6e45ae07f0fa22876e2, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
@ -76,6 +76,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.38058165, g: 0.38058165, b: 0.38058165, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -98,7 +98,7 @@ LightmapSettings:
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 112000000, guid: d2a6251f24f8e024a9e5c6022e304ca2, type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: 75c98e81cc3d87a48b251897c335e34f, type: 2}
m_LightingSettings: {fileID: 4890085278179872738, guid: c0bf714a9d1f86d4bbb19823c70c84c6, type: 2}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
@ -191,7 +191,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &141732346
Transform:
@ -253,7 +253,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &281366680
Transform:
@ -379,7 +379,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &366364278
MonoBehaviour:
@ -468,7 +468,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &367081678
Transform:
@ -533,7 +533,7 @@ GameObject:
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &371544748
Transform:
@ -849,7 +849,7 @@ Light:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
@ -2221,6 +2221,18 @@ PrefabInstance:
propertyPath: m_StaticEditorFlags
value: 4294967295
objectReference: {fileID: 0}
- target: {fileID: 4484653850034527598, guid: ea6463ca199d52046962b69f2ab654ef, type: 3}
propertyPath: m_CastShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4484653850034527598, guid: ea6463ca199d52046962b69f2ab654ef, type: 3}
propertyPath: m_ReceiveShadows
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4484653850034527598, guid: ea6463ca199d52046962b69f2ab654ef, type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: 1ebb28175c99f574d895870a01e00d21, type: 2}
- target: {fileID: 4719247144152206612, guid: ea6463ca199d52046962b69f2ab654ef, type: 3}
propertyPath: m_StaticEditorFlags
value: 4294967295
@ -4374,7 +4386,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c8ef9c214e7bbfb428a17f25d6f8a44c, type: 3}
m_Name:
m_EditorClassIdentifier:
Hand: 3
Hand: 5
duration: 0.07
amplitude: 1
--- !u!1 &1040369113
@ -4588,7 +4600,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c8ef9c214e7bbfb428a17f25d6f8a44c, type: 3}
m_Name:
m_EditorClassIdentifier:
Hand: 2
Hand: 4
duration: 0.07
amplitude: 1
--- !u!108 &1270549371 stripped
@ -4664,7 +4676,7 @@ Light:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
@ -4819,6 +4831,7 @@ MonoBehaviour:
LHandObj: {fileID: 1213452594}
RHandObj: {fileID: 995594085}
ScreenObj: {fileID: 856927129}
ScreenMaterial: {fileID: 2100000, guid: 1ebb28175c99f574d895870a01e00d21, type: 2}
SmoothCameraObj: {fileID: 366364277}
SmoothCamera: {fileID: 366364279}
XROriginObj: {fileID: 1647048262}
@ -4867,7 +4880,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1647048263
MonoBehaviour:
@ -5013,7 +5026,6 @@ MonoBehaviour:
- {fileID: 852770257}
BodyLight: {fileID: 1297605544}
DisplayLight: {fileID: 740743304}
LightIntensity: 2
--- !u!4 &1700545202
Transform:
m_ObjectHideFlags: 0
@ -5048,7 +5060,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 4294967295
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1900118869
MonoBehaviour:
@ -5081,3 +5093,67 @@ Light:
m_CorrespondingSourceObject: {fileID: 6449048586731311642, guid: ea6463ca199d52046962b69f2ab654ef, type: 3}
m_PrefabInstance: {fileID: 856927026}
m_PrefabAsset: {fileID: 0}
--- !u!1 &2022931820
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2022931822}
- component: {fileID: 2022931821}
m_Layer: 0
m_Name: Reflection Probe
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!215 &2022931821
ReflectionProbe:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022931820}
m_Enabled: 1
serializedVersion: 2
m_Type: 0
m_Mode: 0
m_RefreshMode: 0
m_TimeSlicingMode: 0
m_Resolution: 128
m_UpdateFrequency: 0
m_BoxSize: {x: 10, y: 10, z: 10}
m_BoxOffset: {x: 0, y: 0, z: 0}
m_NearClip: 0.3
m_FarClip: 1000
m_ShadowDistance: 100
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_IntensityMultiplier: 1
m_BlendDistance: 1
m_HDR: 1
m_BoxProjection: 0
m_RenderDynamicObjects: 0
m_UseOcclusionCulling: 1
m_Importance: 1
m_CustomBakedTexture: {fileID: 0}
--- !u!4 &2022931822
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2022931820}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.373, y: 1.184, z: 0.043}
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

After

Width:  |  Height:  |  Size: 102 KiB

View File

@ -10,10 +10,6 @@ public class ButtonToKey : MonoBehaviour
static extern void keybd_event(byte bVk, byte bScan, uint dwFlags, UIntPtr dwExtraInfo);
public VirtualKeyCode keyToPress;
void Start()
{
}
private void OnTriggerEnter(Collider other)
{
keybd_event(System.Convert.ToByte(keyToPress), (byte)MapVirtualKey((uint)keyToPress, 0), 0, UIntPtr.Zero);

View File

@ -5,7 +5,7 @@ public class CameraSmooth : MonoBehaviour {
public Transform target;
public float smoothSpeed = 0.125f;
public Vector3 PositionOffset;
void FixedUpdate ()
void Update ()
{
transform.position = Vector3.Lerp(transform.position, target.position + PositionOffset, smoothSpeed);
transform.rotation = Quaternion.Lerp(transform.rotation, target.rotation, smoothSpeed);

View File

@ -5,61 +5,18 @@ using UnityEngine.XR;
public class Controller : MonoBehaviour
{
// Start is called before the first frame update
public InputDeviceRole Hand;
//InputDevice device;
public XRNode Hand;
InputDevice device;
public float duration;
public float amplitude;
void Start()
{
}
// Update is called once per frame
void Update()
{
}
private void OnTriggerEnter(Collider other)
{
SendHapticOn(Hand, amplitude, duration);
device = InputDevices.GetDeviceAtXRNode(Hand);
device.SendHapticImpulse(0, amplitude, duration);
}
private void OnTriggerExit(Collider other)
{
SendHapticOn(Hand, amplitude, duration);
SendHapticOff(Hand);
}
void SendHapticOn(InputDeviceRole Hand, float amplitude, float duration)
{
List<UnityEngine.XR.InputDevice> devices = new List<UnityEngine.XR.InputDevice>();
InputDevices.GetDevicesWithRole(Hand, devices);
uint channel = 0;
foreach (var device in devices)
{
HapticCapabilities capabilities;
if (device.TryGetHapticCapabilities(out capabilities))
{
if (capabilities.supportsImpulse)
{
device.SendHapticImpulse(channel, amplitude, duration);
}
}
}
}
void SendHapticOff(InputDeviceRole Hand)
{
List<UnityEngine.XR.InputDevice> devices = new List<UnityEngine.XR.InputDevice>();
InputDevices.GetDevicesWithRole(Hand, devices);
foreach (var device in devices)
{
HapticCapabilities capabilities;
if (device.TryGetHapticCapabilities(out capabilities))
{
if (capabilities.supportsImpulse)
device.StopHaptics();
}
}
device = InputDevices.GetDeviceAtXRNode(Hand);
device.StopHaptics();
}
}

View File

@ -15,36 +15,18 @@ public class LedSerial : MonoBehaviour
public Light[] Lights;
public Light BodyLight;
public Light DisplayLight;
public float LightIntensity = 3f;
Color32 PrevFadeColor;
Color32 nowCorlor;
void Start()
{
Debug.Log("Started LED Serial");
p1Serial.Open();
Debug.Log("LED Serial Started");
}
void Update()
{
//ReadPack();
ReadData();
UpdateLED();
//FixLedPower();
}
void ReadPack()
{
ReadData();
Debug.Log("RX: "+dataPacket[0]+"-"+
dataPacket[1]+"-"+
dataPacket[2]+"-"+
dataPacket[3]+"-"+
dataPacket[4]+"-"+
dataPacket[5]+"-"+
dataPacket[6]+"-"+
dataPacket[7]+"-"+
dataPacket[8]+"-"+
dataPacket[9]+"-"+
dataPacket[10]);
}
void ReadData()
{
@ -59,8 +41,7 @@ public class LedSerial : MonoBehaviour
return;
}
incomPacket.Add(recivData);
}
}
}
void UpdateLED()
@ -90,20 +71,19 @@ public class LedSerial : MonoBehaviour
case 57:
BodyLight.color = new Color32(dataPacket[5], dataPacket[5], dataPacket[5], 255);
DisplayLight.color = new Color32(dataPacket[6], dataPacket[6], dataPacket[6], 255);
dataPacket.Clear();
break;
}
}
IEnumerator Fade(byte start, byte end, Light[] Lights, Color32 prevColor, Color32 nowColor, float duration)
{
duration = 4095 / duration * 8 / 1000;
//Debug.Log(duration);
for (float time = 0f; time < duration; time += Time.deltaTime)
{
float progress = time / duration;
for (int i = start; i < end; i++)
{
Lights[i].color = Color.Lerp(prevColor, nowColor, progress);
//yield return null;
}
yield return null;
}
@ -115,11 +95,4 @@ public class LedSerial : MonoBehaviour
Lights[i].color = Color;
}
}
void FixLedPower()
{
for (int i = 0; i < 8; i++)
{
Lights[i].intensity = LightIntensity / (Lights[i].color.r / 2 + Lights[i].color.g / 2 + Lights[i].color.b / 2 + 0.1f) ;
}
}
}

View File

@ -1,7 +1,7 @@
using System.Collections;
using UnityEngine;
using System.IO.Ports;
using System;
using System.Collections;
public class Serial : MonoBehaviour
{
static SerialPort p1Serial = new SerialPort ("COM5", 9600);
@ -20,24 +20,19 @@ public class Serial : MonoBehaviour
settingPacket[5] = 41;
touchPacket[0] = 40;
touchPacket[8] = 41;
Debug.Log("Start Serial1");
p1Serial.Open();
Debug.Log("Serial Started");
Debug.Log("Serial1 Started");
}
void Update()
{
ReadPack();
ReadData();
if (!failed)
TouchSetUp();
SendTouch();
}
void FixedUpdate()
{
}
private void TouchSetUp()
void TouchSetUp()
{
switch (incomPacket[3])
{
@ -58,7 +53,7 @@ public class Serial : MonoBehaviour
}
}
private void ReadPack()
void ReadData()
{
timer = 0f;
if (p1Serial.BytesToRead == 6)
@ -75,7 +70,7 @@ public class Serial : MonoBehaviour
if(timer > 20f){ failed = true; break; }
timer += Time.deltaTime;
}
}
}
}
public static void SendTouch()
@ -86,7 +81,7 @@ public class Serial : MonoBehaviour
public static void ChangeTouch(int Area, bool State)
{
ByteArrayExt.SetBit(touchPacket, Area+8, State);
ByteArrayExt.SetBit(touchPacket, Area+8, State);
}
}

View File

@ -1,4 +1,3 @@
using System.Collections;
using UnityEngine;
using System.IO.Ports;
using System;
@ -19,6 +18,7 @@ public class Serial2 : MonoBehaviour
settingPacket[5] = 41;
touchPacket[0] = 40;
touchPacket[8] = 41;
Debug.Log("Start Serial2");
p1Serial.Open();
Debug.Log("Serial2 Started");
}
@ -29,10 +29,6 @@ public class Serial2 : MonoBehaviour
if (!failed)
TouchSetUp();
}
void FixedUpdate()
{
//SendTouch(); //Not send touch to p2 port
}
private void TouchSetUp()
{
@ -74,16 +70,4 @@ public class Serial2 : MonoBehaviour
}
}
}
static void SendTouch()
{
if (startUp)
p1Serial.Write(touchPacket, 0, 9);
}
static void ChangeTouch(int Area, bool State)
{
if (startUp)
ByteArrayExt.SetBit(touchPacket, Area+8, State);
}
}

View File

@ -14,18 +14,18 @@ public class SettingsManager : MonoBehaviour
public GameObject LHandObj;
public GameObject RHandObj;
public GameObject ScreenObj;
public Material ScreenMaterial;
public GameObject SmoothCameraObj;
public Camera SmoothCamera;
public GameObject XROriginObj;
public GameObject[] ButtonObjs;
public GameObject SelectButton;
public GameObject HeadCube;
void Start()
private void Awake()
{
FirstStart();
UpdateFromFile();
}
void Update()
{
if (Input.GetKeyDown(KeyCode.F5) | !FocusChecked)
@ -36,7 +36,6 @@ public class SettingsManager : MonoBehaviour
JsonStr = File.ReadAllText(JsonPath);
Setting = JsonConvert.DeserializeObject<Settings>(JsonStr);
UpdateFromFile();
Debug.Log("Setting Updated");
}
}
if (!Application.isFocused)
@ -52,6 +51,7 @@ public class SettingsManager : MonoBehaviour
XROriginScp.CameraYOffset = Setting.PlayerHigh;
UwcWindowTexture ScreenScp = ScreenObj.GetComponent<UwcWindowTexture>();
ScreenScp.captureFrameRate = Setting.CaptureFrameRate;
ScreenMaterial.SetTextureScale("_MainTex",new Vector2(Setting.Capture1PlayerOnly ? 1f : 0.5f, 1));
CameraSmooth CameraSmoothScp = SmoothCameraObj.GetComponent<CameraSmooth>();
CameraSmoothScp.smoothSpeed = Setting.CameraSmooth;
SmoothCamera.fieldOfView = Setting.CameraFOV;
@ -74,10 +74,13 @@ public class SettingsManager : MonoBehaviour
Button3Scp.keyToPress = (VirtualKeyCode)Enum.Parse(typeof(VirtualKeyCode), Setting.Button3);
ButtonToKey Button4Scp = ButtonObjs[3].GetComponent<ButtonToKey>();
Button4Scp.keyToPress = (VirtualKeyCode)Enum.Parse(typeof(VirtualKeyCode), Setting.Button4);
Debug.Log("Setting Updated");
}
void FirstStart()
{
Debug.Log("FirstStart");
Debug.Log("Append Setting File");
JsonPath = Path.GetDirectoryName(Application.dataPath) + "/Settings.json";
Debug.Log(JsonPath);
if (!File.Exists (JsonPath))
@ -88,6 +91,7 @@ public class SettingsManager : MonoBehaviour
HandPosition = new float[3]{2f, -2f, 7f},
PlayerHigh = 180f,
CaptureFrameRate = 90,
Capture1PlayerOnly = false,
TouchRefreshRate = 120,
CameraSmooth = 0.05f,
CameraFOV = 80f,
@ -104,12 +108,12 @@ public class SettingsManager : MonoBehaviour
JsonStr = JsonConvert.SerializeObject(Setting, Formatting.Indented);
Debug.Log(JsonStr);
File.AppendAllText(JsonPath, JsonStr);
Debug.Log("Setting FileAppended");
}
else
{
Debug.Log("Read Setting File");
JsonStr = File.ReadAllText(JsonPath);
Setting = JsonConvert.DeserializeObject<Settings>(JsonStr);
}
Debug.Log("Setting File Readed");
}
}
@ -119,6 +123,7 @@ public class Settings
public float[] HandPosition { get; set; }
public float PlayerHigh { get; set; }
public int CaptureFrameRate { get; set; }
public bool Capture1PlayerOnly { get; set; }
public float TouchRefreshRate { get; set; }
public float CameraSmooth { get; set; }
public float CameraFOV { get; set; }

View File

@ -4,7 +4,7 @@ MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
executionOrder: -50
icon: {instanceID: 0}
userData:
assetBundleName:

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.XR.Interaction.Toolkit;

View File

@ -1,22 +1,7 @@
using System;
using System.Runtime.InteropServices;
using System.Collections;
using UnityEngine;
public class TouchToSerial : MonoBehaviour
{
// Start is called before the first frame update
void Start()
{
}
// Update is called once per frame
void Update()
{
//Serial.SendTouch();
}
public int Area;
private void OnTriggerEnter(Collider other)
{

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: uWC_Unlit
m_Shader: {fileID: 4800000, guid: 6661b5a6c9b5f6e45ae07f0fa22876e2, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON _EMISSION
m_ShaderKeywords: UWC_FLIP_Y _ALPHAPREMULTIPLY_ON _EMISSION
m_LightmapFlags: 1
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
@ -41,7 +41,7 @@ Material:
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Scale: {x: 0.5, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
@ -55,7 +55,6 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _Bend: 0
- _BlendDst: 10
@ -67,7 +66,7 @@ Material:
- _DetailNormalMapScale: 1
- _DstBlend: 10
- _FlipX: 0
- _FlipY: 0
- _FlipY: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1

View File

@ -1,18 +1,16 @@
{
"dependencies": {
"com.unity.collab-proxy": "1.15.12",
"com.unity.collab-proxy": "1.15.13",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.14",
"com.unity.ide.vscode": "1.2.4",
"com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "2.0.2",
"com.unity.test-framework": "1.1.30",
"com.unity.test-framework": "1.1.31",
"com.unity.textmeshpro": "3.0.6",
"com.unity.timeline": "1.4.8",
"com.unity.ugui": "1.0.0",
"com.unity.xr.interaction.toolkit": "2.0.0-pre.7",
"com.unity.xr.interaction.toolkit": "2.0.1",
"com.unity.xr.management": "4.2.1",
"com.unity.xr.mock-hmd": "1.3.0-preview.1",
"com.unity.xr.oculus": "1.11.2",
"com.unity.xr.openxr": "1.3.1",
"com.unity.modules.ai": "1.0.0",
"com.unity.modules.androidjni": "1.0.0",

View File

@ -1,7 +1,7 @@
{
"dependencies": {
"com.unity.collab-proxy": {
"version": "1.15.12",
"version": "1.15.13",
"depth": 0,
"source": "registry",
"dependencies": {
@ -35,7 +35,7 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.4",
"version": "1.2.5",
"depth": 0,
"source": "registry",
"dependencies": {},
@ -74,7 +74,7 @@
"url": "https://packages.unity.com"
},
"com.unity.test-framework": {
"version": "1.1.30",
"version": "1.1.31",
"depth": 0,
"source": "registry",
"dependencies": {
@ -115,7 +115,7 @@
}
},
"com.unity.xr.core-utils": {
"version": "2.0.0-pre.6",
"version": "2.0.0",
"depth": 1,
"source": "registry",
"dependencies": {
@ -124,13 +124,13 @@
"url": "https://packages.unity.com"
},
"com.unity.xr.interaction.toolkit": {
"version": "2.0.0-pre.7",
"version": "2.0.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.inputsystem": "1.2.0",
"com.unity.ugui": "1.0.0",
"com.unity.xr.core-utils": "2.0.0-pre.6",
"com.unity.xr.core-utils": "2.0.0",
"com.unity.xr.legacyinputhelpers": "2.1.8",
"com.unity.modules.audio": "1.0.0",
"com.unity.modules.imgui": "1.0.0",
@ -161,25 +161,6 @@
},
"url": "https://packages.unity.com"
},
"com.unity.xr.mock-hmd": {
"version": "1.3.0-preview.1",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.0.1"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.oculus": {
"version": "1.11.2",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.xr.management": "4.2.0",
"com.unity.ugui": "1.0.0"
},
"url": "https://packages.unity.com"
},
"com.unity.xr.openxr": {
"version": "1.3.1",
"depth": 0,

View File

@ -28,6 +28,7 @@ GraphicsSettings:
m_LensFlare:
m_Mode: 1
m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
m_VideoShadersIncludeMode: 2
m_AlwaysIncludedShaders:
- {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@ -36,8 +37,7 @@ GraphicsSettings:
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_CustomRenderPipeline: {fileID: 0}
m_TransparencySortMode: 0
m_TransparencySortAxis: {x: 0, y: 0, z: 1}
@ -59,5 +59,5 @@ GraphicsSettings:
m_AlbedoSwatchInfos: []
m_LightsUseLinearIntensity: 0
m_LightsUseColorTemperature: 0
m_DefaultRenderingLayerMask: 1
m_LogWhenShaderIsCompiled: 0
m_AllowEnlightenSupportForUpgradedProject: 0

View File

@ -47,7 +47,7 @@ PlayerSettings:
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_ActiveColorSpace: 1
m_MTRendering: 1
mipStripping: 0
numberOfMipsStripped: 0
@ -85,9 +85,9 @@ PlayerSettings:
hideHomeButton: 0
submitAnalytics: 1
usePlayerLog: 1
bakeCollisionMeshes: 0
forceSingleInstance: 0
useFlipModelSwapchain: 1
bakeCollisionMeshes: 1
forceSingleInstance: 1
useFlipModelSwapchain: 0
resizableWindow: 1
useMacAppStoreValidation: 0
macAppStoreCategory: public.app-category.games
@ -183,6 +183,7 @@ PlayerSettings:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
@ -349,7 +350,7 @@ PlayerSettings:
- m_BuildTarget: iOSSupport
m_GraphicsJobs: 0
- m_BuildTarget: WindowsStandaloneSupport
m_GraphicsJobs: 0
m_GraphicsJobs: 1
- m_BuildTarget: XboxOnePlayer
m_GraphicsJobs: 1
- m_BuildTarget: LuminSupport
@ -384,7 +385,7 @@ PlayerSettings:
m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport
m_APIs: 0200000015000000
m_Automatic: 0
m_Automatic: 1
m_BuildTargetVRSettings:
- m_BuildTarget: Standalone
m_Enabled: 0
@ -401,8 +402,11 @@ PlayerSettings:
tvOS: 1
m_BuildTargetGroupLightmapEncodingQuality:
- m_BuildTarget: Standalone
m_EncodingQuality: 0
m_BuildTargetGroupLightmapSettings: []
m_EncodingQuality: 1
m_BuildTargetGroupLightmapSettings:
- m_BuildTarget: Standalone
m_TextureStreamingEnabled: 0
m_TextureStreamingPriority: 0
m_BuildTargetNormalMapEncoding: []
playModeTestRunnerEnabled: 0
runPlayModeTestAsEditModeTest: 0

View File

@ -4,7 +4,7 @@
QualitySettings:
m_ObjectHideFlags: 0
serializedVersion: 5
m_CurrentQuality: 6
m_CurrentQuality: 0
m_QualitySettings:
- serializedVersion: 2
name: Very Low
@ -80,26 +80,26 @@ QualitySettings:
excludedTargetPlatforms: []
- serializedVersion: 2
name: Medium
pixelLightCount: 3
shadows: 0
pixelLightCount: 1
shadows: 1
shadowResolution: 0
shadowProjection: 1
shadowCascades: 1
shadowDistance: 0
shadowNearPlaneOffset: 0
shadowDistance: 20
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
skinWeights: 1
textureQuality: 1
skinWeights: 2
textureQuality: 0
anisotropicTextures: 1
antiAliasing: 0
softParticles: 0
softVegetation: 0
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 1
vSyncCount: 0
lodBias: 2
billboardsFaceCameraPosition: 0
vSyncCount: 1
lodBias: 0.7
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
@ -107,7 +107,7 @@ QualitySettings:
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 4096
particleRaycastBudget: 64
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
@ -116,7 +116,7 @@ QualitySettings:
excludedTargetPlatforms: []
- serializedVersion: 2
name: High
pixelLightCount: 12
pixelLightCount: 2
shadows: 2
shadowResolution: 1
shadowProjection: 1
@ -152,24 +152,24 @@ QualitySettings:
excludedTargetPlatforms: []
- serializedVersion: 2
name: Very High
pixelLightCount: 12
shadows: 0
shadowResolution: 0
pixelLightCount: 3
shadows: 2
shadowResolution: 2
shadowProjection: 1
shadowCascades: 1
shadowDistance: 50
shadowCascades: 2
shadowDistance: 70
shadowNearPlaneOffset: 3
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 2
skinWeights: 4
textureQuality: 0
anisotropicTextures: 2
antiAliasing: 0
softParticles: 0
antiAliasing: 2
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 0
realtimeReflectionProbes: 1
billboardsFaceCameraPosition: 1
vSyncCount: 1
lodBias: 1.5
maximumLODLevel: 0
@ -188,9 +188,9 @@ QualitySettings:
excludedTargetPlatforms: []
- serializedVersion: 2
name: Ultra
pixelLightCount: 12
pixelLightCount: 4
shadows: 2
shadowResolution: 3
shadowResolution: 2
shadowProjection: 1
shadowCascades: 4
shadowDistance: 150
@ -198,11 +198,11 @@ QualitySettings:
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 1
skinWeights: 4
skinWeights: 255
textureQuality: 0
anisotropicTextures: 2
antiAliasing: 4
softParticles: 0
antiAliasing: 2
softParticles: 1
softVegetation: 1
realtimeReflectionProbes: 1
billboardsFaceCameraPosition: 1
@ -222,51 +222,17 @@ QualitySettings:
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
- serializedVersion: 2
name: VR
pixelLightCount: 3
shadows: 0
shadowResolution: 0
shadowProjection: 1
shadowCascades: 1
shadowDistance: 0
shadowNearPlaneOffset: 0
shadowCascade2Split: 0.33333334
shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667}
shadowmaskMode: 0
skinWeights: 1
textureQuality: 1
anisotropicTextures: 0
antiAliasing: 0
softParticles: 0
softVegetation: 1
realtimeReflectionProbes: 0
billboardsFaceCameraPosition: 1
vSyncCount: 0
lodBias: 2
maximumLODLevel: 0
streamingMipmapsActive: 0
streamingMipmapsAddAllCameras: 1
streamingMipmapsMemoryBudget: 512
streamingMipmapsRenderersPerFrame: 512
streamingMipmapsMaxLevelReduction: 2
streamingMipmapsMaxFileIORequests: 1024
particleRaycastBudget: 4096
asyncUploadTimeSlice: 2
asyncUploadBufferSize: 16
asyncUploadPersistentBuffer: 1
resolutionScalingFixedDPIFactor: 1
customRenderPipeline: {fileID: 0}
excludedTargetPlatforms: []
m_PerPlatformDefaultQuality:
Android: 2
CloudRendering: 5
GameCoreScarlett: 5
GameCoreXboxOne: 5
Lumin: 5
Nintendo 3DS: 5
Nintendo Switch: 5
PS4: 5
PSP2: 2
PS5: 5
Stadia: 5
Standalone: 6
Standalone: 5
WebGL: 3
Windows Store Apps: 5
XboxOne: 5