diff --git a/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes index e1af0f51..5b07dd03 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes index d8677bd8..c4e4c7e0 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes index 627b9952..69fe79fe 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes index 0c9f69fd..13144695 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/System.Core.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes index 2899e3f0..bf16c7fe 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/System.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes index 0da0a723..0be13135 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes index 3db4ab9a..98d5002e 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/UniTask.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes index 579e2be6..192fdc9d 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes index 30d82e16..48705ab8 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/YooAsset.dll.bytes differ diff --git a/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes b/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes index a7970e04..c24eb331 100644 Binary files a/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes and b/EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes differ diff --git a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/UIARBrochureHome.cs b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/UIARBrochureHome.cs index de27ed9e..6466b058 100644 --- a/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/UIARBrochureHome.cs +++ b/EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/UI/UIARBrochureHome.cs @@ -7,7 +7,6 @@ using UnityEngine; using UnityEngine.UI; using TEngine; using TMPro; -using dnlib.DotNet; namespace GameLogic { diff --git a/EintooAR/Assets/Plugins/Com.ForbiddenByte/OSA/Extra/PluginSupport/Playmaker/PlaymakerSupport.meta b/EintooAR/Assets/Plugins/Com.ForbiddenByte/OSA/Extra/PluginSupport/Playmaker/PlaymakerSupport.meta deleted file mode 100644 index c79b7d50..00000000 --- a/EintooAR/Assets/Plugins/Com.ForbiddenByte/OSA/Extra/PluginSupport/Playmaker/PlaymakerSupport.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 450ec47fef1237146b84299acd6f1fb9 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/EintooAR/ProjectSettings/ProjectSettings.asset b/EintooAR/ProjectSettings/ProjectSettings.asset index 372a8673..c8b79786 100644 --- a/EintooAR/ProjectSettings/ProjectSettings.asset +++ b/EintooAR/ProjectSettings/ProjectSettings.asset @@ -783,7 +783,7 @@ PlayerSettings: webGLCloseOnQuit: 0 webWasm2023: 0 scriptingDefineSymbols: - Android: ENABLE_LOG;TextMeshPro;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;ES3_TMPRO;ES3_UGUI;ATMOSPHERIC_HEIGHT_FOG;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;ENABLE_HYBRIDCLR;NODECANVAS + Android: ENABLE_LOG;TextMeshPro;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;ES3_TMPRO;ES3_UGUI;ATMOSPHERIC_HEIGHT_FOG;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;NODECANVAS;ENABLE_HYBRIDCLR EmbeddedLinux: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 GameCoreScarlett: DOTWEEN GameCoreXboxOne: TextMeshPro;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 @@ -794,12 +794,12 @@ PlayerSettings: QNX: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 ReservedCFE: TextMeshPro;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 Server: ES3_TMPRO;ES3_UGUI - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;SLATE;NODECANVAS;ENABLE_HYBRIDCLR + Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;SLATE;NODECANVAS;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ENABLE_HYBRIDCLR VisionOS: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 WebGL: ENABLE_LOG;TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2;ENABLE_HYBRIDCLR Windows Store Apps: ENABLE_LOG;ES3_TMPRO;ES3_UGUI;DOTWEEN;ENABLE_HYBRIDCLR XboxOne: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 - iPhone: ENABLE_LOG;TextMeshPro;UNITY_XR_ARKIT_LOADER_ENABLED;ES3_TMPRO;ES3_UGUI;DOTWEEN;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;NODECANVAS;ENABLE_HYBRIDCLR;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3 + iPhone: ENABLE_LOG;TextMeshPro;UNITY_XR_ARKIT_LOADER_ENABLED;ES3_TMPRO;ES3_UGUI;DOTWEEN;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;SLATE;NODECANVAS;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;ODIN_VALIDATOR_3_2;ODIN_VALIDATOR_3_3;ENABLE_HYBRIDCLR tvOS: TextMeshPro;ES3_TMPRO;ES3_UGUI;ENVIRO_3;DOTWEEN;UNITY_POST_PROCESSING_STACK_V2 additionalCompilerArguments: {} platformArchitecture: {} diff --git a/EintooAR/UserSettings/Layouts/default-6000.dwlt b/EintooAR/UserSettings/Layouts/default-6000.dwlt index 34300602..23e1337f 100644 --- a/EintooAR/UserSettings/Layouts/default-6000.dwlt +++ b/EintooAR/UserSettings/Layouts/default-6000.dwlt @@ -1317,7 +1317,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 655} m_SelectedIDs: 4c260100 m_LastClickedID: 75340 - m_ExpandedIDs: 0000000026090100280901002a0901002c0901002e09010030090100320901003409010036090100380901003a0901003c0901003e09010040090100420901004409010046090100480901004a0901004c0901004e09010050090100520901005409010056090100580901005a0901005c0901005e09010060090100620901006409010066090100680901006a0901006c0901006e09010070090100720901007409010076090100780901007a0901007c0901007e090100 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1346,7 +1346,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000026090100280901002a0901002c0901002e09010030090100320901003409010036090100380901003a0901003c0901003e09010040090100420901004409010046090100480901004a0901004c0901004e09010050090100520901005409010056090100580901005a0901005c0901005e09010060090100620901006409010066090100680901006a0901006c0901006e09010070090100720901007409010076090100780901007a0901007c0901007e090100 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1470,7 +1470,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 37} m_SelectedIDs: fc250100 m_LastClickedID: 75260 - m_ExpandedIDs: 0000000026090100280901002a0901002c0901002e09010030090100320901003409010036090100380901003a0901003c0901003e09010040090100420901004409010046090100480901004a0901004c0901004e09010050090100520901005409010056090100580901005a0901005c0901005e09010060090100620901006409010066090100680901006a0901006c0901006e09010070090100720901007409010076090100780901007a0901007c0901007e090100 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1499,7 +1499,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000026090100280901002a0901002c0901002e09010030090100320901003409010036090100380901003a0901003c0901003e09010040090100420901004409010046090100480901004a0901004c0901004e09010050090100520901005409010056090100580901005a0901005c0901005e09010060090100620901006409010066090100680901006a0901006c0901006e09010070090100720901007409010076090100780901007a0901007c0901007e090100 + m_ExpandedIDs: m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: