testing git

Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs

@@ -242,15 +242,7 @@ namespace FishNet.Discovery
 			//
 			// 	return;
 			// }
-<<<<<<< HEAD
-<<<<<<< HEAD
 			Debug.Log("NetworkDiscovery is searching");
-=======
-			// Debug.Log("NetworkDiscovery is searching on port " + port);
->>>>>>> master
-=======
-			// Debug.Log("NetworkDiscovery is searching on port " + port);
->>>>>>> master
 
 			if (InstanceFinder.IsClient)
 			{

Assets/Prefabs.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Prefabs.meta
 guid: f5d758e3acccf474babdbe217a2702ba
-========
-guid: b75b31ee55930864c993630f33293a65
->>>>>>>> master:Assets/_PROJECT/Components/Bolt.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/Scripts.meta

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Scripts.meta
 guid: 8f19a044f4ee30042a6ad8c58d595f40
-========
-guid: d130522c3b40916429cacacf79ffbc9b
->>>>>>>> master:Assets/_PROJECT/Components/Bolt/Intercation Logic.meta
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

Assets/_PROJECT/Components/Bolt/Intercation Logic/Car Driving Routine.cs

@@ -1,12 +1,8 @@
 using System.Collections;
 using System.Collections.Generic;
-<<<<<<< HEAD
 using Unity.XR.CoreUtils;
 using UnityEngine;
 using static MouseLook;
-=======
-using UnityEngine;
->>>>>>> master
 
 public class CarDrivingRoutine : MonoBehaviour
 {
@@ -14,7 +10,6 @@ public class CarDrivingRoutine : MonoBehaviour
     public AudioSource _tireSound;
     public Waypoint _waypoint;
 
-<<<<<<< HEAD
     public float StraightSpeed = 5f; // Movement speed
     public float rotationSpeed = 5f; // Rotation speed
     public float waypointProximityThreshold = 0.5f; // Distance to consider "close enough" to a waypoint
@@ -33,29 +28,16 @@ public class CarDrivingRoutine : MonoBehaviour
         targetSpeed = StraightSpeed;
         targetRotationSpeed = rotationSpeed;
     }
-=======
-    public float speed = 5f; // Movement speed
-    public float rotationSpeed = 5f; // Rotation speed
-    public float waypointProximityThreshold = 0.5f; // Distance to consider "close enough" to a waypoint
->>>>>>> master
 
     // Update is called once per frame
     void Update()
     {
-<<<<<<< HEAD
         //if (hasPedestrianInFront) return;
         if (_waypoint == null) return; // Just in case.
 
         // Move towards the waypoint
         Vector3 targetPosition = _waypoint.transform.position;
         float step = StraightSpeed * Time.deltaTime;
-=======
-        if (_waypoint == null) return;
-
-        // Move towards the waypoint
-        Vector3 targetPosition = _waypoint.transform.position;
-        float step = speed * Time.deltaTime;
->>>>>>> master
         transform.position = Vector3.MoveTowards(transform.position, targetPosition, step);
 
         // Rotate towards the desired rotation
@@ -63,7 +45,6 @@ public class CarDrivingRoutine : MonoBehaviour
         Quaternion desiredRotation = Quaternion.Euler(0, targetRotation, 0);
         transform.rotation = Quaternion.RotateTowards(transform.rotation, desiredRotation, rotationSpeed * Time.deltaTime);
 
-<<<<<<< HEAD
         rollTires(); // Just an aesthetic improvement.
 
         if (Quaternion.Angle(transform.rotation, desiredRotation) > 1f) // If the car is turning.
@@ -85,15 +66,12 @@ public class CarDrivingRoutine : MonoBehaviour
             isTurning = false;
         }
 
-=======
->>>>>>> master
         // Check if close enough to the waypoint
         if (Vector3.Distance(transform.position, targetPosition) <= waypointProximityThreshold &&
             Quaternion.Angle(transform.rotation, desiredRotation) <= 1f)
         {
             // Proceed to the next waypoint
             _waypoint = _waypoint.Next;
-<<<<<<< HEAD
         }
     }
 
@@ -160,18 +138,4 @@ public class CarDrivingRoutine : MonoBehaviour
         StraightSpeed = targetStraightSpeed;
         rotationSpeed = targetRotationSpeed;
     }
-=======
-            if (_waypoint == null)
-            {
-                // Optional: Play stop sound when no more waypoints
-                _stopSound?.Play();
-            }
-            else
-            {
-                // Optional: Play tire sound when moving to the next waypoint
-                _tireSound?.Play();
-            }
-        }
-    }
->>>>>>> master
 }

Assets/_PROJECT/Components/Server room/ESCI logo.png.meta

@@ -0,0 +1,124 @@
+fileFormatVersion: 2
+guid: 8dabd2953ad06ea4aa9a32ddbbcb3f55
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Components/Server room/NEIC logo.png.meta

@@ -0,0 +1,124 @@
+fileFormatVersion: 2
+guid: d0401fab87dd68e43b99de125c73a92c
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 12
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 0
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1088cebab9f6eed4caae1f5b467d5dc0
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat

@@ -0,0 +1,47 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-1149658507752770212
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: card reader Variant
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: -3846018093981099296, guid: 248e38dcb931fa345a11dbf79e87036f,
+    type: 3}
+  m_ModifiedSerializedProperties: 2
+  m_ValidKeywords:
+  - _EMISSION
+  m_InvalidKeywords: []
+  m_LightmapFlags: 1
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs: []
+    m_Ints: []
+    m_Floats: []
+    m_Colors:
+    - _Color: {r: 0.11653974, g: 0.90640265, b: 0, a: 1}
+    - _EmissionColor: {r: 0, g: 0.9622642, b: 0.019420544, a: 0}
+  m_BuildTextureStacks: []

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1651b07f5fc2a75489b45b8f88e94b21
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab

@@ -0,0 +1,110 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &2649928896600594590
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: -1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.029999992
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.029999992
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.029999992
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.653
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.3878
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0.1934
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 90
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -3542852092398272455, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.21
+      objectReference: {fileID: 0}
+    - target: {fileID: -3542852092398272455, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.61
+      objectReference: {fileID: 0}
+    - target: {fileID: -678588488315902003, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 1651b07f5fc2a75489b45b8f88e94b21, type: 2}
+    - target: {fileID: 919132149155446097, guid: 248e38dcb931fa345a11dbf79e87036f,
+        type: 3}
+      propertyPath: m_Name
+      value: card reader Variant
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 248e38dcb931fa345a11dbf79e87036f, type: 3}

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader Variant.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4bf3a1b8cc791c845bc08e4ca1d00fb7
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Models/Furniture/Ranno Samuel Adson/card reader.fbx.meta

@@ -0,0 +1,108 @@
+fileFormatVersion: 2
+guid: 248e38dcb931fa345a11dbf79e87036f
+ModelImporter:
+  serializedVersion: 22200
+  internalIDToNameTable: []
+  externalObjects: {}
+  materials:
+    materialImportMode: 2
+    materialName: 0
+    materialSearch: 1
+    materialLocation: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    removeConstantScaleCurves: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    importAnimatedCustomProperties: 0
+    importConstraints: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    extraUserProperties: []
+    clipAnimations: []
+    isReadable: 0
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    useSRGBMaterialColor: 1
+    sortHierarchyByName: 1
+    importVisibility: 1
+    importBlendShapes: 1
+    importCameras: 1
+    importLights: 1
+    nodeNameCollisionStrategy: 1
+    fileIdsGeneration: 2
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    keepQuads: 0
+    weldVertices: 1
+    bakeAxisConversion: 0
+    preserveHierarchy: 0
+    skinWeightsMode: 0
+    maxBonesPerVertex: 4
+    minBoneWeight: 0.001
+    optimizeBones: 1
+    meshOptimizationFlags: -1
+    indexFormat: 0
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVMarginMethod: 1
+    secondaryUVMinLightmapResolution: 40
+    secondaryUVMinObjectScale: 1
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+    strictVertexDataChecks: 0
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+    normalCalculationMode: 4
+    legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
+    blendShapeNormalImportMode: 1
+    normalSmoothingSource: 0
+  referencedClips: []
+  importAnimation: 1
+  humanDescription:
+    serializedVersion: 3
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    globalScale: 1
+    rootMotionBoneName: 
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  autoGenerateAvatarMappingIfUnspecified: 1
+  animationType: 2
+  humanoidOversampling: 1
+  avatarSetup: 0
+  addHumanoidExtraRootOnlyWhenUsingAvatar: 1
+  importBlendShapeDeformPercent: 1
+  remapMaterialsIfMaterialImportModeIsNone: 0
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab

@@ -65,7 +65,6 @@ MonoBehaviour:
   m_GameObject: {fileID: 876842842715561968}
   m_Enabled: 1
   m_EditorHideFlags: 0
-<<<<<<< HEAD
   m_Script: {fileID: 11500000, guid: 98cc0a7a6d6d7314c8e390e45a9e1483, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
@@ -73,12 +72,6 @@ MonoBehaviour:
   port: 1
   discoveryInterval: 0
   automatic: 0
-=======
-  m_Script: {fileID: 11500000, guid: 2883099670a13fa4397b2335c51bc792, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  networkDiscovery: {fileID: 3580593382982171501}
->>>>>>> master
 --- !u!114 &3580593382982171501
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -88,17 +81,10 @@ MonoBehaviour:
   m_GameObject: {fileID: 876842842715561968}
   m_Enabled: 1
   m_EditorHideFlags: 0
-<<<<<<< HEAD
   m_Script: {fileID: 11500000, guid: 846c98250226ef949b5c0c499e9334da, type: 3}
-=======
-  m_Script: {fileID: 11500000, guid: 81d12db8c9730a74a923496476cfbf80, type: 3}
->>>>>>> master
   m_Name: 
   m_EditorClassIdentifier: 
-  secret: deltavr
+  networkDiscovery: {fileID: 4784684551416650039}
-  port: 0
-  discoveryInterval: 0
-  automatic: 0
 --- !u!114 &3642215892935434233
 MonoBehaviour:
   m_ObjectHideFlags: 0

Packages/manifest.json

@@ -8,7 +8,7 @@
     "com.unity.ext.nunit": "1.0.6",
     "com.unity.feature.vr": "1.0.0",
     "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.visualstudio": "2.0.23",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.5.0",
     "com.unity.memoryprofiler": "1.0.0",

Packages/packages-lock.json

@@ -88,7 +88,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.23",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -142,9 +142,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.settings-manager": "1.0.3",
+        "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.physics": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0"
+        "com.unity.settings-manager": "1.0.3"
       },
       "url": "https://packages.unity.com"
     },
@@ -261,9 +261,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
       "url": "https://packages.unity.com"
@@ -301,14 +301,14 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.ugui": "1.0.0",
         "com.unity.inputsystem": "1.4.4",
         "com.unity.mathematics": "1.2.6",
-        "com.unity.ugui": "1.0.0",
-        "com.unity.xr.core-utils": "2.2.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.10",
         "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.physics": "1.0.0"
+        "com.unity.xr.core-utils": "2.2.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.xr.legacyinputhelpers": "2.1.10"
       },
       "url": "https://packages.unity.com"
     },
@@ -327,11 +327,11 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.subsystems": "1.0.0",
         "com.unity.modules.vr": "1.0.0",
         "com.unity.modules.xr": "1.0.0",
-        "com.unity.xr.legacyinputhelpers": "2.1.7",
+        "com.unity.modules.subsystems": "1.0.0",
-        "com.unity.subsystemregistration": "1.0.6"
+        "com.unity.subsystemregistration": "1.0.6",
+        "com.unity.xr.legacyinputhelpers": "2.1.7"
       },
       "url": "https://packages.unity.com"
     },
@@ -358,9 +358,9 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {
+        "com.unity.inputsystem": "1.4.4",
         "com.unity.xr.management": "4.0.1",
-        "com.unity.xr.legacyinputhelpers": "2.1.2",
+        "com.unity.xr.legacyinputhelpers": "2.1.2"
-        "com.unity.inputsystem": "1.4.4"
       },
       "url": "https://packages.unity.com"
     },