diff --git a/Client/Assets/Scenes/Main.unity b/Client/Assets/Scenes/Main.unity index 0d41737..612d63e 100644 --- a/Client/Assets/Scenes/Main.unity +++ b/Client/Assets/Scenes/Main.unity @@ -166,6 +166,52 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1446352777 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1446352779} + - component: {fileID: 1446352778} + m_Layer: 0 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1446352778 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446352777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c25ae9d04ef4e03a723135aa298de16, type: 3} + m_Name: + m_EditorClassIdentifier: + actions: {fileID: 0} + debugMode: 0 +--- !u!4 &1446352779 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1446352777} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.557358, y: 5.6186223, z: -2.729362} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &7354943399308362261 PrefabInstance: m_ObjectHideFlags: 0 @@ -233,3 +279,4 @@ SceneRoots: m_Roots: - {fileID: 7354943399308362261} - {fileID: 954605702} + - {fileID: 1446352779} diff --git a/Client/ProjectSettings/ProjectSettings.asset b/Client/ProjectSettings/ProjectSettings.asset index f28909e..b5a8a0d 100644 --- a/Client/ProjectSettings/ProjectSettings.asset +++ b/Client/ProjectSettings/ProjectSettings.asset @@ -822,7 +822,7 @@ PlayerSettings: webGLPowerPreference: 2 scriptingDefineSymbols: Android: ENABLE_HYBRIDCLR;ENABLE_LOG - Standalone: ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrictCheck;ODIN_INSPECTOR_3_2;ODIN_INSPECTOR_3_3;Animora_TMP + Standalone: ENABLE_HYBRIDCLR;FANTASY_UNITY;ENABLE_LOG;Event_StrictCheck WebGL: ENABLE_HYBRIDCLR;ENABLE_LOG;UNITY_WEBGL;WEIXINMINIGAME;FANTASY_UNITY;Event_StrickCheck;ODIN_VALIDATOR;ODIN_VALIDATOR_3_1;ODIN_INSPECTOR;ODIN_INSPECTOR_3;ODIN_INSPECTOR_3_1 Windows Store Apps: ENABLE_HYBRIDCLR;ENABLE_LOG iPhone: ENABLE_HYBRIDCLR;ENABLE_LOG