fix compatibility with update 87; refactoring

RedworkDE · Sep 23, 2020 · fb43506 · fb43506
1 parent e94b905
commit fb43506
Show file tree

Hide file tree

Showing 22 changed files with 113 additions and 313 deletions.
diff --git a/DvLamps/Assets/Editor/EditorScripts.dll b/DvLamps/Assets/Editor/EditorScripts.dll
diff --git a/DvLamps/Assets/MagicLamp/MagicLamp.prefab.meta b/DvLamps/Assets/MagicLamp/MagicLamp.prefab.meta
diff --git a/DvLamps/Assets/ModInfo.asset b/DvLamps/Assets/ModInfo.asset
@@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: -1711618417, guid: 72c89f97403c42a42aaf8a1911eedb0e, type: 3}
+  m_Name: ModInfo
+  m_EditorClassIdentifier: 
+  ModId: RedworkDE.DvLamps.Embedded
+  DisplayName: Flashlight Item
+  Author: RedworkDE
+  Version: 1.4.0
+  RepositoryUrl: https://github.com/RedworkDE/DvLamps
+  NoLogging: 0
+  EnableLogging: 1
+  EnableLoggingFatal: 1
+  EnableLoggingError: 1
+  EnableLoggingWarning: 1
+  EnableLoggingMessage: 1
+  EnableLoggingInfo: 1
+  EnableLoggingDebug: 1
+  NoHarmony: 0
+  MockHarmony: 0
+  NoHooks: 0
diff --git a/DvLamps/Assets/ModInfo.asset.meta b/DvLamps/Assets/ModInfo.asset.meta
diff --git a/DvLamps/Assets/Radio.meta b/DvLamps/Assets/Radio.meta
diff --git a/DvLamps/Assets/Radio/Radio.prefab b/DvLamps/Assets/Radio/Radio.prefab
@@ -0,0 +1,32 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &7342947949558342058
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7135881773974560189}
+  m_Layer: 0
+  m_Name: Radio
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7135881773974560189
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7342947949558342058}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.0003877282, y: -0.051000044, z: 0.11622479}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/DvLamps/Assets/Radio/Radio.prefab.meta b/DvLamps/Assets/Radio/Radio.prefab.meta
diff --git a/DvLamps/Assets/Scripts/FlashlightCommon.cs b/DvLamps/Assets/Scripts/FlashlightCommon.cs
@@ -116,6 +116,18 @@ public void SetStateSaveData(JObject data)
 		SetVariant(stateData.variant);
 	}
 
+	public static void OrientFlashlight(Transform target, Transform camera)
+	{
+		if (Physics.Raycast(camera.position, camera.rotation * Vector3.forward, out var hit))
+		{
+			target.rotation = Quaternion.LookRotation(hit.point - target.position);
+		}
+		else
+		{
+			target.rotation = camera.rotation;
+		}
+	}
+
 	public enum FlashlightState
 	{
 		Enabled,

diff --git a/DvLamps/Assets/Scripts/FlashlightNonVR.cs b/DvLamps/Assets/Scripts/FlashlightNonVR.cs
@@ -66,7 +66,7 @@ void LateUpdate()
 		if (IsHeadAttached)
 		{
 			transform.position = Camera.main.transform.position + Camera.main.transform.rotation * Vector3.up * 0.3f;
-			transform.rotation = Camera.main.transform.rotation;
+			FlashlightCommon.OrientFlashlight(transform, Camera.main.transform);
 		}
 	}
 

diff --git a/DvLamps/Assets/Scripts/FlashlightVR.cs b/DvLamps/Assets/Scripts/FlashlightVR.cs
@@ -3,7 +3,6 @@
 
 public class FlashlightVR : MonoBehaviour
 {
-	public float RotateSpeed;
 	private Transform _headset;
 
     void Start()
@@ -21,7 +20,7 @@ void LateUpdate()
     {
 	    if (IsInBelt())
 	    {
-		    transform.rotation = Quaternion.RotateTowards(transform.rotation, _headset.rotation, RotateSpeed * Time.deltaTime);
+			FlashlightCommon.OrientFlashlight(transform, _headset);
 	    }
     }
 

diff --git a/DvLamps/Assets/Scripts/DvTimeEmbedded.asmdef → DvLamps/Assets/Scripts/Scripts.asmdef b/DvLamps/Assets/Scripts/DvTimeEmbedded.asmdef → DvLamps/Assets/Scripts/Scripts.asmdef
@@ -1,5 +1,5 @@
 {
-    "name": "DvLampsEmbedded",
+    "name": "RedworkDE.DvLamps.Embedded",
     "references": [],
     "includePlatforms": [],
     "excludePlatforms": [],

diff --git a/...Assets/Scripts/DvTimeEmbedded.asmdef.meta → DvLamps/Assets/Scripts/Scripts.asmdef.meta b/...Assets/Scripts/DvTimeEmbedded.asmdef.meta → DvLamps/Assets/Scripts/Scripts.asmdef.meta
diff --git a/DvLamps/Packages/manifest.json b/DvLamps/Packages/manifest.json
@@ -1,5 +1,6 @@
 {
   "dependencies": {
+    "com.unity.assetbundlebrowser": "1.7.0",
     "com.unity.xr.openvr.standalone": "1.0.5",
     "com.unity.modules.assetbundle": "1.0.0",
     "com.unity.modules.imgui": "1.0.0",

diff --git a/DvLamps/ProjectSettings/ProjectSettings.asset b/DvLamps/ProjectSettings/ProjectSettings.asset
@@ -431,7 +431,6 @@ PlayerSettings:
   switchRatingsInt_9: 0
   switchRatingsInt_10: 0
   switchRatingsInt_11: 0
-  switchRatingsInt_12: 0
   switchLocalCommunicationIds_0: 
   switchLocalCommunicationIds_1: 
   switchLocalCommunicationIds_2: 
@@ -550,7 +549,8 @@ PlayerSettings:
   webGLLinkerTarget: 1
   webGLThreadsSupport: 0
   webGLWasmStreaming: 0
-  scriptingDefineSymbols: {}
+  scriptingDefineSymbols:
+    1: ENABLE_LOGGING;ENABLE_LOGGING_FATAL;ENABLE_LOGGING_ERROR;ENABLE_LOGGING_WARNING;ENABLE_LOGGING_MESSAGE;ENABLE_LOGGING_INFO;ENABLE_LOGGING_DEBUG;HAS_HARMONY
   platformArchitecture: {}
   scriptingBackend: {}
   il2cppCompilerConfiguration: {}

diff --git a/EditorScripts/AssemblyNameFixup.cs b/EditorScripts/AssemblyNameFixup.cs
diff --git a/EditorScripts/ByteArrayRocks.cs b/EditorScripts/ByteArrayRocks.cs
diff --git a/EditorScripts/EditorScripts.csproj b/EditorScripts/EditorScripts.csproj
diff --git a/EditorScripts/ExportBundle.cs b/EditorScripts/ExportBundle.cs