# Conflicts:
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_Common.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_02.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_004_Delete.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_PetRecognition_SelectUI.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Pet.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Preview_Phone.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Snack_Food.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetArt/Atlas/UIRaw_Atlas_YL_Snack_SnakeBody.spriteatlas resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/GameBase.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/GameLogic.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/GameProto.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/System.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/TEngine.Runtime.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/UnityEngine.CoreModule.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/DLL/mscorlib.dll.bytes resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/Fonts/优设标题黑 SDF.asset resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/Scenes/RPG/scene_gameHall.unity resolved by origin/main(远端) version
# EintooAR/Assets/AssetRaw/ScriptableObject/AR/Track/ARTrackReferenceImageLibrary.asset resolved by origin/main(远端) version
# EintooAR/Assets/GameScripts/HotFix/GameLogic/AR Brochure/Core/System/ARBrochureHomeSystem.cs resolved by origin/main(远端) version
# EintooAR/Assets/Plugins/Android/mainTemplate.gradle resolved by origin/main(远端) version
# EintooAR/Assets/Plugins/HighlightPlus/Demo/Materials/Wall.mat resolved by origin/main(远端) version
# EintooAR/Assets/Scenes/main.unity resolved by origin/main(远端) version
# EintooAR/ProjectSettings/ProjectSettings.asset resolved by origin/main(远端) version
# EintooAR/UserSettings/EditorUserSettings.asset resolved by origin/main(远端) version
# EintooAR/UserSettings/Layouts/default-6000.dwlt resolved by origin/main(远端) version
This merge is to incorporate the latest bug fixes and performance improvements from the main branch. The main branch has been updated with security patches that are essential for the overall stability and security of the project. Additionally, some new utility functions have been added in the main branch which will enhance the functionality of the YKing branch..
# Conflicts:
# EintooAR/Assets/AssetRaw/Fonts/优设标题黑 SDF.asset resolved by main version
# EintooAR/UserSettings/Layouts/default-6000.dwlt resolved by main version
