diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 0fae68d8..0a6036eb 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,11 +6,15 @@ - - - - - + + + + + + + + + - @@ -73,7 +77,7 @@ } - - + - @@ -176,6 +179,7 @@ + diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 5a9d18ad..18efd4f0 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -68,7 +68,7 @@ MonoBehaviour: forwardRayLength: 10 obstacleLayer: serializedVersion: 2 - m_Bits: 128 + m_Bits: 0 heightRayLength: 0 interactionOffset: {x: 0, y: 1.5, z: 0} interactionRadius: 0.5 @@ -592,9 +592,6 @@ MonoBehaviour: k__BackingField: serializedVersion: 2 m_Bits: 0 - _IsGrounded: 0 - _WasGrounded: 0 - _VelocityY: 0 _NetworkedPosition: {x: 0, y: 0, z: 0} --- !u!114 &7730391503324595278 MonoBehaviour: @@ -611,7 +608,10 @@ MonoBehaviour: speedParamName: Speed velocityXParamName: Velocity X velocityZParamName: Velocity Z + groundedParamName: Grounded animationDamping: 0.2 + visualOffsetY: 0 + modelTransform: {fileID: 0} --- !u!1 &2962936552048247184 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Cho môn AI/Only AI.unity b/Assets/Scenes/Cho môn AI/Only AI.unity index 58ea56b3..b1240d5d 100644 --- a/Assets/Scenes/Cho môn AI/Only AI.unity +++ b/Assets/Scenes/Cho môn AI/Only AI.unity @@ -42104,6 +42104,37 @@ Transform: m_Children: [] m_Father: {fileID: 333057066} m_LocalEulerAnglesHint: {x: 0, y: -45, z: 90} +--- !u!1 &348410791 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 348410792} + m_Layer: 0 + m_Name: SpawnPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &348410792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 348410791} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 5.7248, y: 1.5, z: -32.50002} + 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!1 &365978100 GameObject: m_ObjectHideFlags: 0 @@ -98903,128 +98934,6 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 ---- !u!1001 &779176738 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -5076913349690967641, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: SortKey - value: 2747909713 - objectReference: {fileID: 0} - - target: {fileID: 1054594849095937263, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalPosition.x - value: 0.9289999 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalPosition.z - value: -28 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3154409663696148700, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5811177247042239962, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} - propertyPath: obstacleLayer.m_Bits - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 761bdf2e5c0cff4488527355acb975e5, type: 3} ---- !u!1001 &788944362 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalPosition.x - value: 18.5 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalPosition.y - value: 9.14399 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalPosition.z - value: -38.84505 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207112960010484425, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2771692228748849855, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} - propertyPath: m_Name - value: Main Camera - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fb7874830b9e56341bf88f2a1123c677, type: 3} --- !u!1 &796819780 GameObject: m_ObjectHideFlags: 0 @@ -127102,6 +127011,66 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!1 &1098531124 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1098531126} + - component: {fileID: 1098531125} + m_Layer: 0 + m_Name: GameController + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1098531125 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098531124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f8a5c95eb7ab7db4f9f2151bae646701, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Invector.vGameController + openCloseEvents: 0 + openCloseWindow: 0 + selectedToolbar: 0 + playerPrefab: {fileID: 146720, guid: 092f8aa667b2004459042a82a4c9e41d, type: 3} + spawnPoint: {fileID: 348410792} + respawnTimer: 4 + destroyBodyAfterDead: 0 + displayInfoInFadeText: 1 + OnReloadGame: + m_PersistentCalls: + m_Calls: [] + currentPlayer: {fileID: 0} + onSpawn: + m_PersistentCalls: + m_Calls: [] + dontDestroyOnLoad: 1 +--- !u!4 &1098531126 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1098531124} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -16.49995, y: 10.56881, z: 19.27294} + 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!1 &1143870345 GameObject: m_ObjectHideFlags: 0 @@ -138503,6 +138472,85 @@ Mesh: - serializedVersion: 1 m_IndexStart: 0 m_IndexCount: 0 +--- !u!1 &1793734342 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1793734345} + - component: {fileID: 1793734344} + - component: {fileID: 1793734343} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1793734343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793734342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.UI.InputSystemUIInputModule + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 + m_ScrollDeltaPerTick: 6 +--- !u!114 &1793734344 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793734342} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: UnityEngine.UI::UnityEngine.EventSystems.EventSystem + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1793734345 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793734342} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + 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!43 &1820026756 Mesh: m_ObjectHideFlags: 0 @@ -142099,7 +142147,8 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 678938550} - - {fileID: 788944362} - - {fileID: 779176738} - {fileID: 333057066} - {fileID: 460076050} + - {fileID: 1098531126} + - {fileID: 348410792} + - {fileID: 1793734345} diff --git a/Assets/Scripts/AI NPC/GerminiNPC.cs b/Assets/Scripts/AI NPC/GerminiNPC.cs index b9215061..394ca510 100644 --- a/Assets/Scripts/AI NPC/GerminiNPC.cs +++ b/Assets/Scripts/AI NPC/GerminiNPC.cs @@ -28,7 +28,8 @@ public class GeminiResponse { public Candidate[] candidates; } -public class GerminiNPC :MonoBehaviour + +public class GerminiNPC : MonoBehaviour { [SerializeField] private string apiKey = "AQ.Ab8RN6I2hU_p8yHiPNNHtWzYBiLugbPP22gC6lzTWaYEWj4v0g"; @@ -37,46 +38,96 @@ public class GerminiNPC :MonoBehaviour "https://generativelanguage.googleapis.com/v1beta/models/gemini-flash-latest:generateContent"; public string npcPersona = - $"Nguơi là ột thợ lão thợ rèn cọc cằn tên là TOm,ngươi rất ghét những kẻ mang phế liệu đến tiệm của mình.Ch trả lời ngắn gọn trong 2 câu,theo phong cách trung cổ"; + "Ngươi là một lão thợ rèn cọc cằn tên là Tom, ngươi rất ghét những kẻ mang phế liệu đến tiệm của mình. Chỉ trả lời ngắn gọn trong 2 câu, theo phong cách trung cổ."; public string playerHeldItem = "Thanh kiếm rỉ sét"; + public float interactionDistance = 5f; // Khoảng cách tối đa để nói chuyện + public Transform playerTransform; // Gán transform của Player vào đây private void Update() { - if (Keyboard.current.spaceKey.wasPressedThisFrame) + if (Keyboard.current != null && Keyboard.current.fKey.wasPressedThisFrame) { - StartCoroutine(GetGerminiReponse()); + if (CanSeePlayer()) + { + StartCoroutine(GetGerminiReponse()); + } + else + { + Debug.Log("Hệ thống: Bạn ở quá xa hoặc bị tường che khuất!"); + } } } + private bool CanSeePlayer() + { + if (playerTransform == null) + { + // Tự tìm player nếu chưa gán + GameObject player = GameObject.FindGameObjectWithTag("Player"); + if (player != null) playerTransform = player.transform; + else return false; + } + + // 1. Check khoảng cách + float dist = Vector3.Distance(transform.position, playerTransform.position); + if (dist > interactionDistance) return false; + + // 2. Check xem có bị tường che không (Raycast) + Vector3 direction = (playerTransform.position + Vector3.up) - (transform.position + Vector3.up); + RaycastHit hit; + if (Physics.Raycast(transform.position + Vector3.up, direction, out hit, interactionDistance)) + { + if (hit.collider.CompareTag("Player") || hit.collider.transform.IsChildOf(playerTransform)) + { + return true; // Thấy đầu/người player + } + } + + return false; + } + private IEnumerator GetGerminiReponse() { - var jsonBody = $@"{{""systemInstruction"": {{""parts"": [{{ ""text"": ""{npcPersona}"" }}]}}, - ""contents"": [{{""parts"": [{{ ""text"": ""Ta muốn bán cho ông món đồ này cho ông {playerHeldItem}""}}]}}] }} "; - var requestURL = $"{germiniURL}?ket={apiKey}"; - using (var request = new UnityWebRequest(germiniURL, "POST")) + var jsonBody = $@"{{ + ""systemInstruction"": {{""parts"": [{{ ""text"": ""{npcPersona}"" }}]}}, + ""contents"": [{{""parts"": [{{ ""text"": ""Ta muốn bán cho ông món đồ này: {playerHeldItem}""}}]}}] + }}"; + + // 1. Sửa tham số thành ?key= (trước đó là ?ket=) + var requestURL = $"{germiniURL}?key={apiKey}"; + + // 2. Sử dụng requestURL (có chứa key) thay vì germiniURL gốc + using (var request = new UnityWebRequest(requestURL, "POST")) { var bodyRaw = Encoding.UTF8.GetBytes(jsonBody); request.uploadHandler = new UploadHandlerRaw(bodyRaw); request.downloadHandler = new DownloadHandlerBuffer(); request.SetRequestHeader("Content-Type", "application/json"); + yield return request.SendWebRequest(); - if (request.result == UnityWebRequest.Result.ProtocolError) + + if (request.result == UnityWebRequest.Result.ProtocolError || request.result == UnityWebRequest.Result.ConnectionError) { - Debug.LogError(request.error); + Debug.LogError($"[Gemini Error] {request.error} - Response: {request.downloadHandler.text}"); } else { var responseTEXT = request.downloadHandler.text; - var germiniResponse=JsonUtility.FromJson(responseTEXT); - if (germiniResponse.candidates.Length > 0) + try { - var npcResponse = germiniResponse.candidates[0].content.parts[0].text; - Debug.Log(npcResponse); + var geminiResponse = JsonUtility.FromJson(responseTEXT); + if (geminiResponse != null && geminiResponse.candidates != null && geminiResponse.candidates.Length > 0) + { + var npcResponse = geminiResponse.candidates[0].content.parts[0].text; + Debug.Log($"Tom: {npcResponse}"); + } + } + catch (Exception e) + { + Debug.LogError($"[JSON Parse Error] {e.Message}"); } } } } } - - diff --git a/Assets/Settings/InputSystem_Actions.inputactions b/Assets/Settings/InputSystem_Actions.inputactions index b58dead7..481f03a5 100644 --- a/Assets/Settings/InputSystem_Actions.inputactions +++ b/Assets/Settings/InputSystem_Actions.inputactions @@ -255,7 +255,7 @@ "id": "8c8e490b-c610-4785-884f-f04217b23ca4", "path": "/delta", "interactions": "", - "processors": "", + "processors": "ScaleVector2(x=0.01,y=0.01)", "groups": ";Keyboard&Mouse;Touch", "action": "Look", "isComposite": false, diff --git a/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs b/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs index 31a2b6d1..eed7e739 100644 --- a/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs +++ b/Assets/Third Parties/Invector-3rdPersonController/Basic Locomotion/Scripts/CharacterController/vThirdPersonInput.cs @@ -616,8 +616,8 @@ namespace Invector.vCharacterController // var Y = lockCameraInput ? 0f : rotateCameraYInput.GetAxis(); // var X = lockCameraInput ? 0f : rotateCameraXInput.GetAxis(); - var Y = lockCameraInput ? 0f : inputReader.LookInput.y; - var X = lockCameraInput ? 0f : inputReader.LookInput.x; + var Y = lockCameraInput ? 0f : inputReader.LookInput.y * tpCamera.currentState.yMouseSensitivity; + var X = lockCameraInput ? 0f : inputReader.LookInput.x * tpCamera.currentState.xMouseSensitivity; if (invertCameraInputHorizontal) X *= -1; if (invertCameraInputVertical) Y *= -1; diff --git a/Assets/Third Parties/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs b/Assets/Third Parties/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs index fff544a4..83cbc09c 100644 --- a/Assets/Third Parties/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs +++ b/Assets/Third Parties/Invector-3rdPersonController/Melee Combat/Scripts/CharacterController/vMeleeCombatInput.cs @@ -155,7 +155,7 @@ namespace Invector.vCharacterController } // isBlocking = blockInput.GetButton() && cc.currentStamina > 0 && !cc.customAction && !isAttacking; - isBlocking = inputReader.IsBlockHeld && cc.currentStamina > 0 && !cc.customAction && !isAttacking; + isBlocking = inputReader != null && inputReader.IsBlockHeld && cc.currentStamina > 0 && !cc.customAction && !isAttacking; } /// diff --git a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Prefabs/Player/vShooterMelee_Inventory.prefab b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Prefabs/Player/vShooterMelee_Inventory.prefab index 2688bd79..959998a6 100644 --- a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Prefabs/Player/vShooterMelee_Inventory.prefab +++ b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Prefabs/Player/vShooterMelee_Inventory.prefab @@ -24,8 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 100128} serializedVersion: 2 - m_LocalRotation: {x: 0.000000011175872, y: 0.000000011175872, z: 0.000000056810677, - w: 1} + m_LocalRotation: {x: 0.000000011175872, y: 0.000000011175872, z: 0.000000056810677, w: 1} m_LocalPosition: {x: 0.12360834, y: 3.4833553, z: -0.0000096559515} m_LocalScale: {x: 1, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -89,8 +88,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101008} serializedVersion: 2 - m_LocalRotation: {x: -0.000000040627246, y: -0.000000007421774, z: 0.0000000014611032, - w: 1} + m_LocalRotation: {x: -0.000000040627246, y: -0.000000007421774, z: 0.0000000014611032, w: 1} m_LocalPosition: {x: -0.000018931923, y: 3.1309967, z: -0.000009484588} m_LocalScale: {x: 1, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -154,8 +152,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 101282} serializedVersion: 2 - m_LocalRotation: {x: -0.0000007118655, y: -0.00000040345734, z: -0.00024250762, - w: 1} + m_LocalRotation: {x: -0.0000007118655, y: -0.00000040345734, z: -0.00024250762, w: 1} m_LocalPosition: {x: 0.000864461, y: 3.5615304, z: -0.000015171244} m_LocalScale: {x: 1, y: 0.99999994, z: 1} m_ConstrainProportionsScale: 0 @@ -263,10 +260,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 104698} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -290,13 +287,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 104698} + serializedVersion: 3 m_ConnectedBody: {fileID: 5466220} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -0.00023205648, y: 21.022522, z: -0.33007088} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -485,8 +482,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 108300} serializedVersion: 2 - m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, - w: 1} + m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.009999999, z: 0.01} m_ConstrainProportionsScale: 0 @@ -510,6 +506,11 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -537,9 +538,11 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -710,8 +713,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 108968} serializedVersion: 2 - m_LocalRotation: {x: -0.000000012223608, y: -0.000004991947, z: 0.00000046117927, - w: 1} + m_LocalRotation: {x: -0.000000012223608, y: -0.000004991947, z: 0.00000046117927, w: 1} m_LocalPosition: {x: -0.000001521781, y: 6.2084913, z: 0.00000005960464} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -817,10 +819,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 109424} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -844,13 +846,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 109424} + serializedVersion: 3 m_ConnectedBody: {fileID: 5474386} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 18.556309, y: 21.897703, z: 0.007988129} - serializedVersion: 2 m_SwingAxis: {x: -1, y: 0, z: 0} m_TwistLimitSpring: spring: 0 @@ -1338,8 +1340,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 117256} serializedVersion: 2 - m_LocalRotation: {x: 0.00000000842556, y: 0.000000092695934, z: 0.00000008829295, - w: 1} + m_LocalRotation: {x: 0.00000000842556, y: 0.000000092695934, z: 0.00000008829295, w: 1} m_LocalPosition: {x: 0.008346348, y: 2.918003, z: -0.0000014519318} m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -1402,8 +1403,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 118422} serializedVersion: 2 - m_LocalRotation: {x: -0.00000003355308, y: -7.557048e-10, z: -0.000000006678988, - w: 1} + m_LocalRotation: {x: -0.00000003355308, y: -7.557048e-10, z: -0.000000006678988, w: 1} m_LocalPosition: {x: -0.010218023, y: 3.6506317, z: -0.000012870877} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1509,10 +1509,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 119484} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1536,13 +1536,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 119484} + serializedVersion: 3 m_ConnectedBody: {fileID: 5466220} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 10.9206705, y: -5.397657, z: 1.6830531} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -1638,8 +1638,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121484} serializedVersion: 2 - m_LocalRotation: {x: -0.00000017530357, y: 0.00000047677122, z: -0.000014443002, - w: 1} + m_LocalRotation: {x: -0.00000017530357, y: 0.00000047677122, z: -0.000014443002, w: 1} m_LocalPosition: {x: 0.00019899552, y: 104.913734, z: -1.9585699} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1677,10 +1676,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121484} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1801,10 +1800,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121962} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -1828,13 +1827,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121962} + serializedVersion: 3 m_ConnectedBody: {fileID: 5414974} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -0.000041455965, y: 28.777182, z: 0.000007629396} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: spring: 0 @@ -2087,10 +2086,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123198} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2114,13 +2113,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123198} + serializedVersion: 3 m_ConnectedBody: {fileID: 5458202} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0.00000851848, y: 46.44298, z: -0.000041364743} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -2339,10 +2338,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123550} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -2366,13 +2365,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 123550} + serializedVersion: 3 m_ConnectedBody: {fileID: 5466220} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -10.920569, y: -5.3976474, z: 1.9481388} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -2847,8 +2846,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 138438} serializedVersion: 2 - m_LocalRotation: {x: 0.0000000027521878, y: -9.31788e-10, z: -0.000000019734088, - w: 1} + m_LocalRotation: {x: 0.0000000027521878, y: -9.31788e-10, z: -0.000000019734088, w: 1} m_LocalPosition: {x: 0.004042044, y: 2.2874355, z: 0.0000013776297} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3025,10 +3023,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142880} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -3052,13 +3050,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142880} + serializedVersion: 3 m_ConnectedBody: {fileID: 5415908} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: -1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -0.00001668796, y: 46.442314, z: -0.00003570318} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -3273,6 +3271,8 @@ GameObject: - component: {fileID: 114525927984870190} - component: {fileID: 832688648} - component: {fileID: 6688537537024804213} + - component: {fileID: -3829962440237222997} + - component: {fileID: -3602722895466718484} m_Layer: 8 m_Name: vShooterMelee_Inventory m_TagString: Player @@ -3299,7 +3299,7 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: -450, z: 0} --- !u!95 &9513224 Animator: - serializedVersion: 5 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3313,6 +3313,7 @@ Animator: m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 + m_AnimatePhysics: 1 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 @@ -3331,8 +3332,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: openCloseEvents: 1 - openCloseWindow: 0 - selectedToolbar: 1 + openCloseWindow: 1 + selectedToolbar: 2 _isDead: 1 _currentHealth: 0 isImmortal: 0 @@ -3504,7 +3505,7 @@ MonoBehaviour: _isGrounded: 0 groundLayer: serializedVersion: 2 - m_Bits: 1 + m_Bits: 64 groundMinDistance: 0.1 groundMaxDistance: 0.5 sphereCastRadius: 0.3 @@ -3561,174 +3562,15 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: openCloseEvents: 0 - openCloseWindow: 0 + openCloseWindow: 1 selectedToolbar: 0 unlockCursorOnStart: 0 showCursorOnStart: 0 toggleWalk: 301 - horizontalInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Horizontal - keyboardAxis: 0 - joystick: LeftAnalogHorizontal - joystickAxis: 0 - mobile: Horizontal - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - verticalInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Vertical - keyboardAxis: 0 - joystick: LeftAnalogVertical - joystickAxis: 0 - mobile: Vertical - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - sprintInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: LeftShift - keyboardAxis: 0 - joystick: LeftStickClick - joystickAxis: 0 - mobile: LeftStickClick - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - crouchInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: C - keyboardAxis: 0 - joystick: Y - joystickAxis: 0 - mobile: Y - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - strafeInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Tab - keyboardAxis: 0 - joystick: RightStickClick - joystickAxis: 0 - mobile: RightStickClick - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - jumpInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Space - keyboardAxis: 0 - joystick: X - joystickAxis: 0 - mobile: X - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - rollInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Q - keyboardAxis: 0 - joystick: B - joystickAxis: 0 - mobile: B - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 + inputReader: {fileID: -3829962440237222997} lockCameraInput: 0 invertCameraInputVertical: 0 invertCameraInputHorizontal: 0 - rotateCameraXInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Mouse X - keyboardAxis: 0 - joystick: RightAnalogHorizontal - joystickAxis: 0 - mobile: Mouse X - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - rotateCameraYInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Mouse Y - keyboardAxis: 0 - joystick: RightAnalogVertical - joystickAxis: 0 - mobile: Mouse Y - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 - cameraZoomInput: - useInput: 1 - isAxisInUse: 0 - isUnityInput: 0 - keyboard: Mouse ScrollWheel - keyboardAxis: 0 - joystick: - joystickAxis: 0 - mobile: - mobileAxis: 0 - joystickAxisInvert: 0 - keyboardAxisInvert: 0 - mobileAxisInvert: 0 - timeButtonWasPressed: 0 - lastTimeTheButtonWasPressed: 0 - inButtomTimer: 0 OnLockCamera: m_PersistentCalls: m_Calls: [] @@ -3887,10 +3729,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 146720} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 50 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -5114,6 +4956,261 @@ MonoBehaviour: defaultDamageEffects: - {fileID: 120346, guid: b8f2fe1ee1a01724cb72f5b0e6bd2eef, type: 3} customDamageEffects: [] +--- !u!114 &-3829962440237222997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5962d8f2c8e40e240a4a4907c7b539fa, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.InputReader + inputActions: {fileID: -944628639613478452, guid: ac73bbdc8e64ac34c9525df400c1534f, type: 3} +--- !u!114 &-3602722895466718484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 146720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput + m_Actions: {fileID: -944628639613478452, guid: ac73bbdc8e64ac34c9525df400c1534f, type: 3} + m_NotificationBehavior: 2 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnMove + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 351f2ccd-1f9f-44bf-9bec-d62ac5c5f408 + m_ActionName: 'Player/Move[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnLook + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 6b444451-8a00-4d00-a97e-f47457f736a8 + m_ActionName: 'Player/Look[/Mouse/delta]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnAttack + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 6c2ab1b8-8984-453a-af3d-a3c78ae1679a + m_ActionName: 'Player/Attack[/Mouse/leftButton,/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnAttack + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 852140f2-7766-474d-8707-702459ba45f3 + m_ActionName: 'Player/Interact[/Keyboard/e]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnCrouch + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 27c5f898-bc57-4ee1-8800-db469aca5fe3 + m_ActionName: 'Player/Crouch[/Keyboard/c]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnJump + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: f1ba0d36-48eb-4cd5-b651-1c94a6531f70 + m_ActionName: 'Player/Jump[/Keyboard/space]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnPrevious + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 2776c80d-3c14-4091-8c56-d04ced07a2b0 + m_ActionName: 'Player/Previous[/Keyboard/1]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnNext + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba + m_ActionName: 'Player/Next[/Keyboard/2]' + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: -3829962440237222997} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnSprint + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 641cd816-40e6-41b4-8c3d-04687c349290 + m_ActionName: 'Player/Sprint[/Keyboard/leftShift]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: c95b2375-e6d9-4b88-9c4c-c5e76515df4b + m_ActionName: 'UI/Navigate[/Keyboard/w,/Keyboard/upArrow,/Keyboard/s,/Keyboard/downArrow,/Keyboard/a,/Keyboard/leftArrow,/Keyboard/d,/Keyboard/rightArrow]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7607c7b6-cd76-4816-beef-bd0341cfe950 + m_ActionName: 'UI/Submit[/Keyboard/enter]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 15cef263-9014-4fd5-94d9-4e4a6234a6ef + m_ActionName: 'UI/Cancel[/Keyboard/escape]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 32b35790-4ed0-4e9a-aa41-69ac6d629449 + m_ActionName: 'UI/Point[/Mouse/position]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 3c7022bf-7922-4f7c-a998-c437916075ad + m_ActionName: 'UI/Click[/Mouse/leftButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 44b200b1-1557-4083-816c-b22cbdf77ddf + m_ActionName: 'UI/RightClick[/Mouse/rightButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: dad70c86-b58c-4b17-88ad-f5e53adf419e + m_ActionName: 'UI/MiddleClick[/Mouse/middleButton]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 0489e84a-4833-4c40-bfae-cea84b696689 + m_ActionName: 'UI/ScrollWheel[/Mouse/scroll]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 24908448-c609-4bc3-a128-ea258674378a + m_ActionName: UI/TrackedDevicePosition + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 9caa3d8a-6b2f-4e8e-8bad-6ede561bd9be + m_ActionName: UI/TrackedDeviceOrientation + - m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: OnlyScove.Scripts.InputReader, Assembly-CSharp + m_MethodName: OnScroll + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 + m_ActionId: 1702ffae-5ad3-4532-9855-bf7e2a8ae749 + m_ActionName: 'Player/Scroll[/Mouse/scroll]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 7e8b9416-0a2d-4652-98d8-e7368560ede9 + m_ActionName: 'Player/ToggleView[/Keyboard/f2]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: ae29d662-c797-4411-8ff3-8b5ad78427d8 + m_ActionName: 'UI/ToggleSetting[/Keyboard/leftCtrl,/Keyboard/g]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 79227a8d-6fd2-496d-8466-68f007a2c355 + m_ActionName: 'UI/Escape[/Keyboard/escape]' + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} --- !u!1 &149606 GameObject: m_ObjectHideFlags: 0 @@ -5234,8 +5331,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 156262} serializedVersion: 2 - m_LocalRotation: {x: -0.000000027357602, y: 0.000034474506, z: -0.0000000888831, - w: 1} + m_LocalRotation: {x: -0.000000027357602, y: 0.000034474506, z: -0.0000000888831, w: 1} m_LocalPosition: {x: 0.000000996515, y: 6.241361, z: -0.00000017881392} m_LocalScale: {x: 1, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -5268,8 +5364,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 156450} serializedVersion: 2 - m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, - w: 1} + m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.009999999, z: 0.01} m_ConstrainProportionsScale: 0 @@ -5293,6 +5388,11 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5320,9 +5420,11 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -5468,10 +5570,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157270} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -5495,13 +5597,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157270} + serializedVersion: 3 m_ConnectedBody: {fileID: 5462482} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0.000010669232, y: 28.782848, z: 0.000016212462} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: -1} m_TwistLimitSpring: spring: 0 @@ -5710,8 +5812,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161228} serializedVersion: 2 - m_LocalRotation: {x: -0.000000001862645, y: -0.0000000037252899, z: 0.000000028870998, - w: 1} + m_LocalRotation: {x: -0.000000001862645, y: -0.0000000037252899, z: 0.000000028870998, w: 1} m_LocalPosition: {x: -0.18034028, y: 3.4578032, z: -0.00000989437} m_LocalScale: {x: 1.0000001, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5783,10 +5884,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161828} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -5810,13 +5911,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161828} + serializedVersion: 3 m_ConnectedBody: {fileID: 5474386} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 1, y: 0, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0.00009329167, y: 33.153046, z: 2.5031934} - serializedVersion: 2 m_SwingAxis: {x: 0, y: 0, z: 1} m_TwistLimitSpring: spring: 0 @@ -5910,8 +6011,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 164670} serializedVersion: 2 - m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, - w: 1} + m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.009999999, z: 0.01} m_ConstrainProportionsScale: 0 @@ -5935,6 +6035,11 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5962,9 +6067,11 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -6162,8 +6269,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 169970} serializedVersion: 2 - m_LocalRotation: {x: 0.00000003154195, y: 0.0000000055908194, z: 0.0000000044438986, - w: 1} + m_LocalRotation: {x: 0.00000003154195, y: 0.0000000055908194, z: 0.0000000044438986, w: 1} m_LocalPosition: {x: -0.00041358636, y: 2.9665046, z: 0.000024707986} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -6354,8 +6460,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 179982} serializedVersion: 2 - m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, - w: 1} + m_LocalRotation: {x: 0.00000008122751, y: -0.0000000018335409, z: 1.1508664e-24, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.01, y: 0.009999999, z: 0.01} m_ConstrainProportionsScale: 0 @@ -6379,6 +6484,11 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -6406,9 +6516,11 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -6510,8 +6622,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 180270} serializedVersion: 2 - m_LocalRotation: {x: 0.00000005096203, y: -1.3542201e-10, z: -0.0000000016708129, - w: 1} + m_LocalRotation: {x: 0.00000005096203, y: -1.3542201e-10, z: -0.0000000016708129, w: 1} m_LocalPosition: {x: 0.0024477316, y: 3.6274889, z: -0.0000036316922} m_LocalScale: {x: 1, y: 1.0000001, z: 1} m_ConstrainProportionsScale: 0 @@ -6800,8 +6911,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 197244} serializedVersion: 2 - m_LocalRotation: {x: 0.00000000583043, y: -0.0000000037147578, z: 0.000000024821702, - w: 1} + m_LocalRotation: {x: 0.00000000583043, y: -0.0000000037147578, z: 0.000000024821702, w: 1} m_LocalPosition: {x: -0.00018684844, y: 2.5621476, z: 0.0000047087665} m_LocalScale: {x: 1, y: 1, z: 0.99999994} m_ConstrainProportionsScale: 0 @@ -6875,10 +6985,10 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199386} - serializedVersion: 4 + serializedVersion: 5 m_Mass: 10 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 0.05 m_CenterOfMass: {x: 0, y: 0, z: 0} m_InertiaTensor: {x: 1, y: 1, z: 1} m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} @@ -6902,13 +7012,13 @@ CharacterJoint: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 199386} + serializedVersion: 3 m_ConnectedBody: {fileID: 5474386} m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 0, z: -1} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: -18.555353, y: 21.897718, z: -0.18384582} - serializedVersion: 2 m_SwingAxis: {x: 1, y: 0, z: 0} m_TwistLimitSpring: spring: 0 @@ -7274,6 +7384,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -7295,9 +7410,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1545579617 GameObject: @@ -8044,6 +8161,11 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 0 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8065,9 +8187,11 @@ SkinnedMeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 serializedVersion: 2 m_Quality: 0 m_UpdateWhenOffscreen: 0 @@ -8439,6 +8563,7 @@ GameObject: - component: {fileID: 2877311890657080738} - component: {fileID: 6245575385510718533} - component: {fileID: 3093648984004729798} + - component: {fileID: 3261834086762779149} m_Layer: 0 m_Name: Camera m_TagString: MainCamera @@ -8520,6 +8645,50 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8339386772457272572} m_Enabled: 1 +--- !u!114 &3261834086762779149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8339386772457272572} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 --- !u!1 &8660435610505140179 GameObject: m_ObjectHideFlags: 0 @@ -8658,6 +8827,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -8680,9 +8854,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8660536078090757541 GameObject: @@ -9148,6 +9324,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9169,9 +9350,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8660827274359038137 GameObject: @@ -9666,8 +9849,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8660933093880230303} serializedVersion: 2 - m_LocalRotation: {x: -0.000000014901159, y: -0.000000104308114, z: 0.000000029802319, - w: 1} + m_LocalRotation: {x: -0.000000014901159, y: -0.000000104308114, z: 0.000000029802319, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.010000001, y: 0.010000008, z: 0.0100000035} m_ConstrainProportionsScale: 0 @@ -9767,6 +9949,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -9789,9 +9976,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8660949040401390805 GameObject: @@ -9849,8 +10038,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8660954690753557969} serializedVersion: 2 - m_LocalRotation: {x: 0.00000007450579, y: 0.000000044703473, z: 0.000000044703473, - w: 1} + m_LocalRotation: {x: 0.00000007450579, y: 0.000000044703473, z: 0.000000044703473, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.010000006, y: 0.009999998, z: 0.010000003} m_ConstrainProportionsScale: 0 @@ -10113,6 +10301,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10135,9 +10328,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8661462565985955561 GameObject: @@ -10331,6 +10526,11 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -10353,9 +10553,11 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &8661507758823876279 GameObject: @@ -10508,8 +10710,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8661536424819738705} serializedVersion: 2 - m_LocalRotation: {x: 0.00000007450579, y: 0.000000044703473, z: 0.000000044703473, - w: 1} + m_LocalRotation: {x: 0.00000007450579, y: 0.000000044703473, z: 0.000000044703473, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.010000006, y: 0.009999998, z: 0.010000003} m_ConstrainProportionsScale: 0 @@ -10592,73 +10793,59 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5731288698100649650} m_Modifications: - - target: {fileID: 2200566401644193305, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 2200566401644193305, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: debugMode value: 0 objectReference: {fileID: 0} - - target: {fileID: 2200566402873466474, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 2200566402873466474, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7701825353036948164, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 7701825353036948164, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_Name value: Stun Effect objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + - target: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -10669,8 +10856,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} --- !u!114 &1324791156729504900 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 2200566401644193305, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + m_CorrespondingSourceObject: {fileID: 2200566401644193305, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} m_PrefabInstance: {fileID: 930945440140591773} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -10681,8 +10867,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!4 &8545580820734491149 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, - type: 3} + m_CorrespondingSourceObject: {fileID: 8823503335645296784, guid: ef1db29673477fa42b1ca5e7b4e2cb27, type: 3} m_PrefabInstance: {fileID: 930945440140591773} m_PrefabAsset: {fileID: 0} --- !u!1001 &1886785700577444779 @@ -10693,153 +10878,123 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 556765321} m_Modifications: - - target: {fileID: 3665774379292657573, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379292657573, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_Name value: HUD Shooter Variant objectReference: {fileID: 0} - - target: {fileID: 3665774379299012467, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379299012467, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: Invector.vSliderSizeControl, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 3665774379299030643, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379299030643, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: Invector.vSliderSizeControl, Assembly-CSharp objectReference: {fileID: 0} - - target: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: joystickControls value: objectReference: {fileID: 0} - - target: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: keyboardControls value: objectReference: {fileID: 0} - - target: {fileID: 3665774379303741921, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303741921, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303741921, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303741921, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303951157, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303951157, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3665774379303951157, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + - target: {fileID: 3665774379303951157, guid: 327d82563a2505448a57f268799cf0c2, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} @@ -10850,8 +11005,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 327d82563a2505448a57f268799cf0c2, type: 3} --- !u!114 &2949936891286124722 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + m_CorrespondingSourceObject: {fileID: 3665774379299076889, guid: 327d82563a2505448a57f268799cf0c2, type: 3} m_PrefabInstance: {fileID: 1886785700577444779} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -10862,8 +11016,7 @@ MonoBehaviour: m_EditorClassIdentifier: --- !u!224 &2949936891288643892 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, - type: 3} + m_CorrespondingSourceObject: {fileID: 3665774379303758495, guid: 327d82563a2505448a57f268799cf0c2, type: 3} m_PrefabInstance: {fileID: 1886785700577444779} m_PrefabAsset: {fileID: 0} --- !u!1001 &2682511807598133508 @@ -10874,78 +11027,63 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2557782531008545532} m_Modifications: - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4969541416156210485, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4969541416156210485, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_Name value: ThrowManager-Inventory_EquipArea objectReference: {fileID: 0} - - target: {fileID: 4969541416156210485, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 4969541416156210485, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510377369149399697, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 6510377369149399697, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: defaultHandler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 6510377369149399697, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + - target: {fileID: 6510377369149399697, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} propertyPath: selectedToolbar value: 0 objectReference: {fileID: 0} @@ -10956,8 +11094,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} --- !u!4 &7050511023126885009 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, - type: 3} + m_CorrespondingSourceObject: {fileID: 4963600302941516693, guid: a103a69a923bfe449bec391ee2d584ca, type: 3} m_PrefabInstance: {fileID: 2682511807598133508} m_PrefabAsset: {fileID: 0} --- !u!1001 &2949936891192245523 @@ -10976,63 +11113,51 @@ PrefabInstance: propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8707727118601511313, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + - target: {fileID: 8707727118601511313, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} @@ -11043,8 +11168,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} --- !u!4 &3469219451466563496 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, - type: 3} + m_CorrespondingSourceObject: {fileID: 1789445608270938811, guid: 041726e4330290b43ac95e1cf84d3636, type: 3} m_PrefabInstance: {fileID: 2949936891192245523} m_PrefabAsset: {fileID: 0} --- !u!1001 &3843483789777452661 @@ -11107,48 +11231,39 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: selectedToolbar value: 0 objectReference: {fileID: 0} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: throwables.Array.data[0].handler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: throwables.Array.data[1].handler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: throwables.Array.data[2].handler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: throwables.Array.data[3].handler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: onCancelAim.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: onEnableAim.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 114857766368708610, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: onThrowObject.m_PersistentCalls.m_Calls.Array.size value: 0 objectReference: {fileID: 0} - - target: {fileID: 224863294064242038, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + - target: {fileID: 224863294064242038, guid: 322f523885a65e746816ed5774b95d38, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} @@ -11159,8 +11274,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 322f523885a65e746816ed5774b95d38, type: 3} --- !u!4 &3839245136976059771 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4909563269784334, guid: 322f523885a65e746816ed5774b95d38, - type: 3} + m_CorrespondingSourceObject: {fileID: 4909563269784334, guid: 322f523885a65e746816ed5774b95d38, type: 3} m_PrefabInstance: {fileID: 3843483789777452661} m_PrefabAsset: {fileID: 0} --- !u!1001 &4153970977504094402 @@ -11171,83 +11285,67 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 2557782531008545532} m_Modifications: - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4969541416156210485, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4969541416156210485, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_Name value: ThrowManager-Inventory_Item objectReference: {fileID: 0} - - target: {fileID: 4969541416156210485, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 4969541416156210485, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} - - target: {fileID: 5183061447391985133, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 5183061447391985133, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510377369149399697, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 6510377369149399697, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: defaultHandler value: objectReference: {fileID: 8311592509023764662} - - target: {fileID: 6510377369149399697, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + - target: {fileID: 6510377369149399697, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} propertyPath: selectedToolbar value: 4 objectReference: {fileID: 0} @@ -11258,8 +11356,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} --- !u!4 &9027358479231245143 stripped Transform: - m_CorrespondingSourceObject: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, - type: 3} + m_CorrespondingSourceObject: {fileID: 4963600302941516693, guid: a630b62c03675924ca5dc678577bbd3a, type: 3} m_PrefabInstance: {fileID: 4153970977504094402} m_PrefabAsset: {fileID: 0} --- !u!1001 &6116338666087484972 @@ -11270,75 +11367,61 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5036513190694474436} m_Modifications: - - target: {fileID: 3444320678111530354, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3444320678111530354, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_Name value: Inventory_ShooterMelee objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6775737077560251027, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 6775737077560251027, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 180 objectReference: {fileID: 0} - - target: {fileID: 6775737077560251027, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + - target: {fileID: 6775737077560251027, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 15 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] @@ -11347,8 +11430,7 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} --- !u!4 &7184961713697875765 stripped Transform: - m_CorrespondingSourceObject: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, - type: 3} + m_CorrespondingSourceObject: {fileID: 3987802230167169305, guid: 8cff4600ff380fc45910465a0a4d4ab1, type: 3} m_PrefabInstance: {fileID: 6116338666087484972} m_PrefabAsset: {fileID: 0} --- !u!1001 &7125405124147628337 @@ -11359,63 +11441,51 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 5036513190694474436} m_Modifications: - - target: {fileID: 7417021573534781502, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 7417021573534781502, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_Name value: TriggerHelper objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_RootOrder value: 7 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalPosition.y value: 0.25 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + - target: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} @@ -11426,7 +11496,6 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 91dc005e37e430343b270aeb19946340, type: 3} --- !u!4 &1345858106077172973 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, - type: 3} + m_CorrespondingSourceObject: {fileID: 8092956316628032988, guid: 91dc005e37e430343b270aeb19946340, type: 3} m_PrefabInstance: {fileID: 7125405124147628337} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/Shooter/vShooterMeleeInput.cs b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/Shooter/vShooterMeleeInput.cs index 324db454..ad52b5be 100644 --- a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/Shooter/vShooterMeleeInput.cs +++ b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/Shooter/vShooterMeleeInput.cs @@ -678,7 +678,7 @@ namespace Invector.vCharacterController // { // _aimTiming = 0f; // } - if(inputReader.IsSprintHeld && _aimTiming > 0f) + if(inputReader != null && inputReader.IsSprintHeld && _aimTiming > 0f) { _aimTiming = 0f; } diff --git a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat index 93e6f5dd..4e7c485d 100644 --- a/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat +++ b/Assets/Third Parties/Invector-3rdPersonController/Shooter/Scripts/ThrowSystem/UI/CustomProjector/RangeIndicator.mat @@ -32,13 +32,13 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: db48e0e5caa2999469a4f3aa249c188b, type: 3} + m_Texture: {fileID: 2800000, guid: 1ba5636bfdd687347966f548dbf5a0bc, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: [] m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 8, g: 0, b: 0, a: 1} - _Vector0: {r: 1, g: 1, b: 0, a: 0} m_BuildTextureStacks: [] m_AllowLocking: 1