From 64b94573669dea9c1adfe55238840ad47109acf9 Mon Sep 17 00:00:00 2001 From: Usov Alexandr Date: Sun, 9 Aug 2020 20:08:48 +0300 Subject: [PATCH 1/4] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20=D0=9A=D1=83=D0=B1=20=D0=B8=20=D1=82=D1=80?= =?UTF-8?q?=D0=B8=D0=B3=D0=B3=D0=B5=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Cube 1.prefab | 93 ++++++++++++++++ Assets/Resources/Cube 1.prefab.meta | 7 ++ Assets/Resources/Cube.prefab | 2 +- Assets/Resources/Data/CubeData.asset | 23 ++++ Assets/Resources/Data/CubeData.asset.meta | 8 ++ Assets/Resources/Data/Data.asset | 1 + Assets/Resources/Data/SphereData.asset | 4 +- Assets/Scenes/ITickTest.unity | 102 +++++++++++++++++- .../MVC/Cube.meta} | 2 +- .../ContextTest/MVC/Cube/CubeController.cs | 41 +++++++ .../MVC/Cube/CubeController.cs.meta | 11 ++ .../Scripts/ContextTest/MVC/Cube/CubeData.cs | 33 ++++++ .../ContextTest/MVC/Cube/CubeData.cs.meta | 11 ++ .../MVC/Cube/CubeInitilizeController.cs | 40 +++++++ .../MVC/Cube/CubeInitilizeController.cs.meta | 11 ++ .../Scripts/ContextTest/MVC/Cube/CubeModel.cs | 37 +++++++ .../ContextTest/MVC/Cube/CubeModel.cs.meta | 11 ++ .../ContextTest/MVC/Cube/CubeStruct.cs | 23 ++++ .../ContextTest/MVC/Cube/CubeStruct.cs.meta | 11 ++ .../TriggerExample/CubeTargetBehaviour.cs | 11 ++ .../CubeTargetBehaviour.cs.meta | 11 ++ .../TriggerExample/CubeTargetController.cs | 82 ++++++++++++++ .../CubeTargetController.cs.meta | 11 ++ .../TriggerExample/MyObjectWithTag.prefab | 60 +++++++++++ .../MyObjectWithTag.prefab.meta | 7 ++ .../TriggerExample/TargetController.cs | 2 +- .../TriggerExample/TestObjectWithTag.prefab | 6 +- Assets/Scripts/Contexts/GameContext.cs | 1 + .../BaseControllers/MainControllers.cs | 3 + Assets/Scripts/Data/Data.asset | 1 + Assets/Scripts/Data/Data.cs | 14 +++ Assets/Scripts/Managers/TagManager.cs | 1 + 32 files changed, 670 insertions(+), 11 deletions(-) create mode 100644 Assets/Resources/Cube 1.prefab create mode 100644 Assets/Resources/Cube 1.prefab.meta create mode 100644 Assets/Resources/Data/CubeData.asset create mode 100644 Assets/Resources/Data/CubeData.asset.meta rename Assets/Scripts/{To_Refactoring/Character/Weapons.meta => ContextTest/MVC/Cube.meta} (77%) create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab create mode 100644 Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta diff --git a/Assets/Resources/Cube 1.prefab b/Assets/Resources/Cube 1.prefab new file mode 100644 index 000000000..86d1db78b --- /dev/null +++ b/Assets/Resources/Cube 1.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2582259739583959656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5978270257095897431} + - component: {fileID: 8503473510655579680} + - component: {fileID: 3288890107308790154} + - component: {fileID: 8234895440057848186} + m_Layer: 0 + m_Name: Cube 1 + m_TagString: Sphere + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5978270257095897431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 20, z: 0} + 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} +--- !u!33 &8503473510655579680 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3288890107308790154 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!65 &8234895440057848186 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Cube 1.prefab.meta b/Assets/Resources/Cube 1.prefab.meta new file mode 100644 index 000000000..4ec571298 --- /dev/null +++ b/Assets/Resources/Cube 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af4361cf94432b3469df69458ea0d76c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cube.prefab b/Assets/Resources/Cube.prefab index ced1e8f56..86740c707 100644 --- a/Assets/Resources/Cube.prefab +++ b/Assets/Resources/Cube.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 7804474388098658221} m_Layer: 0 m_Name: Cube - m_TagString: Enemy + m_TagString: Cube m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Resources/Data/CubeData.asset b/Assets/Resources/Data/CubeData.asset new file mode 100644 index 000000000..4942b03f9 --- /dev/null +++ b/Assets/Resources/Data/CubeData.asset @@ -0,0 +1,23 @@ +%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: 11500000, guid: 3594c16de157d5546b5c37322eeaaea7, type: 3} + m_Name: CubeData + m_EditorClassIdentifier: + CubeStruct: + MoveSpeed: 0.1 + CubeX: 1 + CubeY: 1 + CubeZ: 1 + Prefab: {fileID: 2582259739583959656, guid: af4361cf94432b3469df69458ea0d76c, + type: 3} + Target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} diff --git a/Assets/Resources/Data/CubeData.asset.meta b/Assets/Resources/Data/CubeData.asset.meta new file mode 100644 index 000000000..81050a091 --- /dev/null +++ b/Assets/Resources/Data/CubeData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4a17dd69a6f5f6479f1244b30b13da1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/Data.asset b/Assets/Resources/Data/Data.asset index 79469fc93..14c2f05f8 100644 --- a/Assets/Resources/Data/Data.asset +++ b/Assets/Resources/Data/Data.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Data m_EditorClassIdentifier: _sphereDataPath: SphereData + _cubeDataPath: CubeData _characterDataPath: CharacterData _startDialogueDataPath: StartDialogueData _dialogueSystemDataPath: DialogueSystemData diff --git a/Assets/Resources/Data/SphereData.asset b/Assets/Resources/Data/SphereData.asset index 3862546a1..db4fbfa61 100644 --- a/Assets/Resources/Data/SphereData.asset +++ b/Assets/Resources/Data/SphereData.asset @@ -13,9 +13,9 @@ MonoBehaviour: m_Name: SphereData m_EditorClassIdentifier: SphereStruct: - MoveSpeed: 0.1 + MoveSpeed: 0.12 SphereRadius: 0.5 Prefab: {fileID: 6953022481052749130, guid: 5486b6c5985f0a74dab7aa0548b222f6, type: 3} - Target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, + Target: {fileID: 5978270257095897431, guid: af4361cf94432b3469df69458ea0d76c, type: 3} diff --git a/Assets/Scenes/ITickTest.unity b/Assets/Scenes/ITickTest.unity index 4d05735e2..15332f788 100644 --- a/Assets/Scenes/ITickTest.unity +++ b/Assets/Scenes/ITickTest.unity @@ -294,6 +294,12 @@ Transform: m_Father: {fileID: 1660409117} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &830931368 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + m_PrefabInstance: {fileID: 1702169673} + m_PrefabAsset: {fileID: 0} --- !u!1 &957419076 GameObject: m_ObjectHideFlags: 0 @@ -504,9 +510,99 @@ Transform: - {fileID: 957419079} - {fileID: 567869892} - {fileID: 1202879470} + - {fileID: 830931368} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1702169673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1660409117} + m_Modifications: + - target: {fileID: -9083391299490380443, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: _type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 886101876341453925, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Name + value: MyObjectWithTag + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.41 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.65 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4542f4b2eaa8c9448a51df6b129f1951, type: 3} --- !u!1001 &298787223296447112 PrefabInstance: m_ObjectHideFlags: 0 @@ -591,17 +687,17 @@ PrefabInstance: - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.x - value: 20 + value: -0.66 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.y - value: 20 + value: -1.71 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.z - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} diff --git a/Assets/Scripts/To_Refactoring/Character/Weapons.meta b/Assets/Scripts/ContextTest/MVC/Cube.meta similarity index 77% rename from Assets/Scripts/To_Refactoring/Character/Weapons.meta rename to Assets/Scripts/ContextTest/MVC/Cube.meta index ed151ea9e..0a8a7bffa 100644 --- a/Assets/Scripts/To_Refactoring/Character/Weapons.meta +++ b/Assets/Scripts/ContextTest/MVC/Cube.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f3aa28c519cc714eabee8aeb10e70f9 +guid: 114456773495f5040874815afac74dd0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs new file mode 100644 index 000000000..3e12fd8fd --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs @@ -0,0 +1,41 @@ +namespace BeastHunter +{ + public sealed class CubeController : IAwake, IUpdate + { + #region Fields + + private readonly GameContext _context; + + #endregion + + + #region ClassLifeCycle + + public CubeController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IUpdate + + public void Updating() + { + _context.CubeModel.Initilize(); + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + + } + + #endregion + } +} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta new file mode 100644 index 000000000..8a69900a3 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0508fd16548c92d439597256762d2268 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs new file mode 100644 index 000000000..11778a76c --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs @@ -0,0 +1,33 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "NewData", menuName = "CreateData/Cube", order = 0)] +public sealed class CubeData : ScriptableObject +{ + #region Fields + + public CubeStruct CubeStruct; + + #endregion + + + #region Metods + + public void Move(Transform transform, Transform target, float speed) + { + transform.position = Vector3.MoveTowards + (transform.position, + target.transform.position, + speed); + } + + public void ChangeBoxCollider(BoxCollider CubeCollider, float CubeX, float CubeY, float CubeZ) + { + if (CubeCollider != null) + { + CubeCollider.size = new Vector3(CubeX, CubeY, CubeZ); + } + } + + #endregion +} + diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta new file mode 100644 index 000000000..9a74af746 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3594c16de157d5546b5c37322eeaaea7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs new file mode 100644 index 000000000..0fb721cdf --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace BeastHunter +{ + public sealed class CubeInitilizeController : IAwake + { + #region Field + + GameContext _context; + + #endregion + + + #region ClassLifeCycle + + public CubeInitilizeController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + var CubeData = Data.CubeData; + GameObject instance = GameObject.Instantiate(CubeData.CubeStruct.Prefab); + CubeModel Cube = new CubeModel(instance, CubeData); + _context.CubeModel = Cube; + } + + #endregion + } +} + + diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta new file mode 100644 index 000000000..aee307f0d --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b4280ae00a440b74b94f541e9f1a1ab1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs new file mode 100644 index 000000000..76ffb8333 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs @@ -0,0 +1,37 @@ +using UnityEngine; + +public sealed class CubeModel +{ + #region Properties + + public BoxCollider CubeCollider { get; } + public Transform CubeTransform { get; } + public CubeData CubeData; + public CubeStruct CubeStruct; + + #endregion + + + #region ClassLifeCycle + + public CubeModel(GameObject prefab, CubeData cubedata) + { + CubeData = cubedata; + CubeStruct = cubedata.CubeStruct; + CubeTransform = prefab.transform; + CubeCollider = prefab.gameObject.GetComponent(); + } + + #endregion + + + #region Metods + + public void Initilize() + { + CubeData.ChangeBoxCollider(CubeCollider, CubeStruct.CubeX, CubeStruct.CubeY, CubeStruct.CubeZ); + CubeData.Move(CubeTransform, CubeStruct.Target, CubeStruct.MoveSpeed); + } + + #endregion +} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta new file mode 100644 index 000000000..3ae1b5859 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1a7faa96bf48e6542b984157d1c4d78e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs new file mode 100644 index 000000000..9bab22eca --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using System; + + +[Serializable] +public struct CubeStruct +{ + #region Fields + + public float MoveSpeed; + + public float CubeX; + + public float CubeY; + + public float CubeZ; + + public GameObject Prefab; + + public Transform Target; + + #endregion +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta new file mode 100644 index 000000000..72cfc2405 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f50ca27d8dbf9b44f9d7910746b4c9d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs new file mode 100644 index 000000000..edc085bf9 --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs @@ -0,0 +1,11 @@ +namespace BeastHunter +{ + public class CubeTargetBehaviour : InteractableObjectBehavior + { + #region ITrigger + + private ITrigger _triggerImplementation; + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta new file mode 100644 index 000000000..71e499afb --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6aab3c5bd0711cc4e8603a2a1eaecb74 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs new file mode 100644 index 000000000..5a480f530 --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs @@ -0,0 +1,82 @@ +using UnityEngine; + + +namespace BeastHunter +{ + public sealed class CubeTargetController : IAwake, ITearDown + { + #region Fields + + private readonly GameContext _context; + + #endregion + + + #region ClassLifeCycles + + public CubeTargetController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + var cubes = _context.GetTriggers(InteractableObjectType.Cube); + foreach (var trigger in cubes) + { + var targetBehaviour = trigger as CubeTargetBehaviour; + targetBehaviour.OnFilterHandler += OnFilterHandler; + targetBehaviour.OnTriggerEnterHandler += OnTriggerEnterHandler; + targetBehaviour.OnTriggerExitHandler += OnTriggerExitHandler; + } + } + + #endregion + + + #region ITearDownController + + public void TearDown() + { + var cubes = _context.GetTriggers(InteractableObjectType.Cube); + foreach (var trigger in cubes) + { + var targetBehaviour = trigger as CubeTargetBehaviour; + targetBehaviour.OnFilterHandler -= OnFilterHandler; + targetBehaviour.OnTriggerEnterHandler -= OnTriggerEnterHandler; + targetBehaviour.OnTriggerExitHandler -= OnTriggerExitHandler; + } + } + + #endregion + + + #region Methods + + private bool OnFilterHandler(Collider tagObject) + { + Debug.Log(tagObject.tag); + return tagObject.CompareTag(TagManager.SPHERE); + } + + private void OnTriggerEnterHandler(ITrigger enteredObject, Collider other) + { + enteredObject.IsInteractable = true; + Debug.Log("Enter"); + } + + private void OnTriggerExitHandler(ITrigger exitedObject, Collider other) + { + exitedObject.IsInteractable = false; + Debug.Log("Exit"); + } + + #endregion + } + +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta new file mode 100644 index 000000000..be194d1ba --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 014bbcb03114d5a4b9da1a5d38b109fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab new file mode 100644 index 000000000..1fa0ee71e --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &886101876341453925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6765509933060648070} + - component: {fileID: -1291708834104649770} + - component: {fileID: -9083391299490380443} + m_Layer: 0 + m_Name: MyObjectWithTag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6765509933060648070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: -30} + 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} +--- !u!65 &-1291708834104649770 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 3, y: 3, z: 3} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &-9083391299490380443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6aab3c5bd0711cc4e8603a2a1eaecb74, type: 3} + m_Name: + m_EditorClassIdentifier: + _type: 2 diff --git a/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta new file mode 100644 index 000000000..a806f6d0a --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4542f4b2eaa8c9448a51df6b129f1951 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs index 58a80c230..bb4af9f60 100644 --- a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs +++ b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs @@ -43,7 +43,7 @@ public void OnAwake() public void TearDown() { - var sphers = _context.GetTriggers(InteractableObjectType.Cube); + var sphers = _context.GetTriggers(InteractableObjectType.Sphere); foreach (var trigger in sphers) { var targetBehaviour = trigger as TargetBehaviour; diff --git a/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab b/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab index 3d0f7a565..90bf819b4 100644 --- a/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab +++ b/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8946489080760387143} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -5, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -43,7 +43,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 10, y: 10, z: 10} + m_Size: {x: 3, y: 3, z: 3} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3876480272811656963 MonoBehaviour: @@ -57,4 +57,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ae350a95eb7c0f94d832b859785bb633, type: 3} m_Name: m_EditorClassIdentifier: - _type: 2 + _type: 1 diff --git a/Assets/Scripts/Contexts/GameContext.cs b/Assets/Scripts/Contexts/GameContext.cs index 2be724574..1f53ad0ee 100644 --- a/Assets/Scripts/Contexts/GameContext.cs +++ b/Assets/Scripts/Contexts/GameContext.cs @@ -13,6 +13,7 @@ public sealed class GameContext : Contexts public DialogueSystemModel DialogueSystemModel; public QuestModel QuestModel; public SphereModel SphereModel; + public CubeModel CubeModel; public CharacterModel CharacterModel; public InputModel InputModel; public GiantMudCrabModel GiantMudCrabModel; diff --git a/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs b/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs index 75138a861..7eb712c07 100644 --- a/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs +++ b/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs @@ -6,10 +6,13 @@ public sealed class MainControllers : ControllersStart public MainControllers(GameContext context) { + Add(new CubeInitilizeController(context)); Add(new SphereInitilizeController(context)); Add(new InitializeInteractableObjectController(context)); + Add(new CubeController(context)); Add(new SphereController(context)); Add(new TargetController(context)); + Add(new CubeTargetController(context)); } #endregion diff --git a/Assets/Scripts/Data/Data.asset b/Assets/Scripts/Data/Data.asset index 79469fc93..14c2f05f8 100644 --- a/Assets/Scripts/Data/Data.asset +++ b/Assets/Scripts/Data/Data.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Data m_EditorClassIdentifier: _sphereDataPath: SphereData + _cubeDataPath: CubeData _characterDataPath: CharacterData _startDialogueDataPath: StartDialogueData _dialogueSystemDataPath: DialogueSystemData diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index edc249b06..e4f3a363d 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -7,6 +7,7 @@ public sealed class Data : ScriptableObject { #region Fields [SerializeField] private string _sphereDataPath; + [SerializeField] private string _cubeDataPath; [SerializeField] private string _characterDataPath; [SerializeField] private string _startDialogueDataPath; [SerializeField] private string _dialogueSystemDataPath; @@ -15,6 +16,7 @@ public sealed class Data : ScriptableObject { private static Data _instance; private static SphereData _sphereData; + private static CubeData _cubeData; private static CharacterData _characterData; private static StartDialogueData _startDialogueData; private static DialogueSystemData _dialogueSystemData; @@ -45,6 +47,18 @@ public static SphereData SphereData { } } + public static CubeData CubeData + { + get + { + if (_cubeData == null) + { + _cubeData = Load("Data/" + Instance._cubeDataPath); + } + return _cubeData; + } + } + public static StartDialogueData StartDialogueData { get { if (_startDialogueData == null) { diff --git a/Assets/Scripts/Managers/TagManager.cs b/Assets/Scripts/Managers/TagManager.cs index f28d4ff5a..03d2d0836 100644 --- a/Assets/Scripts/Managers/TagManager.cs +++ b/Assets/Scripts/Managers/TagManager.cs @@ -8,6 +8,7 @@ public static class TagManager public const string SPHERE = "Sphere"; public const string NPC = "NPC"; public const string ENEMY = "Enemy"; + public const string CUBE = "Cube"; #endregion } From e94bb04f7c12ba2c04f7efaab35325fa4677eabd Mon Sep 17 00:00:00 2001 From: Usov Alexandr Date: Sun, 9 Aug 2020 20:08:48 +0300 Subject: [PATCH 2/4] =?UTF-8?q?=D0=A0=D0=B5=D0=B0=D0=BB=D0=B8=D0=B7=D0=BE?= =?UTF-8?q?=D0=B2=D0=B0=D0=BB=20=D0=9A=D1=83=D0=B1=20=D0=B8=20=D1=82=D1=80?= =?UTF-8?q?=D0=B8=D0=B3=D0=B3=D0=B5=D1=80=D1=8B=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D0=BD=D0=B5=D0=B3=D0=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Cube 1.prefab | 93 ++++++++++++++++ Assets/Resources/Cube 1.prefab.meta | 7 ++ Assets/Resources/Cube.prefab | 2 +- Assets/Resources/Data/CubeData.asset | 23 ++++ Assets/Resources/Data/CubeData.asset.meta | 8 ++ Assets/Resources/Data/Data.asset | 1 + Assets/Resources/Data/SphereData.asset | 2 +- Assets/Scenes/ITickTest.unity | 102 +++++++++++++++++- .../MVC/Cube.meta} | 2 +- .../ContextTest/MVC/Cube/CubeController.cs | 41 +++++++ .../MVC/Cube/CubeController.cs.meta | 11 ++ .../Scripts/ContextTest/MVC/Cube/CubeData.cs | 33 ++++++ .../ContextTest/MVC/Cube/CubeData.cs.meta | 11 ++ .../MVC/Cube/CubeInitilizeController.cs | 40 +++++++ .../MVC/Cube/CubeInitilizeController.cs.meta | 11 ++ .../Scripts/ContextTest/MVC/Cube/CubeModel.cs | 37 +++++++ .../ContextTest/MVC/Cube/CubeModel.cs.meta | 11 ++ .../ContextTest/MVC/Cube/CubeStruct.cs | 23 ++++ .../ContextTest/MVC/Cube/CubeStruct.cs.meta | 11 ++ .../TriggerExample/CubeTargetBehaviour.cs | 11 ++ .../CubeTargetBehaviour.cs.meta | 11 ++ .../TriggerExample/CubeTargetController.cs | 82 ++++++++++++++ .../CubeTargetController.cs.meta | 11 ++ .../TriggerExample/MyObjectWithTag.prefab | 60 +++++++++++ .../MyObjectWithTag.prefab.meta | 7 ++ .../TriggerExample/TargetController.cs | 2 +- .../TriggerExample/TestObjectWithTag.prefab | 6 +- Assets/Scripts/Contexts/GameContext.cs | 1 + .../BaseControllers/MainControllers.cs | 3 + Assets/Scripts/Data/Data.asset | 1 + Assets/Scripts/Data/Data.cs | 14 +++ Assets/Scripts/Managers/TagManager.cs | 1 + 32 files changed, 669 insertions(+), 10 deletions(-) create mode 100644 Assets/Resources/Cube 1.prefab create mode 100644 Assets/Resources/Cube 1.prefab.meta create mode 100644 Assets/Resources/Data/CubeData.asset create mode 100644 Assets/Resources/Data/CubeData.asset.meta rename Assets/Scripts/{To_Refactoring/Character/Weapons.meta => ContextTest/MVC/Cube.meta} (77%) create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs create mode 100644 Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs create mode 100644 Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta create mode 100644 Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab create mode 100644 Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta diff --git a/Assets/Resources/Cube 1.prefab b/Assets/Resources/Cube 1.prefab new file mode 100644 index 000000000..86d1db78b --- /dev/null +++ b/Assets/Resources/Cube 1.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2582259739583959656 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5978270257095897431} + - component: {fileID: 8503473510655579680} + - component: {fileID: 3288890107308790154} + - component: {fileID: 8234895440057848186} + m_Layer: 0 + m_Name: Cube 1 + m_TagString: Sphere + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &5978270257095897431 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 20, z: 0} + 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} +--- !u!33 &8503473510655579680 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3288890107308790154 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!65 &8234895440057848186 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Resources/Cube 1.prefab.meta b/Assets/Resources/Cube 1.prefab.meta new file mode 100644 index 000000000..4ec571298 --- /dev/null +++ b/Assets/Resources/Cube 1.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af4361cf94432b3469df69458ea0d76c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cube.prefab b/Assets/Resources/Cube.prefab index ced1e8f56..86740c707 100644 --- a/Assets/Resources/Cube.prefab +++ b/Assets/Resources/Cube.prefab @@ -17,7 +17,7 @@ GameObject: - component: {fileID: 7804474388098658221} m_Layer: 0 m_Name: Cube - m_TagString: Enemy + m_TagString: Cube m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Resources/Data/CubeData.asset b/Assets/Resources/Data/CubeData.asset new file mode 100644 index 000000000..4942b03f9 --- /dev/null +++ b/Assets/Resources/Data/CubeData.asset @@ -0,0 +1,23 @@ +%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: 11500000, guid: 3594c16de157d5546b5c37322eeaaea7, type: 3} + m_Name: CubeData + m_EditorClassIdentifier: + CubeStruct: + MoveSpeed: 0.1 + CubeX: 1 + CubeY: 1 + CubeZ: 1 + Prefab: {fileID: 2582259739583959656, guid: af4361cf94432b3469df69458ea0d76c, + type: 3} + Target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} diff --git a/Assets/Resources/Data/CubeData.asset.meta b/Assets/Resources/Data/CubeData.asset.meta new file mode 100644 index 000000000..81050a091 --- /dev/null +++ b/Assets/Resources/Data/CubeData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4a17dd69a6f5f6479f1244b30b13da1 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Data/Data.asset b/Assets/Resources/Data/Data.asset index 79469fc93..14c2f05f8 100644 --- a/Assets/Resources/Data/Data.asset +++ b/Assets/Resources/Data/Data.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Data m_EditorClassIdentifier: _sphereDataPath: SphereData + _cubeDataPath: CubeData _characterDataPath: CharacterData _startDialogueDataPath: StartDialogueData _dialogueSystemDataPath: DialogueSystemData diff --git a/Assets/Resources/Data/SphereData.asset b/Assets/Resources/Data/SphereData.asset index 3862546a1..4f7c8e2e4 100644 --- a/Assets/Resources/Data/SphereData.asset +++ b/Assets/Resources/Data/SphereData.asset @@ -13,7 +13,7 @@ MonoBehaviour: m_Name: SphereData m_EditorClassIdentifier: SphereStruct: - MoveSpeed: 0.1 + MoveSpeed: 0.12 SphereRadius: 0.5 Prefab: {fileID: 6953022481052749130, guid: 5486b6c5985f0a74dab7aa0548b222f6, type: 3} diff --git a/Assets/Scenes/ITickTest.unity b/Assets/Scenes/ITickTest.unity index 4d05735e2..15332f788 100644 --- a/Assets/Scenes/ITickTest.unity +++ b/Assets/Scenes/ITickTest.unity @@ -294,6 +294,12 @@ Transform: m_Father: {fileID: 1660409117} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!4 &830931368 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + m_PrefabInstance: {fileID: 1702169673} + m_PrefabAsset: {fileID: 0} --- !u!1 &957419076 GameObject: m_ObjectHideFlags: 0 @@ -504,9 +510,99 @@ Transform: - {fileID: 957419079} - {fileID: 567869892} - {fileID: 1202879470} + - {fileID: 830931368} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1702169673 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1660409117} + m_Modifications: + - target: {fileID: -9083391299490380443, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: _type + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Size.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 886101876341453925, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_Name + value: MyObjectWithTag + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.41 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.65 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalPosition.z + value: -10 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4542f4b2eaa8c9448a51df6b129f1951, type: 3} --- !u!1001 &298787223296447112 PrefabInstance: m_ObjectHideFlags: 0 @@ -591,17 +687,17 @@ PrefabInstance: - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.x - value: 20 + value: -0.66 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.y - value: 20 + value: -1.71 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} propertyPath: m_LocalPosition.z - value: 20 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} diff --git a/Assets/Scripts/To_Refactoring/Character/Weapons.meta b/Assets/Scripts/ContextTest/MVC/Cube.meta similarity index 77% rename from Assets/Scripts/To_Refactoring/Character/Weapons.meta rename to Assets/Scripts/ContextTest/MVC/Cube.meta index ed151ea9e..0a8a7bffa 100644 --- a/Assets/Scripts/To_Refactoring/Character/Weapons.meta +++ b/Assets/Scripts/ContextTest/MVC/Cube.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 3f3aa28c519cc714eabee8aeb10e70f9 +guid: 114456773495f5040874815afac74dd0 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs new file mode 100644 index 000000000..3e12fd8fd --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs @@ -0,0 +1,41 @@ +namespace BeastHunter +{ + public sealed class CubeController : IAwake, IUpdate + { + #region Fields + + private readonly GameContext _context; + + #endregion + + + #region ClassLifeCycle + + public CubeController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IUpdate + + public void Updating() + { + _context.CubeModel.Initilize(); + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + + } + + #endregion + } +} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta new file mode 100644 index 000000000..8a69900a3 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0508fd16548c92d439597256762d2268 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs new file mode 100644 index 000000000..11778a76c --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs @@ -0,0 +1,33 @@ +using UnityEngine; + +[CreateAssetMenu(fileName = "NewData", menuName = "CreateData/Cube", order = 0)] +public sealed class CubeData : ScriptableObject +{ + #region Fields + + public CubeStruct CubeStruct; + + #endregion + + + #region Metods + + public void Move(Transform transform, Transform target, float speed) + { + transform.position = Vector3.MoveTowards + (transform.position, + target.transform.position, + speed); + } + + public void ChangeBoxCollider(BoxCollider CubeCollider, float CubeX, float CubeY, float CubeZ) + { + if (CubeCollider != null) + { + CubeCollider.size = new Vector3(CubeX, CubeY, CubeZ); + } + } + + #endregion +} + diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta new file mode 100644 index 000000000..9a74af746 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 3594c16de157d5546b5c37322eeaaea7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs new file mode 100644 index 000000000..0fb721cdf --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs @@ -0,0 +1,40 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace BeastHunter +{ + public sealed class CubeInitilizeController : IAwake + { + #region Field + + GameContext _context; + + #endregion + + + #region ClassLifeCycle + + public CubeInitilizeController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + var CubeData = Data.CubeData; + GameObject instance = GameObject.Instantiate(CubeData.CubeStruct.Prefab); + CubeModel Cube = new CubeModel(instance, CubeData); + _context.CubeModel = Cube; + } + + #endregion + } +} + + diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta new file mode 100644 index 000000000..aee307f0d --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeInitilizeController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b4280ae00a440b74b94f541e9f1a1ab1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs new file mode 100644 index 000000000..76ffb8333 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs @@ -0,0 +1,37 @@ +using UnityEngine; + +public sealed class CubeModel +{ + #region Properties + + public BoxCollider CubeCollider { get; } + public Transform CubeTransform { get; } + public CubeData CubeData; + public CubeStruct CubeStruct; + + #endregion + + + #region ClassLifeCycle + + public CubeModel(GameObject prefab, CubeData cubedata) + { + CubeData = cubedata; + CubeStruct = cubedata.CubeStruct; + CubeTransform = prefab.transform; + CubeCollider = prefab.gameObject.GetComponent(); + } + + #endregion + + + #region Metods + + public void Initilize() + { + CubeData.ChangeBoxCollider(CubeCollider, CubeStruct.CubeX, CubeStruct.CubeY, CubeStruct.CubeZ); + CubeData.Move(CubeTransform, CubeStruct.Target, CubeStruct.MoveSpeed); + } + + #endregion +} diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta new file mode 100644 index 000000000..3ae1b5859 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeModel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1a7faa96bf48e6542b984157d1c4d78e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs new file mode 100644 index 000000000..9bab22eca --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs @@ -0,0 +1,23 @@ +using UnityEngine; +using System; + + +[Serializable] +public struct CubeStruct +{ + #region Fields + + public float MoveSpeed; + + public float CubeX; + + public float CubeY; + + public float CubeZ; + + public GameObject Prefab; + + public Transform Target; + + #endregion +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta new file mode 100644 index 000000000..72cfc2405 --- /dev/null +++ b/Assets/Scripts/ContextTest/MVC/Cube/CubeStruct.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f50ca27d8dbf9b44f9d7910746b4c9d7 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs new file mode 100644 index 000000000..edc085bf9 --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs @@ -0,0 +1,11 @@ +namespace BeastHunter +{ + public class CubeTargetBehaviour : InteractableObjectBehavior + { + #region ITrigger + + private ITrigger _triggerImplementation; + + #endregion + } +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta new file mode 100644 index 000000000..71e499afb --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetBehaviour.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6aab3c5bd0711cc4e8603a2a1eaecb74 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs new file mode 100644 index 000000000..5a480f530 --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs @@ -0,0 +1,82 @@ +using UnityEngine; + + +namespace BeastHunter +{ + public sealed class CubeTargetController : IAwake, ITearDown + { + #region Fields + + private readonly GameContext _context; + + #endregion + + + #region ClassLifeCycles + + public CubeTargetController(GameContext context) + { + _context = context; + } + + #endregion + + + #region IAwake + + public void OnAwake() + { + var cubes = _context.GetTriggers(InteractableObjectType.Cube); + foreach (var trigger in cubes) + { + var targetBehaviour = trigger as CubeTargetBehaviour; + targetBehaviour.OnFilterHandler += OnFilterHandler; + targetBehaviour.OnTriggerEnterHandler += OnTriggerEnterHandler; + targetBehaviour.OnTriggerExitHandler += OnTriggerExitHandler; + } + } + + #endregion + + + #region ITearDownController + + public void TearDown() + { + var cubes = _context.GetTriggers(InteractableObjectType.Cube); + foreach (var trigger in cubes) + { + var targetBehaviour = trigger as CubeTargetBehaviour; + targetBehaviour.OnFilterHandler -= OnFilterHandler; + targetBehaviour.OnTriggerEnterHandler -= OnTriggerEnterHandler; + targetBehaviour.OnTriggerExitHandler -= OnTriggerExitHandler; + } + } + + #endregion + + + #region Methods + + private bool OnFilterHandler(Collider tagObject) + { + Debug.Log(tagObject.tag); + return tagObject.CompareTag(TagManager.SPHERE); + } + + private void OnTriggerEnterHandler(ITrigger enteredObject, Collider other) + { + enteredObject.IsInteractable = true; + Debug.Log("Enter"); + } + + private void OnTriggerExitHandler(ITrigger exitedObject, Collider other) + { + exitedObject.IsInteractable = false; + Debug.Log("Exit"); + } + + #endregion + } + +} \ No newline at end of file diff --git a/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta new file mode 100644 index 000000000..be194d1ba --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/CubeTargetController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 014bbcb03114d5a4b9da1a5d38b109fd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab new file mode 100644 index 000000000..1fa0ee71e --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &886101876341453925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6765509933060648070} + - component: {fileID: -1291708834104649770} + - component: {fileID: -9083391299490380443} + m_Layer: 0 + m_Name: MyObjectWithTag + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6765509933060648070 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -5, z: -30} + 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} +--- !u!65 &-1291708834104649770 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 3, y: 3, z: 3} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &-9083391299490380443 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886101876341453925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6aab3c5bd0711cc4e8603a2a1eaecb74, type: 3} + m_Name: + m_EditorClassIdentifier: + _type: 2 diff --git a/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta new file mode 100644 index 000000000..a806f6d0a --- /dev/null +++ b/Assets/Scripts/ContextTest/TriggerExample/MyObjectWithTag.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4542f4b2eaa8c9448a51df6b129f1951 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs index 58a80c230..bb4af9f60 100644 --- a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs +++ b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs @@ -43,7 +43,7 @@ public void OnAwake() public void TearDown() { - var sphers = _context.GetTriggers(InteractableObjectType.Cube); + var sphers = _context.GetTriggers(InteractableObjectType.Sphere); foreach (var trigger in sphers) { var targetBehaviour = trigger as TargetBehaviour; diff --git a/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab b/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab index 3d0f7a565..90bf819b4 100644 --- a/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab +++ b/Assets/Scripts/ContextTest/TriggerExample/TestObjectWithTag.prefab @@ -26,7 +26,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8946489080760387143} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 100, y: 100, z: 100} + m_LocalPosition: {x: 0, y: -5, z: -30} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -43,7 +43,7 @@ BoxCollider: m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 10, y: 10, z: 10} + m_Size: {x: 3, y: 3, z: 3} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &3876480272811656963 MonoBehaviour: @@ -57,4 +57,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ae350a95eb7c0f94d832b859785bb633, type: 3} m_Name: m_EditorClassIdentifier: - _type: 2 + _type: 1 diff --git a/Assets/Scripts/Contexts/GameContext.cs b/Assets/Scripts/Contexts/GameContext.cs index 2be724574..1f53ad0ee 100644 --- a/Assets/Scripts/Contexts/GameContext.cs +++ b/Assets/Scripts/Contexts/GameContext.cs @@ -13,6 +13,7 @@ public sealed class GameContext : Contexts public DialogueSystemModel DialogueSystemModel; public QuestModel QuestModel; public SphereModel SphereModel; + public CubeModel CubeModel; public CharacterModel CharacterModel; public InputModel InputModel; public GiantMudCrabModel GiantMudCrabModel; diff --git a/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs b/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs index 75138a861..7eb712c07 100644 --- a/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs +++ b/Assets/Scripts/Controllers/BaseControllers/MainControllers.cs @@ -6,10 +6,13 @@ public sealed class MainControllers : ControllersStart public MainControllers(GameContext context) { + Add(new CubeInitilizeController(context)); Add(new SphereInitilizeController(context)); Add(new InitializeInteractableObjectController(context)); + Add(new CubeController(context)); Add(new SphereController(context)); Add(new TargetController(context)); + Add(new CubeTargetController(context)); } #endregion diff --git a/Assets/Scripts/Data/Data.asset b/Assets/Scripts/Data/Data.asset index 79469fc93..14c2f05f8 100644 --- a/Assets/Scripts/Data/Data.asset +++ b/Assets/Scripts/Data/Data.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: Data m_EditorClassIdentifier: _sphereDataPath: SphereData + _cubeDataPath: CubeData _characterDataPath: CharacterData _startDialogueDataPath: StartDialogueData _dialogueSystemDataPath: DialogueSystemData diff --git a/Assets/Scripts/Data/Data.cs b/Assets/Scripts/Data/Data.cs index edc249b06..e4f3a363d 100644 --- a/Assets/Scripts/Data/Data.cs +++ b/Assets/Scripts/Data/Data.cs @@ -7,6 +7,7 @@ public sealed class Data : ScriptableObject { #region Fields [SerializeField] private string _sphereDataPath; + [SerializeField] private string _cubeDataPath; [SerializeField] private string _characterDataPath; [SerializeField] private string _startDialogueDataPath; [SerializeField] private string _dialogueSystemDataPath; @@ -15,6 +16,7 @@ public sealed class Data : ScriptableObject { private static Data _instance; private static SphereData _sphereData; + private static CubeData _cubeData; private static CharacterData _characterData; private static StartDialogueData _startDialogueData; private static DialogueSystemData _dialogueSystemData; @@ -45,6 +47,18 @@ public static SphereData SphereData { } } + public static CubeData CubeData + { + get + { + if (_cubeData == null) + { + _cubeData = Load("Data/" + Instance._cubeDataPath); + } + return _cubeData; + } + } + public static StartDialogueData StartDialogueData { get { if (_startDialogueData == null) { diff --git a/Assets/Scripts/Managers/TagManager.cs b/Assets/Scripts/Managers/TagManager.cs index f28d4ff5a..03d2d0836 100644 --- a/Assets/Scripts/Managers/TagManager.cs +++ b/Assets/Scripts/Managers/TagManager.cs @@ -8,6 +8,7 @@ public static class TagManager public const string SPHERE = "Sphere"; public const string NPC = "NPC"; public const string ENEMY = "Enemy"; + public const string CUBE = "Cube"; #endregion } From 5544fb98aaac5b7323cf9e5a4fbc2bf22b83db22 Mon Sep 17 00:00:00 2001 From: Usov Alexandr Date: Mon, 10 Aug 2020 12:08:56 +0300 Subject: [PATCH 3/4] =?UTF-8?q?=D0=9F=D1=80=D0=B8=20=D1=81=D0=BE=D0=BF?= =?UTF-8?q?=D1=80=D0=B8=D0=BA=D0=BE=D1=81=D0=BD=D0=BE=D0=B2=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B8=20=D0=BA=D1=83=D0=B1=D0=B0=20=D0=B8=20=D1=81=D1=84?= =?UTF-8?q?=D0=B5=D1=80=D1=8B=20=D0=B2=D1=8B=D0=B7=D1=8B=D0=B2=D0=B0=D0=B5?= =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=20OnTrigger?= =?UTF-8?q?EnterHandler?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Cube 1.prefab | 33 +++++++++++++++++++++++- Assets/Resources/Data/CubeData.asset | 2 +- Assets/Resources/Data/NewData.asset | 21 +++++++++++++++ Assets/Resources/Data/NewData.asset.meta | 8 ++++++ Assets/Resources/Sphere.prefab | 14 ++++++++++ 5 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 Assets/Resources/Data/NewData.asset create mode 100644 Assets/Resources/Data/NewData.asset.meta diff --git a/Assets/Resources/Cube 1.prefab b/Assets/Resources/Cube 1.prefab index 86d1db78b..3b30f5550 100644 --- a/Assets/Resources/Cube 1.prefab +++ b/Assets/Resources/Cube 1.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 8503473510655579680} - component: {fileID: 3288890107308790154} - component: {fileID: 8234895440057848186} + - component: {fileID: -6869811681310412184} + - component: {fileID: -6709069460625860324} m_Layer: 0 m_Name: Cube 1 m_TagString: Sphere @@ -86,8 +88,37 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2582259739583959656} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &-6869811681310412184 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + serializedVersion: 2 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &-6709069460625860324 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2582259739583959656} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae350a95eb7c0f94d832b859785bb633, type: 3} + m_Name: + m_EditorClassIdentifier: + _type: 1 diff --git a/Assets/Resources/Data/CubeData.asset b/Assets/Resources/Data/CubeData.asset index 4942b03f9..2332342d0 100644 --- a/Assets/Resources/Data/CubeData.asset +++ b/Assets/Resources/Data/CubeData.asset @@ -19,5 +19,5 @@ MonoBehaviour: CubeZ: 1 Prefab: {fileID: 2582259739583959656, guid: af4361cf94432b3469df69458ea0d76c, type: 3} - Target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, + Target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} diff --git a/Assets/Resources/Data/NewData.asset b/Assets/Resources/Data/NewData.asset new file mode 100644 index 000000000..45b514efe --- /dev/null +++ b/Assets/Resources/Data/NewData.asset @@ -0,0 +1,21 @@ +%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: 11500000, guid: 39206102e2d38334e9e2e92c0876e136, type: 3} + m_Name: NewData + m_EditorClassIdentifier: + SphereStruct: + MoveSpeed: 10 + SphereRadius: 0.7 + Prefab: {fileID: 6953022481052749130, guid: 5486b6c5985f0a74dab7aa0548b222f6, + type: 3} + Target: {fileID: 5978270257095897431, guid: af4361cf94432b3469df69458ea0d76c, + type: 3} diff --git a/Assets/Resources/Data/NewData.asset.meta b/Assets/Resources/Data/NewData.asset.meta new file mode 100644 index 000000000..d07dcfc37 --- /dev/null +++ b/Assets/Resources/Data/NewData.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cddbcf79fda721945ac81b09c7bc68bb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sphere.prefab b/Assets/Resources/Sphere.prefab index 41e21d0ac..a5688a807 100644 --- a/Assets/Resources/Sphere.prefab +++ b/Assets/Resources/Sphere.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 1329212873497443614} - component: {fileID: 3536434929687483153} - component: {fileID: -3301716168195900206} + - component: {fileID: 3346712130273530541} m_Layer: 0 m_Name: Sphere m_TagString: Sphere @@ -108,3 +109,16 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 +--- !u!114 &3346712130273530541 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6953022481052749130} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ae350a95eb7c0f94d832b859785bb633, type: 3} + m_Name: + m_EditorClassIdentifier: + _type: 0 From a56c2dc8f35b954009b017c8c23095d9ca39a956 Mon Sep 17 00:00:00 2001 From: Usov Alexandr Date: Mon, 10 Aug 2020 13:50:09 +0300 Subject: [PATCH 4/4] =?UTF-8?q?=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=BE?= =?UTF-8?q?=20=D1=83=D0=BD=D0=B8=D1=87=D1=82=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=81=D1=84=D0=B5=D1=80=D1=8B=20=D0=BA=D1=83=D0=B1?= =?UTF-8?q?=D0=BE=D0=BC.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Resources/Data/NewData.asset | 21 -- Assets/Resources/Data/NewData.asset.meta | 8 - Assets/Scenes/ITickTest.unity | 179 +----------------- .../TriggerExample/TargetController.cs | 3 +- 4 files changed, 3 insertions(+), 208 deletions(-) delete mode 100644 Assets/Resources/Data/NewData.asset delete mode 100644 Assets/Resources/Data/NewData.asset.meta diff --git a/Assets/Resources/Data/NewData.asset b/Assets/Resources/Data/NewData.asset deleted file mode 100644 index 45b514efe..000000000 --- a/Assets/Resources/Data/NewData.asset +++ /dev/null @@ -1,21 +0,0 @@ -%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: 11500000, guid: 39206102e2d38334e9e2e92c0876e136, type: 3} - m_Name: NewData - m_EditorClassIdentifier: - SphereStruct: - MoveSpeed: 10 - SphereRadius: 0.7 - Prefab: {fileID: 6953022481052749130, guid: 5486b6c5985f0a74dab7aa0548b222f6, - type: 3} - Target: {fileID: 5978270257095897431, guid: af4361cf94432b3469df69458ea0d76c, - type: 3} diff --git a/Assets/Resources/Data/NewData.asset.meta b/Assets/Resources/Data/NewData.asset.meta deleted file mode 100644 index d07dcfc37..000000000 --- a/Assets/Resources/Data/NewData.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: cddbcf79fda721945ac81b09c7bc68bb -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/ITickTest.unity b/Assets/Scenes/ITickTest.unity index 15332f788..cbc751954 100644 --- a/Assets/Scenes/ITickTest.unity +++ b/Assets/Scenes/ITickTest.unity @@ -197,7 +197,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 491791065} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -40} + m_LocalPosition: {x: 2.99, y: -2.78, z: -40} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -294,12 +294,6 @@ Transform: m_Father: {fileID: 1660409117} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} ---- !u!4 &830931368 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - m_PrefabInstance: {fileID: 1702169673} - m_PrefabAsset: {fileID: 0} --- !u!1 &957419076 GameObject: m_ObjectHideFlags: 0 @@ -474,12 +468,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1202879470 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - m_PrefabInstance: {fileID: 8946489081774226858} - m_PrefabAsset: {fileID: 0} --- !u!1 &1660409116 GameObject: m_ObjectHideFlags: 0 @@ -509,100 +497,9 @@ Transform: m_Children: - {fileID: 957419079} - {fileID: 567869892} - - {fileID: 1202879470} - - {fileID: 830931368} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1702169673 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1660409117} - m_Modifications: - - target: {fileID: -9083391299490380443, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: _type - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_Size.x - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_Size.y - value: 3 - objectReference: {fileID: 0} - - target: {fileID: -1291708834104649770, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_Size.z - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 886101876341453925, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_Name - value: MyObjectWithTag - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.41 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalPosition.y - value: -2.65 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalPosition.z - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6765509933060648070, guid: 4542f4b2eaa8c9448a51df6b129f1951, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 4542f4b2eaa8c9448a51df6b129f1951, type: 3} --- !u!1001 &298787223296447112 PrefabInstance: m_ObjectHideFlags: 0 @@ -672,77 +569,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1b6a3f690f6fb1640899bb836ac4ecde, type: 3} ---- !u!1001 &8946489081774226858 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1660409117} - m_Modifications: - - target: {fileID: 8946489080760387143, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_Name - value: TestObjectWithTag - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalPosition.x - value: -0.66 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalPosition.y - value: -1.71 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8946489080760387140, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3876480272811656963, guid: ad328408c8cfe1c4e8ec1b92ff795e48, - type: 3} - propertyPath: _type - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad328408c8cfe1c4e8ec1b92ff795e48, type: 3} diff --git a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs index bb4af9f60..49d7d2d51 100644 --- a/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs +++ b/Assets/Scripts/ContextTest/TriggerExample/TargetController.cs @@ -66,7 +66,8 @@ private bool OnFilterHandler(Collider tagObject) private void OnTriggerEnterHandler(ITrigger enteredObject, Collider other) { enteredObject.IsInteractable = true; - Debug.Log("Enter"); + Debug.Log("Object collapsed"); + other.gameObject.SetActive(false); } private void OnTriggerExitHandler(ITrigger exitedObject, Collider other)