From 7f63d498b4484e3ea0bf74187282ea357ac381af Mon Sep 17 00:00:00 2001 From: "r.nikolin" Date: Thu, 26 Oct 2023 12:38:04 +0300 Subject: [PATCH] fix enemy dissapear +fix vibration after finish --- Assets/Prefabs/GAME.prefab | 162 +++++++++++++++++++++++++++++--- Assets/Scripts/ShipMoveSides.cs | 3 + 2 files changed, 151 insertions(+), 14 deletions(-) diff --git a/Assets/Prefabs/GAME.prefab b/Assets/Prefabs/GAME.prefab index 1dec6aad..0838f80d 100644 --- a/Assets/Prefabs/GAME.prefab +++ b/Assets/Prefabs/GAME.prefab @@ -12483,6 +12483,7 @@ MonoBehaviour: - {fileID: 7810815473707152514} - {fileID: 3022207593854559841} - {fileID: 4598394685605972855} + - {fileID: 4367238180731121560} _rawSamples: - position: {x: 0, y: 0, z: 0} up: {x: -0.21082889, y: 0.9770221, z: 0.031289253} @@ -13429,8 +13430,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1352652685726883887} - m_LocalRotation: {x: 0.030902436, y: 0.107881196, z: 0.10411949, w: 0.9882135} - m_LocalPosition: {x: 3.4778132, y: -4.669351, z: 11.286938} + m_LocalRotation: {x: 0.03096134, y: 0.10783966, z: 0.10410981, w: 0.9882172} + m_LocalPosition: {x: 3.5819228, y: -4.688306, z: 11.749384} m_LocalScale: {x: 6, y: 6, z: 6} m_ConstrainProportionsScale: 0 m_Children: @@ -13525,19 +13526,19 @@ MonoBehaviour: targetRigidbody2D: {fileID: 0} targetTransform: {fileID: 397953845580526555} _result: - position: {x: 2.5719683, y: -0.46794748, z: 11.419818} - up: {x: -0.21066162, y: 0.9770705, z: 0.0309023} - forward: {x: 0.21228275, y: -0.003147278, z: 0.97720325} + position: {x: 2.6761057, y: -0.48689437, z: 11.882199} + up: {x: -0.21065511, y: 0.9770725, z: 0.030887194} + forward: {x: 0.21221419, y: -0.0032746978, z: 0.9772177} color: {r: 1, g: 1, b: 1, a: 1} size: 1 - percent: 0.0012715326248261861 + percent: 0.0013230171028299174 _finalResult: - position: {x: 2.5719683, y: -0.46794748, z: 11.419818} - up: {x: -0.21066162, y: 0.9770705, z: 0.0309023} - forward: {x: 0.21228275, y: -0.003147278, z: 0.97720325} + position: {x: 2.6761057, y: -0.48689437, z: 11.882199} + up: {x: -0.21065511, y: 0.9770725, z: 0.030887194} + forward: {x: 0.21221419, y: -0.0032746978, z: 0.9772177} color: {r: 1, g: 1, b: 1, a: 1} size: 1 - percent: 0.0012715326248261861 + percent: 0.0013230171028299174 _mode: 1 _autoProject: 1 _subdivide: 4 @@ -13546,7 +13547,7 @@ MonoBehaviour: _targetObject: {fileID: 1352652685726883887} _offset: {x: 0, y: 0} _rotationOffset: {x: 0, y: 0, z: 0} - lastPosition: {x: 3.4778132, y: -4.669351, z: 11.286938} + lastPosition: {x: 3.5819228, y: -4.688306, z: 11.749384} --- !u!1 &2208235562426114317 GameObject: m_ObjectHideFlags: 0 @@ -15529,6 +15530,36 @@ PrefabInstance: propertyPath: _result.position.z value: 44.905704 objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7446942640491039761} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7421859052776871299, guid: 162a6826d3d37014bb387f93073fa8a2, type: 3} propertyPath: m_RootOrder @@ -15620,13 +15651,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a999d2ed4a80a51408fe4a7b22f36307, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7446942640491039761 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7421859052776871300, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + m_PrefabInstance: {fileID: 119177836486842773} + m_PrefabAsset: {fileID: 0} --- !u!114 &7446942640491039764 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, type: 3} m_PrefabInstance: {fileID: 119177836486842773} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 7446942640491039761} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4ddc1a2536715a24095c464a2c394d5d, type: 3} @@ -16722,6 +16759,66 @@ PrefabInstance: propertyPath: _finalResult.position.z value: 134.71712 objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7781972690152431043} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7781972690152431043} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 7781972690152431043} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7421859052776871299, guid: 162a6826d3d37014bb387f93073fa8a2, type: 3} propertyPath: m_RootOrder @@ -16801,6 +16898,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6953b8e14a3f3c440989f27f67aaf8fd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &7781972690152431043 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7421859052776871300, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + m_PrefabInstance: {fileID: 936928570047711303} + m_PrefabAsset: {fileID: 0} --- !u!4 &7781972690152431044 stripped Transform: m_CorrespondingSourceObject: {fileID: 7421859052776871299, guid: 162a6826d3d37014bb387f93073fa8a2, @@ -16813,7 +16916,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 936928570047711303} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 7781972690152431043} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4ddc1a2536715a24095c464a2c394d5d, type: 3} @@ -25962,6 +26065,31 @@ PrefabInstance: propertyPath: _finalResult.position.z value: 89.81141 objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 2920346420997411970} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 7421859052776871297, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + propertyPath: _unityOnEndReached.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 7421859052776871299, guid: 162a6826d3d37014bb387f93073fa8a2, type: 3} propertyPath: m_RootOrder @@ -26053,6 +26181,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a999d2ed4a80a51408fe4a7b22f36307, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2920346420997411970 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7421859052776871300, guid: 162a6826d3d37014bb387f93073fa8a2, + type: 3} + m_PrefabInstance: {fileID: 5654439639317610758} + m_PrefabAsset: {fileID: 0} --- !u!4 &2920346420997411973 stripped Transform: m_CorrespondingSourceObject: {fileID: 7421859052776871299, guid: 162a6826d3d37014bb387f93073fa8a2, @@ -26065,7 +26199,7 @@ MonoBehaviour: type: 3} m_PrefabInstance: {fileID: 5654439639317610758} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 2920346420997411970} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4ddc1a2536715a24095c464a2c394d5d, type: 3} diff --git a/Assets/Scripts/ShipMoveSides.cs b/Assets/Scripts/ShipMoveSides.cs index 01c51733..6b476bdf 100644 --- a/Assets/Scripts/ShipMoveSides.cs +++ b/Assets/Scripts/ShipMoveSides.cs @@ -93,6 +93,9 @@ public class ShipMoveSides : MonoBehaviour if (Mathf.Abs(newPos.x) == _radius) { + if (!_isEnable) + return; + OnEdgeRiched?.Invoke(); }