From 3ca78168748731fff88097cba0e27058526bcde5 Mon Sep 17 00:00:00 2001 From: ngtuanz1 Date: Fri, 5 Jun 2026 23:25:56 +0700 Subject: [PATCH 1/2] update --- .idea/.idea.HALLUCINATE/.idea/workspace.xml | 36 +-- Assets/Scripts/AI NPC/AnimatorAI.cs | 341 +++++++------------- Assets/Scripts/AI NPC/EnemyAI.cs | 3 + 3 files changed, 125 insertions(+), 255 deletions(-) diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 5a086632..11f41985 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,34 +6,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - + + @@ -204,6 +179,7 @@ + diff --git a/Assets/Scripts/AI NPC/AnimatorAI.cs b/Assets/Scripts/AI NPC/AnimatorAI.cs index 12657a1c..c7dc4663 100644 --- a/Assets/Scripts/AI NPC/AnimatorAI.cs +++ b/Assets/Scripts/AI NPC/AnimatorAI.cs @@ -1,307 +1,199 @@ using UnityEngine; using UnityEngine.AI; using Invector; +using Invector.vEventSystems; using System.Collections; /// -/// AnimatorAI: Đồng bộ hóa trạng thái của EnemyAI với Animator. -/// Tích hợp Simulation Mode để giả lập animation khi chưa có logic di chuyển hoàn chỉnh. +/// AnimatorAI: Advanced Invector-style Animator synchronization for EnemyAI. +/// Resolves T-pose by ensuring all core Invector parameters are correctly synced. /// -public class AnimatorAI : MonoBehaviour +public class AnimatorAI : MonoBehaviour, vIAnimatorStateInfoController { protected Animator animator; protected EnemyAI enemyAI; protected NavMeshAgent agent; protected Rigidbody rb; - - [Header("Debug Settings")] - public bool debugMode = true; - public Color debugColor = Color.cyan; - - [Header("Simulation Mode (Giả lập)")] - public bool useSimulation = false; // Tích chọn để dùng thông số giả lập bên dưới - public bool autoCycleSpeed = false; // Tự động chạy/đi bộ/đứng im theo vòng lặp - [Range(0, 1)] public float simVerticalVelocity = 0f; - public bool simIsSprinting = false; - public bool simIsAiming = false; - public int simMoveSetID = 0; + protected vHealthController healthController; [Header("Movement Settings")] public float sprintThreshold = 0.8f; public float dampTime = 0.1f; + public float groundDistanceValue = 0.05f; + + public vAnimatorStateInfos animatorStateInfos { get; protected set; } #region Animator Parameters (Invector Style) protected vAnimatorParameter isDead; protected vAnimatorParameter isGrounded; - protected vAnimatorParameter isCrouching; protected vAnimatorParameter isStrafing; - protected vAnimatorParameter isSliding; protected vAnimatorParameter isSprinting; protected vAnimatorParameter isAiming; - protected vAnimatorParameter canAim; - protected vAnimatorParameter flipAnimation; - protected vAnimatorParameter flipEquip; - protected vAnimatorParameter groundDistance; - protected vAnimatorParameter groundAngle; protected vAnimatorParameter verticalVelocity; + protected vAnimatorParameter horizontalVelocity; + protected vAnimatorParameter groundDistance; protected vAnimatorParameter moveSet_ID; - protected vAnimatorParameter upperBody_ID; - protected vAnimatorParameter idleRandom; - protected vAnimatorParameter idleRandomTrigger; - protected vAnimatorParameter randomAttack; - protected vAnimatorParameter weakAttack; - protected vAnimatorParameter strongAttack; - protected vAnimatorParameter isBlocking; protected vAnimatorParameter attackID; - protected vAnimatorParameter defenseID; - protected vAnimatorParameter recoilID; - protected vAnimatorParameter reactionID; - protected vAnimatorParameter triggerRecoil; - protected vAnimatorParameter triggerReaction; protected vAnimatorParameter hitDirection; + protected vAnimatorParameter reactionID; + protected vAnimatorParameter triggerReaction; protected vAnimatorParameter resetState; - protected vAnimatorParameter reload; - protected vAnimatorParameter cancelReload; - protected vAnimatorParameter reloadID; - protected vAnimatorParameter shoot; - protected vAnimatorParameter shot_ID; - protected vAnimatorParameter powerCharger; #endregion - [Header("Nuclear Diagnostic (Siêu chẩn đoán)")] - public string forcePlayState = ""; // Gõ tên State vào đây để ép nó chạy (vd: Idle) - public bool showLayerWeights = false; + protected Vector3 lastPosition; + protected float currentV; + protected float currentH; - protected virtual void Start() + protected virtual void Awake() { animator = GetComponentInChildren(); enemyAI = GetComponent(); agent = GetComponent(); rb = GetComponent(); + healthController = GetComponent(); - if (animator == null) + if (animator) { - Debug.LogError($"[AnimatorAI] KHÔNG tìm thấy Animator trên {gameObject.name} hoặc các con của nó!"); - return; + animatorStateInfos = new vAnimatorStateInfos(animator); + InitializeParameters(); } - // Chạy chẩn đoán hạt nhân - StartCoroutine(NuclearDiagnosticRoutine()); - - InitializeParameters(); + lastPosition = transform.position; } - private IEnumerator NuclearDiagnosticRoutine() + protected virtual void OnEnable() { - while (true) - { - yield return new WaitForSeconds(1f); + this.Register(); + if (healthController) healthController.onReceiveDamage.AddListener(OnReceiveDamage); + } - if (animator == null) yield break; - - // 1. Kiểm tra Enabled - if (!animator.enabled) - Debug.LogError($"[NUCLEAR ALERT] Component Animator đang bị TẮT (enabled = false)!"); - - // 2. Kiểm tra Rig Type - if (animator.isHuman) - Debug.Log($"[Rig Info] Rig là Humanoid. Hãy chắc chắn các Animation cũng là Humanoid."); - else - Debug.LogWarning($"[Rig Info] Rig là Generic/Legacy. Nếu bạn dùng Animation Humanoid nó sẽ không chạy."); - - // 3. Kiểm tra Layer Weight - if (showLayerWeights) - { - for (int i = 0; i < animator.layerCount; i++) - { - Debug.Log($"Layer {i} ({animator.GetLayerName(i)}): Weight = {animator.GetLayerWeight(i)}"); - } - } - - // 4. Ép chạy State nếu có yêu cầu - if (!string.IsNullOrEmpty(forcePlayState)) - { - Debug.Log($"[Nuclear Force] ÉP CHẠY STATE: {forcePlayState}"); - animator.Play(forcePlayState); - forcePlayState = ""; // Reset sau khi chạy - } - - // 5. Kiểm tra vị trí xương (Nếu T-pose thì thường xương không đổi vị trí) - Vector3 handPos = animator.GetBoneTransform(HumanBodyBones.RightHand) ? animator.GetBoneTransform(HumanBodyBones.RightHand).position : Vector3.zero; - yield return new WaitForSeconds(0.1f); - if (handPos != Vector3.zero && Vector3.Distance(handPos, animator.GetBoneTransform(HumanBodyBones.RightHand).position) < 0.001f && animator.speed > 0) - { - // Nếu xương không nhúc nhích dù tốc độ > 0 - Debug.LogWarning($"[NUCLEAR ALERT] CẢNH BÁO: Xương nhân vật không nhúc nhích! Có thể do Rig lỗi hoặc bị script khác khóa xương."); - } - - if (!useSimulation) yield break; - } + protected virtual void OnDisable() + { + this.UnRegister(); + if (healthController) healthController.onReceiveDamage.RemoveListener(OnReceiveDamage); } protected virtual void InitializeParameters() { - if (animator == null) return; - - // Khởi tạo và kiểm tra từng tham số quan trọng - isDead = ValidateAndInit("isDead"); - isGrounded = ValidateAndInit("IsGrounded"); - isCrouching = ValidateAndInit("IsCrouching"); - isStrafing = ValidateAndInit("IsStrafing"); - isSliding = ValidateAndInit("IsSliding"); - isSprinting = ValidateAndInit("IsSprinting"); - isAiming = ValidateAndInit("IsAiming"); - canAim = ValidateAndInit("CanAim"); - flipAnimation = ValidateAndInit("FlipAnimation"); - flipEquip = ValidateAndInit("FlipEquip"); - groundDistance = ValidateAndInit("GroundDistance"); - groundAngle = ValidateAndInit("GroundAngle"); - verticalVelocity = ValidateAndInit("VerticalVelocity"); - moveSet_ID = ValidateAndInit("MoveSet_ID"); - upperBody_ID = ValidateAndInit("UpperBody_ID"); - idleRandom = ValidateAndInit("IdleRandom"); - idleRandomTrigger = ValidateAndInit("IdleRandomTrigger"); - randomAttack = ValidateAndInit("RandomAttack"); - weakAttack = ValidateAndInit("WeakAttack"); - strongAttack = ValidateAndInit("StrongAttack"); - isBlocking = ValidateAndInit("IsBlocking"); - attackID = ValidateAndInit("AttackID"); - defenseID = ValidateAndInit("DefenseID"); - recoilID = ValidateAndInit("RecoilID"); - reactionID = ValidateAndInit("ReactionID"); - triggerRecoil = ValidateAndInit("TriggerRecoil"); - triggerReaction = ValidateAndInit("TriggerReaction"); - hitDirection = ValidateAndInit("HitDirection"); - resetState = ValidateAndInit("ResetState"); - reload = ValidateAndInit("Reload"); - cancelReload = ValidateAndInit("CancelReload"); - reloadID = ValidateAndInit("ReloadID"); - shoot = ValidateAndInit("Shoot"); - shot_ID = ValidateAndInit("Shot_ID"); - powerCharger = ValidateAndInit("PowerCharger"); - } - - private vAnimatorParameter ValidateAndInit(string paramName) - { - vAnimatorParameter p = new vAnimatorParameter(animator, paramName); - if (!p.isValid && debugMode) - { - // Chỉ cảnh báo những biến cốt lõi nếu thiếu - if (paramName == "VerticalVelocity" || paramName == "IsGrounded" || paramName == "IsAiming") - Debug.LogWarning($"[AnimatorAI] Cảnh báo: Controller thiếu biến quan trọng: {paramName}"); - } - return p; + isDead = new vAnimatorParameter(animator, "isDead"); + isGrounded = new vAnimatorParameter(animator, "IsGrounded"); + isStrafing = new vAnimatorParameter(animator, "IsStrafing"); + isSprinting = new vAnimatorParameter(animator, "IsSprinting"); + isAiming = new vAnimatorParameter(animator, "IsAiming"); + verticalVelocity = new vAnimatorParameter(animator, "VerticalVelocity"); + horizontalVelocity = new vAnimatorParameter(animator, "HorizontalVelocity"); + groundDistance = new vAnimatorParameter(animator, "GroundDistance"); + moveSet_ID = new vAnimatorParameter(animator, "MoveSet_ID"); + attackID = new vAnimatorParameter(animator, "AttackID"); + hitDirection = new vAnimatorParameter(animator, "HitDirection"); + reactionID = new vAnimatorParameter(animator, "ReactionID"); + triggerReaction = new vAnimatorParameter(animator, "TriggerReaction"); + resetState = new vAnimatorParameter(animator, "ResetState"); } protected virtual void Update() { - if (animator == null) return; + if (animator == null || enemyAI == null || agent == null) return; - if (useSimulation) - { - RunSimulation(); - } - else - { - if (enemyAI == null || agent == null) return; - UpdateMovementParameters(); - UpdateCombatParameters(); - } - } - - protected virtual void RunSimulation() - { - // 1. Giả lập tốc độ di chuyển - if (autoCycleSpeed) - { - // Tạo vòng lặp tốc độ từ 0 đến 1 dùng hàm Sin - simVerticalVelocity = Mathf.Abs(Mathf.Sin(Time.time * 0.5f)); - simIsSprinting = simVerticalVelocity > sprintThreshold; - } - - SetFloat(verticalVelocity, simVerticalVelocity, "SIM: VerticalVelocity"); - SetBool(isSprinting, simIsSprinting, "SIM: IsSprinting"); - SetBool(isGrounded, true, "SIM: IsGrounded"); // Luôn giả lập trên mặt đất - - // 2. Giả lập chiến đấu - SetBool(isAiming, simIsAiming, "SIM: IsAiming"); - SetInt(moveSet_ID, simMoveSetID, "SIM: MoveSet_ID"); - SetBool(canAim, simIsAiming, "SIM: CanAim"); + UpdateMovementParameters(); + UpdateCombatParameters(); } protected virtual void UpdateMovementParameters() { + // 1. Grounded & GroundDistance (Critical for T-pose prevention) bool grounded = agent.isOnNavMesh || agent.enabled; - SetBool(isGrounded, grounded, "IsGrounded"); + SetBool(isGrounded, grounded); + SetFloat(groundDistance, grounded ? 0f : groundDistanceValue); - float speed = agent.velocity.magnitude / enemyAI.moveSpeed; - SetFloat(verticalVelocity, speed, "VerticalVelocity"); + // 2. Responsive Velocity Calculation + // Use a mix of agent velocity and position delta for better responsiveness + Vector3 worldVelocity = (transform.position - lastPosition) / Time.deltaTime; + lastPosition = transform.position; - bool sprinting = agent.velocity.magnitude > (enemyAI.moveSpeed * sprintThreshold); - SetBool(isSprinting, sprinting, "IsSprinting"); + if (worldVelocity.magnitude < 0.01f) worldVelocity = Vector3.zero; - bool isDodging = !agent.enabled && !rb.isKinematic; - SetBool(flipAnimation, isDodging, "FlipAnimation (Dodge)"); + Vector3 localVelocity = transform.InverseTransformDirection(worldVelocity); + + float targetV = localVelocity.z / enemyAI.moveSpeed; + float targetH = localVelocity.x / enemyAI.moveSpeed; + + // Smooth velocity values + currentV = Mathf.Lerp(currentV, targetV, 10f * Time.deltaTime); + currentH = Mathf.Lerp(currentH, targetH, 10f * Time.deltaTime); + + SetFloat(verticalVelocity, currentV); + SetFloat(horizontalVelocity, currentH); + + // 3. Sprinting + bool sprinting = worldVelocity.magnitude > (enemyAI.moveSpeed * sprintThreshold); + SetBool(isSprinting, sprinting); + + // 4. Strafing + SetBool(isStrafing, enemyAI.playerHasArtifact); } protected virtual void UpdateCombatParameters() { - bool aiming = enemyAI.playerHasArtifact && agent.isStopped; - SetBool(isAiming, aiming, "IsAiming"); + SetBool(isAiming, enemyAI.playerHasArtifact); + SetInt(moveSet_ID, enemyAI.playerHasArtifact ? 1 : 0); - int moveID = enemyAI.playerHasArtifact ? 1 : 0; - SetInt(moveSet_ID, moveID, "MoveSet_ID"); + // Shooting burst + if (enemyAI.IsShootingBurst) + SetInt(attackID, 1); + else + SetInt(attackID, 0); - SetBool(canAim, enemyAI.playerHasArtifact, "CanAim"); - } - - #region Optimized Setters with Debug - - protected void SetBool(vAnimatorParameter param, bool value, string name) - { - if (param.isValid) + // Dodge logic + if (enemyAI.IsDodging) { - bool current = animator.GetBool(param); - if (current != value) - { - animator.SetBool(param, value); - if (debugMode) Debug.Log($"[AnimDebug] {gameObject.name}: {name} -> {value}"); - } + // In Invector, dodges are often handled via triggers or specific IDs + SetAnimatorTrigger(triggerReaction); } + + // Death state + if (healthController) SetBool(isDead, healthController.isDead); } - protected void SetFloat(vAnimatorParameter param, float value, string name) + protected virtual void OnReceiveDamage(vDamage damage) + { + if (animator == null || !animator.enabled) return; + + // Sync damage parameters for hit reactions + if (hitDirection.isValid && damage.sender) + { + float angle = transform.HitAngle(damage.sender.position); + animator.SetInteger(hitDirection, (int)angle); + } + + if (reactionID.isValid) animator.SetInteger(reactionID, damage.reaction_id); + + SetAnimatorTrigger(triggerReaction); + SetAnimatorTrigger(resetState); + } + + #region Helpers + protected void SetBool(vAnimatorParameter param, bool value) + { + if (param.isValid && animator.GetBool(param) != value) + animator.SetBool(param, value); + } + + protected void SetFloat(vAnimatorParameter param, float value) { if (param.isValid) - { animator.SetFloat(param, value, dampTime, Time.deltaTime); - } } - protected void SetInt(vAnimatorParameter param, int value, string name) + protected void SetInt(vAnimatorParameter param, int value) { - if (param.isValid) - { - int current = animator.GetInteger(param); - if (current != value) - { - animator.SetInteger(param, value); - if (debugMode) Debug.Log($"[AnimDebug] {gameObject.name}: {name} -> {value}"); - } - } + if (param.isValid && animator.GetInteger(param) != value) + animator.SetInteger(param, value); } - #endregion - - #region Helper Methods (Triggers) - - public virtual void SetAnimatorTrigger(vAnimatorParameter trigger, string name = "Trigger") + public void SetAnimatorTrigger(vAnimatorParameter trigger) { - if (trigger.isValid) - { - if (debugMode) Debug.Log($"[AnimDebug] {gameObject.name}: Kích hoạt {name}"); - StartCoroutine(SetTriggerRoutine(trigger)); - } + if (trigger.isValid) StartCoroutine(SetTriggerRoutine(trigger)); } private IEnumerator SetTriggerRoutine(int targetHash) @@ -310,6 +202,5 @@ public class AnimatorAI : MonoBehaviour yield return new WaitForSeconds(0.1f); animator.ResetTrigger(targetHash); } - #endregion } diff --git a/Assets/Scripts/AI NPC/EnemyAI.cs b/Assets/Scripts/AI NPC/EnemyAI.cs index 8906a533..cd70cc88 100644 --- a/Assets/Scripts/AI NPC/EnemyAI.cs +++ b/Assets/Scripts/AI NPC/EnemyAI.cs @@ -63,6 +63,9 @@ public class EnemyAI : MonoBehaviour private int strafeDirectionSign = 1; // -1: Trái, 1: Phải, 0: Đứng im bắn private bool isShootingBurst = false; // Khóa chống trùng lặp loạt bắn + public bool IsDodging => isDodging; + public bool IsShootingBurst => isShootingBurst; + [Header("Conversation Settings")] public string npcName = "Guard"; [TextArea] public string persona = "You are a bored security guard. You love coffee and hate night shifts."; From 19abc0b01960e1b79cef9292bf32cd5c14f708f5 Mon Sep 17 00:00:00 2001 From: scove Date: Fri, 5 Jun 2026 23:27:21 +0700 Subject: [PATCH 2/2] commit --- .idea/.idea.HALLUCINATE/.idea/workspace.xml | 10 +- Assets/Prefabs/NPC/xNPC.prefab | 331 +++++- .../Weapon/_bullets/vGrenadeRifle.prefab | 1025 ++++++++++++++--- .../_ammo/vAmmoHandgun_Inventory.prefab | 138 ++- .../_weaponsPrefabs/vHandgun_Inventory.prefab | 688 +++++++++-- .../Only AI/NavMesh-NavManager 1.asset | Bin 86248 -> 52884 bytes .../Player/Weapon/vProjectileControl.cs | 26 +- 7 files changed, 1934 insertions(+), 284 deletions(-) diff --git a/.idea/.idea.HALLUCINATE/.idea/workspace.xml b/.idea/.idea.HALLUCINATE/.idea/workspace.xml index 6cb15fd2..6d5c51a3 100644 --- a/.idea/.idea.HALLUCINATE/.idea/workspace.xml +++ b/.idea/.idea.HALLUCINATE/.idea/workspace.xml @@ -6,8 +6,12 @@ - - + + + + + + diff --git a/Assets/Prefabs/NPC/xNPC.prefab b/Assets/Prefabs/NPC/xNPC.prefab index d3ac66f4..6756ea76 100644 --- a/Assets/Prefabs/NPC/xNPC.prefab +++ b/Assets/Prefabs/NPC/xNPC.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6775114823217050358} - component: {fileID: 4848796683983860819} - component: {fileID: 1063752242239153259} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -89,7 +89,7 @@ GameObject: - component: {fileID: 1194338186308686302} - component: {fileID: 1620994605374968907} - component: {fileID: 3045503552244378433} - m_Layer: 5 + m_Layer: 9 m_Name: Canvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -219,7 +219,7 @@ GameObject: - component: {fileID: 2937726564081786020} - component: {fileID: 8396699406453661974} - component: {fileID: 5807828578023492633} - m_Layer: 0 + m_Layer: 9 m_Name: Cube m_TagString: Untagged m_Icon: {fileID: 0} @@ -330,7 +330,7 @@ GameObject: - component: {fileID: 2685789783496722106} - component: {fileID: 6402235304255896193} - component: {fileID: 4454520411962799200} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -471,7 +471,8 @@ GameObject: - component: {fileID: 8239948856752686218} - component: {fileID: 6469822191588635990} - component: {fileID: 9027690817715396964} - m_Layer: 0 + - component: {fileID: 204793640880232070} + m_Layer: 9 m_Name: xNPC m_TagString: Enemy m_Icon: {fileID: 0} @@ -511,17 +512,23 @@ MonoBehaviour: player: {fileID: 0} moveSpeed: 3 rotateSpeed: 50 - patrolWaypoints: [] - currentWaypointIndex: 0 patrolWaitTime: 2 + patrolSpeed: 2 + patrolRadius: 5 playerHasArtifact: 0 laserPrefab: {fileID: 3965388737199864462, guid: fbec2b501d70daa4c9cb481ba53fc0b8, type: 3} firePoint: {fileID: 5863061020199015852} minShootDelay: 1 - maxShootDelay: 3 + maxShootDelay: 5 dodgeForce: 8 dodgeDuration: 0.5 dodgeCooldown: 3 + minStrafeDuration: 0.5 + maxStrafeDuration: 2.2 + maxSpreadAngle: 6 + burstInterval: 0.12 + approachWeight: 0.35 + minCombatDistance: 5 npcName: Guard persona: You are a grumpy guard protecting gold. talkRange: 5 @@ -624,6 +631,8 @@ MonoBehaviour: simMoveSetID: 0 sprintThreshold: 0.8 dampTime: 0.1 + forcePlayState: + showLayerWeights: 0 --- !u!136 &9027690817715396964 CapsuleCollider: m_ObjectHideFlags: 0 @@ -647,6 +656,44 @@ CapsuleCollider: m_Height: 1.8474874 m_Direction: 1 m_Center: {x: 0, y: 0.92911196, z: -0.24853802} +--- !u!114 &204793640880232070 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7522161431095319480} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f56a83ea88140fa4f869bb2f7ffdb184, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Invector.vHealthController + openCloseEvents: 0 + openCloseWindow: 1 + selectedToolbar: 0 + _isDead: 1 + _currentHealth: 0 + isImmortal: 0 + fillHealthOnStart: 1 + _maxHealth: 100 + _healthRecovery: 0 + _healthRecoveryDelay: 0 + checkHealthEvents: [] + _onStartReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onReceiveDamage: + m_PersistentCalls: + m_Calls: [] + _onDead: + m_PersistentCalls: + m_Calls: [] + onChangeHealth: + m_PersistentCalls: + m_Calls: [] + onResetHealth: + m_PersistentCalls: + m_Calls: [] --- !u!1001 &7561534673732472622 PrefabInstance: m_ObjectHideFlags: 0 @@ -655,10 +702,278 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 6442306242859885696} m_Modifications: + - target: {fileID: 100000, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100004, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100006, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100008, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100010, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100012, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100014, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100016, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100018, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100022, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100024, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100026, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100030, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100032, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100034, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100038, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100040, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100042, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100046, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100048, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100050, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100054, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100056, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100058, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100062, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100064, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100066, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100068, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100070, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100072, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100074, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100076, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100078, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100082, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100084, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100086, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100090, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100092, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100094, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100098, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100100, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100102, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100106, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100108, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100110, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100114, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100116, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100118, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100122, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100124, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100126, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100128, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 100132, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} propertyPath: m_Name value: V-bot@Highpoly objectReference: {fileID: 0} + - target: {fileID: 100132, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100136, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100138, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100140, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100142, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100144, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100146, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100148, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100150, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100152, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100154, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100156, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100158, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100160, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 100162, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 400132, guid: f32cd9f795c1282478d3bc3fbd8b2831, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Prefabs/Shooter/Weapon/_bullets/vGrenadeRifle.prefab b/Assets/Prefabs/Shooter/Weapon/_bullets/vGrenadeRifle.prefab index 2c270a2c..220ac46e 100644 --- a/Assets/Prefabs/Shooter/Weapon/_bullets/vGrenadeRifle.prefab +++ b/Assets/Prefabs/Shooter/Weapon/_bullets/vGrenadeRifle.prefab @@ -26,12 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178763326300586} + serializedVersion: 2 m_LocalRotation: {x: -1, y: -0, z: -0, w: 0.000000029802319} m_LocalPosition: {x: 0, y: 0, z: 0.0047} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4941244134641764} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: -180, y: 0, z: 0} --- !u!198 &198318361950992670 ParticleSystem: @@ -40,19 +41,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1178763326300586} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 3 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -251,6 +252,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -280,6 +282,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -493,7 +496,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 0 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1167,6 +1172,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -1196,6 +1202,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -1964,6 +1971,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 1 x: @@ -3360,6 +3423,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3389,24 +3453,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -3580,17 +3646,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -3774,6 +3843,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 1 @@ -3816,6 +3886,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3845,6 +3916,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -3914,6 +3986,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -3943,6 +4016,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -3981,6 +4055,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4010,6 +4085,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4263,6 +4339,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4292,6 +4369,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -4513,7 +4591,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199244713367487148 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4523,10 +4601,17 @@ ParticleSystemRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 0 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: @@ -4549,10 +4634,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -4565,16 +4653,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!114 &114875481484087644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4619,12 +4714,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1383780317045916} + 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: 4130341967357476} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198936490484980366 ParticleSystem: @@ -4633,19 +4729,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1383780317045916} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 3 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -4826,6 +4922,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4855,6 +4952,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5140,7 +5238,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -5917,6 +6017,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -5946,6 +6047,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -6714,6 +6816,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -8056,6 +8214,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8085,24 +8244,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -8276,17 +8437,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 1 @@ -8470,6 +8634,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8512,6 +8677,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8541,6 +8707,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -8628,6 +8795,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8657,6 +8825,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -8695,6 +8864,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8724,6 +8894,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -8977,6 +9148,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9006,6 +9178,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -9227,7 +9400,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199872306262917398 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -9237,10 +9410,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -9263,10 +9443,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 1 m_MinParticleSize: 0 m_MaxParticleSize: 10 @@ -9279,16 +9462,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1466170538761158 GameObject: m_ObjectHideFlags: 0 @@ -9312,14 +9502,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1466170538761158} + serializedVersion: 2 m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784} m_LocalPosition: {x: 0, y: 0.0035, z: -0.0027521} m_LocalScale: {x: 0.69100505, y: 0.69100505, z: 0.69100505} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4256940305497120} - {fileID: 4922562897515820} m_Father: {fileID: 4941244134641764} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 90.00001, y: 0, z: 0} --- !u!1 &1478616132391962 GameObject: @@ -9345,13 +9536,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1478616132391962} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.70710665, z: 0, w: 0.70710695} m_LocalPosition: {x: 0, y: -0.0001, z: -0.2428} m_LocalScale: {x: 0.9739193, y: 0.97391766, z: 0.9739197} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4775066918739554} m_Father: {fileID: 4941244134641764} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114827101096782940 MonoBehaviour: @@ -9383,6 +9575,9 @@ MonoBehaviour: reaction_id: 0 damageType: force: {x: 0, y: 0, z: 0} + damageOnMinRangeMultiplier: 1 + damageOnMaxRangeMultiplier: 0 + overrideDamageSender: {fileID: 0} explosionForce: 50 minExplosionRadius: 1 maxExplosionRadius: 3 @@ -9396,6 +9591,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 33025 timeToExplode: 2 + destroyAfterExplode: 1 normalizeTime: 0 showGizmos: 0 onInitTimer: @@ -9408,6 +9604,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114827101096782940} + m_TargetAssemblyTypeName: m_MethodName: RemoveParentOfOther m_Mode: 2 m_Arguments: @@ -9419,6 +9616,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 1490815020830446} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -9430,6 +9628,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 114827101096782940} + m_TargetAssemblyTypeName: m_MethodName: RemoveParent m_Mode: 1 m_Arguments: @@ -9441,6 +9640,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 114827101096782940} + m_TargetAssemblyTypeName: m_MethodName: RemoveParentOfOther m_Mode: 2 m_Arguments: @@ -9452,6 +9652,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 198318361950992670} + m_TargetAssemblyTypeName: m_MethodName: Stop m_Mode: 6 m_Arguments: @@ -9463,6 +9664,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 114875481484087644} + m_TargetAssemblyTypeName: m_MethodName: set_enabled m_Mode: 6 m_Arguments: @@ -9473,6 +9675,9 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + onHit: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1490815020830446 GameObject: m_ObjectHideFlags: 0 @@ -9499,13 +9704,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1490815020830446} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.0009, z: 0.1712} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4130341967357476} m_Father: {fileID: 4941244134641764} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!169 &169163228029365290 AudioLowPassFilter: @@ -9542,7 +9748,8 @@ AudioSource: m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} - m_audioClip: {fileID: 8300000, guid: a965510870aca1d4ca438b3ca729988a, type: 3} + m_audioClip: {fileID: 0} + m_Resource: {fileID: 8300000, guid: a965510870aca1d4ca438b3ca729988a, type: 3} m_PlayOnAwake: 0 m_Volume: 1 m_Pitch: 0.32 @@ -9672,12 +9879,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514898808266074} + 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: 0.99999976, z: 0.99999976} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4130341967357476} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198199916709494710 ParticleSystem: @@ -9686,19 +9894,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1514898808266074} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -9897,6 +10105,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -9926,6 +10135,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -10229,7 +10439,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -11015,6 +11227,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -11044,6 +11257,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -11812,6 +12026,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -13208,6 +13478,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13237,24 +13508,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -13428,17 +13701,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -13622,6 +13898,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -13664,6 +13941,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13693,6 +13971,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -13780,6 +14059,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13809,6 +14089,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -13847,6 +14128,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13876,6 +14158,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -14129,6 +14412,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14158,6 +14442,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -14379,7 +14664,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199680620692631638 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -14389,10 +14674,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -14415,10 +14707,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 1 m_MinParticleSize: 0 m_MaxParticleSize: 10 @@ -14431,16 +14726,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1637990527694930 GameObject: m_ObjectHideFlags: 0 @@ -14466,12 +14768,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637990527694930} + 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: 4714828488291758} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33022065212018246 MeshFilter: @@ -14492,10 +14795,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -14517,9 +14827,12 @@ 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 &1657035911858940 GameObject: m_ObjectHideFlags: 0 @@ -14545,12 +14858,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1657035911858940} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0, y: 0.049999997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4714828488291758} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33758331761373026 MeshFilter: @@ -14571,10 +14885,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -14596,9 +14917,12 @@ 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 &1663170908470418 GameObject: m_ObjectHideFlags: 0 @@ -14624,16 +14948,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663170908470418} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4694836422157722} - {fileID: 4097827241690228} - {fileID: 4578275692944170} - {fileID: 4332496094539874} m_Father: {fileID: 4471169577644466} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198251984749457848 ParticleSystem: @@ -14642,19 +14967,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663170908470418} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 3 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -14835,6 +15160,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -14864,6 +15190,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -15077,7 +15404,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -15863,6 +16192,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 3 minGradient: @@ -15892,6 +16222,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -16660,6 +16991,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -18056,6 +18443,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18085,24 +18473,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -18276,17 +18666,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 1 @@ -18470,6 +18863,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -18512,6 +18906,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18541,6 +18936,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -18628,6 +19024,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18657,6 +19054,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -18695,6 +19093,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18724,6 +19123,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -18977,6 +19377,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19006,6 +19407,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -19227,7 +19629,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199103519260736280 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -19237,10 +19639,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -19263,10 +19672,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 10 @@ -19279,16 +19691,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1728788478831288 GameObject: m_ObjectHideFlags: 0 @@ -19315,16 +19734,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1728788478831288} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 4.7544456, y: -3.31308e-17, z: 19.920786} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4714828488291758} - {fileID: 4892409279001316} - {fileID: 4471169577644466} - {fileID: 4038236687788422} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &54341468120771308 Rigidbody: @@ -19333,10 +19753,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1728788478831288} - serializedVersion: 2 + serializedVersion: 5 m_Mass: 0.5 - 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} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -19383,6 +19814,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114827101096782940} + m_TargetAssemblyTypeName: m_MethodName: SetDamage m_Mode: 0 m_Arguments: @@ -19394,6 +19826,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114827101096782940} + m_TargetAssemblyTypeName: m_MethodName: ActiveExplosion m_Mode: 1 m_Arguments: @@ -19458,12 +19891,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773828574959578} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4130341967357476} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198301403308236240 ParticleSystem: @@ -19472,19 +19906,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1773828574959578} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -19683,6 +20117,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -19712,6 +20147,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -20015,7 +20451,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 10000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -20801,6 +21239,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 3 m_NumAlphaKeys: 4 minGradient: @@ -20830,6 +21269,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -21598,6 +22038,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -22994,6 +23490,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23023,24 +23520,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -23214,17 +23713,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -23408,6 +23910,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -23450,6 +23953,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23479,6 +23983,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -23566,6 +24071,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23595,6 +24101,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -23633,6 +24140,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23662,6 +24170,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -23915,6 +24424,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -23944,6 +24454,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -24165,7 +24676,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199860412045352382 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -24175,10 +24686,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -24201,10 +24719,13 @@ ParticleSystemRenderer: 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_RenderMode: 1 + m_MeshDistribution: 0 m_SortMode: 2 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -24217,16 +24738,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1821988953176218 GameObject: m_ObjectHideFlags: 0 @@ -24252,13 +24780,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1821988953176218} + 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: - {fileID: 4019553533873082} m_Father: {fileID: 4130341967357476} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198773992826709260 ParticleSystem: @@ -24267,19 +24796,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1821988953176218} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 3 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 looping: 0 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -24442,6 +24971,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -24471,6 +25001,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -24756,7 +25287,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 1000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -25542,6 +26075,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 3 minGradient: @@ -25571,6 +26105,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -26825,6 +27360,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -28230,6 +28821,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28259,24 +28851,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -28450,17 +29044,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 1 @@ -28644,6 +29241,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -28686,6 +29284,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28715,6 +29314,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -28802,6 +29402,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28831,6 +29432,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -28869,6 +29471,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -28898,6 +29501,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -29151,6 +29755,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -29180,6 +29785,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -29401,7 +30007,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199795966007623656 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -29411,10 +30017,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -29437,10 +30050,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 1 m_MinParticleSize: 0 m_MaxParticleSize: 10 @@ -29453,16 +30069,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1825659761977570 GameObject: m_ObjectHideFlags: 0 @@ -29488,12 +30111,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825659761977570} + 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: 0.99999976, z: 0.99999976} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4578275692944170} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198466787097304428 ParticleSystem: @@ -29502,19 +30126,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1825659761977570} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 5 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 1 prewarm: 0 playOnAwake: 1 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -29713,6 +30337,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -29742,6 +30367,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -30027,7 +30653,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 100000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -30719,6 +31347,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 5 m_NumAlphaKeys: 4 minGradient: @@ -30748,6 +31377,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -31516,6 +32146,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -32858,6 +33544,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -32887,24 +33574,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -33078,17 +33767,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -33272,6 +33964,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -33314,6 +34007,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -33343,6 +34037,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -33430,6 +34125,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -33459,6 +34155,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -33497,6 +34194,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -33526,6 +34224,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -33779,6 +34478,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -33808,6 +34508,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -34029,7 +34730,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199723463378349184 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -34039,10 +34740,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 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: @@ -34065,10 +34773,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 1 m_MinParticleSize: 0 m_MaxParticleSize: 10 @@ -34081,16 +34792,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &1967329771480456 GameObject: m_ObjectHideFlags: 0 @@ -34117,12 +34835,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1967329771480456} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.43435818, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4892409279001316} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33207931574294952 MeshFilter: @@ -34143,10 +34862,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -34168,9 +34894,12 @@ 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!114 &114087065278767606 MonoBehaviour: m_ObjectHideFlags: 0 @@ -34201,6 +34930,9 @@ MonoBehaviour: reaction_id: 1 damageType: force: {x: 0, y: 0, z: 0} + damageOnMinRangeMultiplier: 1 + damageOnMaxRangeMultiplier: 0 + overrideDamageSender: {fileID: 0} explosionForce: 150 minExplosionRadius: 0 maxExplosionRadius: 0 @@ -34214,6 +34946,7 @@ MonoBehaviour: serializedVersion: 2 m_Bits: 0 timeToExplode: 2 + destroyAfterExplode: 1 normalizeTime: 0 showGizmos: 0 onInitTimer: @@ -34226,6 +34959,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 1490815020830446} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -34236,3 +34970,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + onHit: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_ammo/vAmmoHandgun_Inventory.prefab b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_ammo/vAmmoHandgun_Inventory.prefab index 5b0e7d9f..4e1b6ad9 100644 --- a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_ammo/vAmmoHandgun_Inventory.prefab +++ b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_ammo/vAmmoHandgun_Inventory.prefab @@ -25,12 +25,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 105388} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.049999997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 422732} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3302298 MeshFilter: @@ -51,10 +52,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -76,9 +84,12 @@ 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 &115092 GameObject: m_ObjectHideFlags: 0 @@ -105,16 +116,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 115092} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.59600043, y: 0.23841888, z: -5.476} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 422732} - {fileID: 480898} - {fileID: 488976} - {fileID: 22488062} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!136 &13688376 CapsuleCollider: @@ -124,8 +136,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 115092} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 + serializedVersion: 2 m_Radius: 0.35 m_Height: 1.08 m_Direction: 1 @@ -143,12 +164,13 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: openCloseEvents: 0 - openCloseWindow: 0 - selectedToolbar: 0 + openCloseWindow: 1 + selectedToolbar: 4 inputType: 0 actionInput: useInput: 1 isAxisInUse: 0 + isUnityInput: 0 keyboard: E keyboardAxis: 0 joystick: A @@ -165,6 +187,7 @@ MonoBehaviour: inputDelay: 0.1 playAnimationWhileHoldingButton: 1 doubleButtomTime: 0.25 + canDoAction: 1 actionName: Action actionTag: Action disableOnStart: 0 @@ -177,11 +200,12 @@ MonoBehaviour: destroyDelay: 0 customCameraState: Default playAnimation: + crossFadeTransition: 0.25 + animatorLayer: 0 endActionManualy: 0 endExitTimeAnimation: 0.8 animatorActionState: 0 resetAnimatorActionState: 1 - useAnimatorMatchTarget: 1 matchTarget: {fileID: 0} avatarTarget: 0 useLocalX: 0 @@ -285,10 +309,6 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - matchPos: {x: 0, y: 0, z: 0} - matchRot: 0 - startMatchTarget: 0 - endMatchTarget: 0 onPressActionDelay: 0 OnPressActionInput: m_PersistentCalls: @@ -315,6 +335,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 128644} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -332,6 +353,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 128644} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -348,6 +370,9 @@ MonoBehaviour: OnInvalidate: m_PersistentCalls: m_Calls: [] + OnCancelAction: + m_PersistentCalls: + m_Calls: [] itemListData: {fileID: 11400000, guid: 1493f9d9326e8014494b8cb04de38f25, type: 2} onCollectDelay: 0 textDelay: 0.25 @@ -400,12 +425,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 121230} + 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: 422732} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3398494 MeshFilter: @@ -426,10 +452,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -451,9 +484,12 @@ 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 &127422 GameObject: m_ObjectHideFlags: 0 @@ -479,12 +515,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 127422} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.049999997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 488976} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3382610 MeshFilter: @@ -505,10 +542,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -530,9 +574,12 @@ 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 &128644 GameObject: m_ObjectHideFlags: 0 @@ -563,10 +610,10 @@ RectTransform: m_LocalRotation: {x: 0, y: -1.4210853e-14, z: -0.0000003258414, w: -1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.000713446, y: 0.00071344554, z: 0.00071344554} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22482840} m_Father: {fileID: 479482} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -590,7 +637,9 @@ Canvas: m_OverrideSorting: 0 m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 @@ -616,6 +665,7 @@ MonoBehaviour: m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 --- !u!114 &11473088 MonoBehaviour: m_ObjectHideFlags: 0 @@ -673,14 +723,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 128768} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.707106, z: 0, w: 0.7071076} m_LocalPosition: {x: -0.009500027, y: 0.51312, z: 0.013957024} m_LocalScale: {x: 2.086288, y: 2.44284, z: 2.0862887} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 492078} - {fileID: 474350} m_Father: {fileID: 479482} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &131120 GameObject: @@ -705,14 +756,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 131120} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.707106, z: 0, w: 0.7071076} m_LocalPosition: {x: -0.00950098, y: 0.51312, z: -0.15503883} m_LocalScale: {x: 2.086288, y: 2.44284, z: 2.0862887} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 448248} - {fileID: 450808} m_Father: {fileID: 479482} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &139748 GameObject: @@ -739,12 +791,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139748} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.049999997, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 480898} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3373558 MeshFilter: @@ -765,10 +818,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -790,9 +850,12 @@ 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 &152304 GameObject: m_ObjectHideFlags: 0 @@ -818,12 +881,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 152304} + 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: 488976} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3344262 MeshFilter: @@ -844,10 +908,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -869,9 +940,12 @@ 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 &154240 GameObject: m_ObjectHideFlags: 0 @@ -900,9 +974,9 @@ RectTransform: 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: 22482840} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -932,6 +1006,7 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: a33be1e1efa8ca14286b77d062313a4e, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -971,12 +1046,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 164052} + 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: 480898} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3359494 MeshFilter: @@ -997,10 +1073,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -1022,9 +1105,12 @@ 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 &164286 GameObject: m_ObjectHideFlags: 0 @@ -1053,9 +1139,9 @@ RectTransform: 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: 22482840} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1085,6 +1171,7 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: a33be1e1efa8ca14286b77d062313a4e, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1132,12 +1219,12 @@ RectTransform: m_LocalRotation: {x: -0.000000003090828, y: -1, z: -0.000000028749422, w: 0.00000044703478} m_LocalPosition: {x: 0, y: 0, z: -0.0020311438} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 22489296} - {fileID: 22497104} - {fileID: 22432168} m_Father: {fileID: 22488062} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -1167,6 +1254,7 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: a33be1e1efa8ca14286b77d062313a4e, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.627451} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1197,6 +1285,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 154240} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1208,6 +1297,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 196296} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1225,6 +1315,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 154240} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1236,6 +1327,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 196296} + m_TargetAssemblyTypeName: m_MethodName: SetActive m_Mode: 6 m_Arguments: @@ -1269,14 +1361,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 187208} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.707106, z: 0, w: 0.7071076} m_LocalPosition: {x: -0.009499073, y: 0.51312, z: 0.18504047} m_LocalScale: {x: 2.086288, y: 2.44284, z: 2.0862887} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 451406} - {fileID: 438440} m_Father: {fileID: 479482} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &196296 GameObject: @@ -1306,9 +1399,9 @@ RectTransform: 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: 22482840} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} @@ -1338,6 +1431,7 @@ MonoBehaviour: m_Material: {fileID: 2100000, guid: a33be1e1efa8ca14286b77d062313a4e, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_weaponsPrefabs/vHandgun_Inventory.prefab b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_weaponsPrefabs/vHandgun_Inventory.prefab index c689af58..d1d7c946 100644 --- a/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_weaponsPrefabs/vHandgun_Inventory.prefab +++ b/Assets/Prefabs/Shooter/Weapon/_weapons_WITH_Inventory/_weaponsPrefabs/vHandgun_Inventory.prefab @@ -23,12 +23,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113070} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.086, z: -0.2898} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &126452 GameObject: @@ -55,12 +56,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126452} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.011942976, y: -0.020700336, z: 0.015886888} m_LocalScale: {x: 0.11249996, y: 0.2000001, z: 0.31198788} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &6551876 BoxCollider: @@ -70,9 +72,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 126452} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 0 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &11412710 @@ -118,9 +128,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 139502} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.0061, y: 0.0009, z: 0.086} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 470834} - {fileID: 470832} @@ -135,7 +147,6 @@ Transform: - {fileID: 9176473841248604757} - {fileID: 6678977785074439764} m_Father: {fileID: 470828} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3388636 MeshFilter: @@ -156,10 +167,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -182,9 +200,12 @@ 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 &142980 GameObject: m_ObjectHideFlags: 0 @@ -208,13 +229,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142980} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: 0.0686, z: 0.1256} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 404374} m_Father: {fileID: 443350} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &153730 GameObject: @@ -240,15 +262,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153730} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0.0018, y: -0, z: 0.0981} m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 404374} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &21205490 SpriteRenderer: + serializedVersion: 2 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -258,10 +282,17 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 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: @@ -283,9 +314,11 @@ SpriteRenderer: 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_Sprite: {fileID: 21300000, guid: 73c9a86b90e92a148a822ebc17402d36, type: 3} m_Color: {r: 1, g: 0, b: 0, a: 0.78431374} m_FlipX: 0 @@ -295,7 +328,6 @@ SpriteRenderer: m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1 &162894 GameObject: @@ -322,16 +354,18 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 162894} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.20820001} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 404266} m_Father: {fileID: 445870} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!120 &12002892 LineRenderer: + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -341,10 +375,17 @@ LineRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 0 m_LightProbeUsage: 1 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: @@ -366,9 +407,11 @@ LineRenderer: 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_Positions: - {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 15} @@ -426,16 +469,19 @@ LineRenderer: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 numCornerVertices: 0 numCapVertices: 0 alignment: 0 textureMode: 0 + textureScale: {x: 1, y: 1} shadowBias: 0 generateLightingData: 0 m_UseWorldSpace: 0 m_Loop: 0 + m_ApplyActiveColorSpace: 0 --- !u!114 &11438404 MonoBehaviour: m_ObjectHideFlags: 0 @@ -479,12 +525,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170826} + serializedVersion: 2 m_LocalRotation: {x: -2.1376323e-15, y: -1.1998388e-10, z: -0.000000048903324, w: 1} m_LocalPosition: {x: 0, y: 0.00997, z: 0.01821} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 470832} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198768485228016028 ParticleSystem: @@ -493,19 +540,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170826} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.7 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -704,6 +751,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -733,6 +781,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -1054,7 +1103,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 10000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -1840,6 +1891,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 5 m_NumAlphaKeys: 5 minGradient: @@ -1869,6 +1921,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -2637,6 +2690,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -4033,6 +4142,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4062,24 +4172,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -4253,17 +4365,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -4447,6 +4562,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -4489,6 +4605,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4518,6 +4635,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -4605,6 +4723,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4634,6 +4753,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -4672,6 +4792,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4701,6 +4822,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -4954,6 +5076,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -4983,6 +5106,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -5204,7 +5328,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199159641334675314 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5214,10 +5338,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 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: @@ -5240,10 +5371,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 5 @@ -5256,16 +5390,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &170828 GameObject: m_ObjectHideFlags: 0 @@ -5294,13 +5435,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170828} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -0, y: -0.0364, z: -0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 443350} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &11470846 MonoBehaviour: @@ -5316,7 +5458,7 @@ MonoBehaviour: m_EditorClassIdentifier: openCloseEvents: 0 openCloseWindow: 1 - selectedToolbar: 3 + selectedToolbar: 2 weaponCategory: Pistol _shootFrequency: 0.25 isInfinityAmmo: 1 @@ -5324,7 +5466,7 @@ MonoBehaviour: ignoreTags: [] hitLayer: serializedVersion: 2 - m_Bits: 0 + m_Bits: 513 projectile: {fileID: 1000010710861650, guid: 22773fb6a3ebd59429b49fd6e288058e, type: 3} muzzle: {fileID: 445870} projectilesPerShot: 1 @@ -5353,6 +5495,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 3742719288356132546} + m_TargetAssemblyTypeName: m_MethodName: Play m_Mode: 1 m_Arguments: @@ -5364,6 +5507,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: Recoil m_Mode: 1 m_Arguments: @@ -5390,9 +5534,10 @@ MonoBehaviour: automaticWeapon: 0 reloadTime: 1 reloadOneByOne: 0 - clipSize: 8 + _clipSize: 8 dontUseReload: 1 autoReload: 0 + autoReloadStyle: 0 ammoID: 14 moveSetID: 1 upperBodyID: 1 @@ -5455,11 +5600,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6753450307047040578} + m_TargetAssemblyTypeName: m_MethodName: PlayOneShot m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 8300000, guid: f00ac47e5c7659440a21afd1175d8f20, - type: 3} + m_ObjectArgument: {fileID: 8300000, guid: f00ac47e5c7659440a21afd1175d8f20, type: 3} m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 @@ -5470,11 +5615,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 6753450307047040578} + m_TargetAssemblyTypeName: m_MethodName: PlayOneShot m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 8300000, guid: 72dd93adac6d2ed45b72f9e9ddf0a131, - type: 3} + m_ObjectArgument: {fileID: 8300000, guid: 72dd93adac6d2ed45b72f9e9ddf0a131, type: 3} m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 @@ -5517,11 +5662,11 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 5646910608507955002} + m_TargetAssemblyTypeName: m_MethodName: PlayOneShot m_Mode: 2 m_Arguments: - m_ObjectArgument: {fileID: 8300000, guid: 97cc681a105798a44916efd675389042, - type: 3} + m_ObjectArgument: {fileID: 8300000, guid: 97cc681a105798a44916efd675389042, type: 3} m_ObjectArgumentAssemblyTypeName: UnityEngine.AudioClip, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 @@ -5611,6 +5756,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -5739,12 +5885,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170830} + serializedVersion: 2 m_LocalRotation: {x: -0.21492434, y: -0.71620744, z: -0.25030038, w: 0.6149831} m_LocalPosition: {x: 0, y: 0.01284, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 470832} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: -38.527, y: -98.69701, z: 0} --- !u!198 &198927052463718788 ParticleSystem: @@ -5753,19 +5900,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170830} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 3 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 1 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -5856,6 +6003,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -5885,6 +6033,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -5990,7 +6139,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 50 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -6380,6 +6531,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -6409,6 +6561,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -6961,6 +7114,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -7835,6 +8044,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -7864,24 +8074,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 1 - serializedVersion: 3 + serializedVersion: 4 type: 1 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -7947,17 +8159,20 @@ ParticleSystem: interiorCollisions: 1 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -8033,6 +8248,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -8075,6 +8291,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8104,6 +8321,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -8155,6 +8373,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8184,6 +8403,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -8222,6 +8442,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8251,6 +8472,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -8360,6 +8582,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8389,6 +8612,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -8466,7 +8690,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199626467879948132 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -8476,10 +8700,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 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: @@ -8502,10 +8733,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 0.5 @@ -8518,16 +8752,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &170832 GameObject: m_ObjectHideFlags: 0 @@ -8551,16 +8792,17 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170832} + serializedVersion: 2 m_LocalRotation: {x: -0.00016761065, y: 0.009068018, z: 0.002430454, w: 0.99995595} m_LocalPosition: {x: 0.016671387, y: -0.024682235, z: -0.00019999593} m_LocalScale: {x: -9.150461, y: 7.9433417, z: 7.669599} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 470830} - {fileID: 470838} - {fileID: 470836} - {fileID: 470826} m_Father: {fileID: 443350} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &170834 GameObject: @@ -8586,12 +8828,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170834} + serializedVersion: 2 m_LocalRotation: {x: -0.00016761065, y: 0.009068018, z: 0.002430454, w: 0.99995595} m_LocalPosition: {x: 0.016671387, y: -0.024682235, z: -0.00019999593} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &8270846 AudioSource: @@ -8604,6 +8847,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -8714,12 +8958,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170836} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.01098, z: 0.01028} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 470832} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198134370209081628 ParticleSystem: @@ -8728,19 +8973,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170836} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -8939,6 +9184,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -8968,6 +9214,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -9289,7 +9536,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 10000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -10075,6 +10324,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 5 m_NumAlphaKeys: 5 minGradient: @@ -10104,6 +10354,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -10872,6 +11123,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -12268,6 +12575,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12297,24 +12605,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -12488,17 +12798,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -12682,6 +12995,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -12724,6 +13038,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12753,6 +13068,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -12840,6 +13156,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12869,6 +13186,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -12907,6 +13225,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -12936,6 +13255,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -13189,6 +13509,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13218,6 +13539,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -13439,7 +13761,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199414110104910096 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -13449,10 +13771,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 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: @@ -13475,10 +13804,13 @@ ParticleSystemRenderer: 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_RenderMode: 1 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 5 @@ -13491,16 +13823,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &170838 GameObject: m_ObjectHideFlags: 0 @@ -13526,12 +13865,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170838} + serializedVersion: 2 m_LocalRotation: {x: -2.1376323e-15, y: -1.1998388e-10, z: -0.000000048903324, w: 1} m_LocalPosition: {x: 0, y: 0.01182, z: 0.01901} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 470832} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!198 &198234110790541942 ParticleSystem: @@ -13540,19 +13880,19 @@ ParticleSystem: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170838} - serializedVersion: 6 + serializedVersion: 8 lengthInSec: 0.1 simulationSpeed: 1 stopAction: 0 cullingMode: 1 ringBufferMode: 0 ringBufferLoopRange: {x: 0, y: 1} + emitterVelocityMode: 0 looping: 0 prewarm: 0 playOnAwake: 0 useUnscaledTime: 0 autoRandomSeed: 1 - useRigidbodyForVelocity: 1 startDelay: serializedVersion: 2 minMaxState: 0 @@ -13751,6 +14091,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -13780,6 +14121,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 startSize: @@ -14101,7 +14443,9 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 randomizeRotationDirection: 0 + gravitySource: 0 maxNumParticles: 10000 + customEmitterVelocity: {x: 0, y: 0, z: 0} size3D: 0 rotation3D: 0 gravityModifier: @@ -14887,6 +15231,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 5 m_NumAlphaKeys: 5 minGradient: @@ -14916,6 +15261,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 UVModule: @@ -15684,6 +16030,62 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 + LifetimeByEmitterSpeedModule: + enabled: 0 + m_Curve: + serializedVersion: 2 + minMaxState: 1 + scalar: 1 + minScalar: 1 + maxCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: -0.8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0.2 + inSlope: -0.8 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + minCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + m_Range: {x: 0, y: 1} ForceModule: enabled: 0 x: @@ -17080,6 +17482,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17109,24 +17512,26 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 range: {x: 0, y: 1} CollisionModule: enabled: 0 - serializedVersion: 3 + serializedVersion: 4 type: 0 collisionMode: 0 colliderForce: 0 multiplyColliderForceByParticleSize: 0 multiplyColliderForceByParticleSpeed: 0 multiplyColliderForceByCollisionAngle: 1 - plane0: {fileID: 0} - plane1: {fileID: 0} - plane2: {fileID: 0} - plane3: {fileID: 0} - plane4: {fileID: 0} - plane5: {fileID: 0} + m_Planes: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} m_Dampen: serializedVersion: 2 minMaxState: 0 @@ -17300,17 +17705,20 @@ ParticleSystem: interiorCollisions: 0 TriggerModule: enabled: 0 - collisionShape0: {fileID: 0} - collisionShape1: {fileID: 0} - collisionShape2: {fileID: 0} - collisionShape3: {fileID: 0} - collisionShape4: {fileID: 0} - collisionShape5: {fileID: 0} + serializedVersion: 2 inside: 1 outside: 0 enter: 0 exit: 0 + colliderQueryMode: 0 radiusScale: 1 + primitives: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} SubModule: serializedVersion: 2 enabled: 0 @@ -17494,6 +17902,7 @@ ParticleSystem: m_RotationOrder: 4 minVertexDistance: 0.2 textureMode: 0 + textureScale: {x: 1, y: 1} ribbonCount: 1 shadowBias: 0.5 worldSpace: 0 @@ -17536,6 +17945,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17565,6 +17975,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 widthOverTrail: @@ -17652,6 +18063,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17681,6 +18093,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 CustomDataModule: @@ -17719,6 +18132,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -17748,6 +18162,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel0: Color @@ -18001,6 +18416,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 minGradient: @@ -18030,6 +18446,7 @@ ParticleSystem: atime6: 0 atime7: 0 m_Mode: 0 + m_ColorSpace: -1 m_NumColorKeys: 2 m_NumAlphaKeys: 2 colorLabel1: Color @@ -18251,7 +18668,7 @@ ParticleSystem: vectorLabel1_3: W --- !u!199 &199866486295975278 ParticleSystemRenderer: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -18261,10 +18678,17 @@ ParticleSystemRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 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: @@ -18287,10 +18711,13 @@ ParticleSystemRenderer: 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_RenderMode: 0 + m_MeshDistribution: 0 m_SortMode: 0 m_MinParticleSize: 0 m_MaxParticleSize: 5 @@ -18303,16 +18730,23 @@ ParticleSystemRenderer: m_RenderAlignment: 0 m_Pivot: {x: 0, y: 0, z: 0} m_Flip: {x: 0, y: 0, z: 0} - m_UseCustomVertexStreams: 0 m_EnableGPUInstancing: 0 m_ApplyActiveColorSpace: 0 m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 m_VertexStreams: 00010304 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 m_Mesh: {fileID: 0} m_Mesh1: {fileID: 0} m_Mesh2: {fileID: 0} m_Mesh3: {fileID: 0} - m_MaskInteraction: 0 + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 --- !u!1 &170842 GameObject: m_ObjectHideFlags: 0 @@ -18337,12 +18771,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170842} + serializedVersion: 2 m_LocalRotation: {x: -0.03645332, y: 0.6411859, z: 0.7524059, w: -0.1464145} m_LocalPosition: {x: 0.019133804, y: 0.06267741, z: 0.15894839} m_LocalScale: {x: -8.398152, y: 7.841673, z: 6.729926} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &10870846 Light: @@ -18352,15 +18787,14 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 170842} m_Enabled: 0 - serializedVersion: 10 + serializedVersion: 12 m_Type: 2 - m_Shape: 0 m_Color: {r: 1, g: 0.7486692, b: 0.35820895, a: 1} m_Intensity: 2.6 m_Range: 3 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 + m_CookieSize2D: {x: 10, y: 10} m_Shadows: m_Type: 0 m_Resolution: -1 @@ -18403,8 +18837,13 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ForceVisible: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 + m_LightUnit: 1 + m_LuxAtDistance: 1 + m_EnableSpotReflector: 1 --- !u!1 &192188 GameObject: m_ObjectHideFlags: 0 @@ -18428,12 +18867,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 192188} + serializedVersion: 2 m_LocalRotation: {x: 0.3855644, y: 0.5764498, z: 0.61335254, w: -0.37794775} m_LocalPosition: {x: -0.0547, y: -0.0775, z: -0.1407} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: -93.05399, y: 224.351, z: -338.97302} --- !u!1 &197910 GameObject: @@ -18458,12 +18898,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 197910} + serializedVersion: 2 m_LocalRotation: {x: -0.00018936823, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.006, y: 0.038, z: -0.187} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1672520594972850586 GameObject: @@ -18490,12 +18931,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672520594972850586} + serializedVersion: 2 m_LocalRotation: {x: 0.2332003, y: -4.6566123e-10, z: 6.7780087e-10, w: 0.97242874} m_LocalPosition: {x: 0.00321, y: 0.0846, z: -0.08727} m_LocalScale: {x: 0.0011541065, y: 0.0011541065, z: 0.0011541065} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 26.971, y: 0, z: 0} --- !u!33 &7974126853037196089 MeshFilter: @@ -18516,10 +18958,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -18541,9 +18990,12 @@ 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 &1838663821926986200 GameObject: m_ObjectHideFlags: 0 @@ -18569,12 +19021,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1838663821926986200} + serializedVersion: 2 m_LocalRotation: {x: 0.2749258, y: -0.0021518932, z: -0.0000050606573, w: 0.96146303} m_LocalPosition: {x: -0.00001, y: 0.08475, z: 0.11266} m_LocalScale: {x: 0.0015334537, y: 0.0015334537, z: 0.0015334537} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 31.915, y: -0.279, z: -0.081} --- !u!33 &2184819352264373379 MeshFilter: @@ -18595,10 +19048,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -18620,9 +19080,12 @@ 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 &3467070532941655441 GameObject: m_ObjectHideFlags: 0 @@ -18648,12 +19111,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3467070532941655441} + serializedVersion: 2 m_LocalRotation: {x: 0.2332003, y: -4.6566123e-10, z: 6.7780087e-10, w: 0.97242874} m_LocalPosition: {x: -0.00361, y: 0.0846, z: -0.08727} m_LocalScale: {x: 0.0011541065, y: 0.0011541065, z: 0.0011541065} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 26.971, y: 0, z: 0} --- !u!33 &3646291037748904710 MeshFilter: @@ -18674,10 +19138,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 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: @@ -18699,9 +19170,12 @@ 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 &7503600391893727231 GameObject: m_ObjectHideFlags: 0 @@ -18726,12 +19200,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7503600391893727231} + serializedVersion: 2 m_LocalRotation: {x: -0.00016761065, y: 0.009068018, z: 0.002430454, w: 0.99995595} m_LocalPosition: {x: 0.016671387, y: -0.024682235, z: -0.00019999593} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 443350} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &6753450307047040578 AudioSource: @@ -18744,6 +19219,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 diff --git a/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset b/Assets/Scenes/Cho môn AI/Only AI/NavMesh-NavManager 1.asset index 1940f80754beb048b9a28939d3431b99e92ad028..fda75bf71858cfa72da8a4f4baf2b934b2fc5ba7 100644 GIT binary patch literal 52884 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 z zaGYUzFkj7Z?}LjJ!d$B)g|PMwg$DrV{vyZP!MNxx#4+~}TzryojDQ2Zz$_=$3-xnk z8-a@wgpUxoNMOF_kc;t02Jq+r9uvT9PfVBPeH4EOcf!|@J}P$KXt0v8KB zN#G)ZtAqH-fVl!*j{6*mFA;b?VCFYG<2*e3JUkQKx$*>kZ{hoxSa+Zk_|GdGe7twy zePVW2{NDo}&QIy*sPkFQ9|=E-BKtnEb{qX7AI4m!W0Kz@=y^UdKj)$JPpr$l4F1-_ zlfrpKgf*UL=@ci`AAcL*R!RN7;k_Jq)7;0zPNw_bLoXrSvDwjAKA3FrR950YKVv;~ zI?;o(ZE|$t9G?XJ;yE|0O6?H1F7ss$zr#BLc{ryIb%tq$`MrP8hm!6GU)-Ji;mRMS z9O&1Hvz8KH{ci`%2YCigoG$xl=x4;;ZThir|C=5FoLSLdi1RDnIfl_6kW##}&GJrv zN#2`6ivA$$pD!OT zq_wah5lEJ)pO7}Zj;~qj`(b0{?t=L z{g2eYWM}nLs6O-KnV$Kl&@Y&6R{i1BCq-L2e@oD^+1BVY%xAlvpU(cm=R#9($nzes z+LK#;Oh^5wtX!CbxIFYLRsL^QS9BNFeH7>U>vy}?^681bvnGBJr=@Ud1nu?4N|0ZYAtdzY(72y^q*e0evd3bS)q1 zYcKR}pmu{`Yd3BkTiw1!fsc_YvFCjGbm{gmf_tA4Y03+NU25Ahmey0xz@;78jl;&`*S z=<6@(bKbf?Qn}WbFWYm7(|)FZJL-$)kuyEw_liCD$=oiaGd;xz2|wrE10(r+<-KrF zkRJ67f@Rl={@dm4p6AoA_x4a9@prxboF5zv%}Re==CKDy{I5%UCZ5G=2mOSopZr_! z=0luMeWRNn67enIC(idCj(?OVzK_Q(J?bNUz0fzwJEr1npX$doCbBOpmIj>X};OZ~xIk$N}9oCZys zzWt~zSKj;i%U>*5d3}?UE(r5Uo}bGndE$KP{=&}lY3q&5kHPU-jk*pQ_|L?HJFQs0DVYm`FNeeb52wO-HfK7)=gcX7y z4S&9WZ*#WwKX*;OJm=~9CC_vl-r?1&k~eg`96DV(zS6^X>;6?@_4^AGf1LAll3M;B DRFZt@ literal 86248 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 YQ`IXq?45wS;p={%5q^5=(FlCXKk-`l6#xJL diff --git a/Assets/Scripts/Player/Weapon/vProjectileControl.cs b/Assets/Scripts/Player/Weapon/vProjectileControl.cs index 02d4999f..5e93dde6 100644 --- a/Assets/Scripts/Player/Weapon/vProjectileControl.cs +++ b/Assets/Scripts/Player/Weapon/vProjectileControl.cs @@ -51,6 +51,9 @@ namespace Invector.vShooter { AddTrailPosition(); } + + // Log diagnostic: Kiểm tra Layer mà đạn có thể bắn trúng + Debug.Log($"PROJECTILE SPAWNED: HitLayer Mask: {hitLayer.value}. Đảm bảo Layer của Enemy nằm trong mask này."); } protected virtual void Update() @@ -61,6 +64,7 @@ namespace Invector.vShooter transform.rotation = Quaternion.LookRotation(_rigidBody.linearVelocity.normalized, transform.up); } + // Thực hiện raycast để kiểm tra va chạm if (Physics.Linecast(previousPosition, transform.position + transform.forward * 0.5f, out hitInfo, hitLayer)) { if (!hitInfo.collider) @@ -98,11 +102,31 @@ namespace Invector.vShooter damage.hitPosition = hitInfo.point; damage.receiver = hitInfo.collider.transform; damage.force = transform.forward * damage.damageValue * forceMultiplier; + if (damage.damageValue > 0) { onPassDamage.Invoke(damage); - hitInfo.collider.gameObject.ApplyDamage(damage, damage.sender ? damage.sender.GetComponent() : null); + // 1. Log khi trúng bất cứ thứ gì + Debug.Log($"PROJECTILE HIT: {hitInfo.collider.name} | Tag: {hitInfo.collider.tag} | Layer: {LayerMask.LayerToName(hitInfo.collider.gameObject.layer)}"); + + // 2. Tìm đối tượng nhận sát thương (ưu tiên tìm ở cha nếu trúng collider con) + var damageReceiver = hitInfo.collider.gameObject.GetComponentInParent(); + + if (damageReceiver != null) + { + if (hitInfo.collider.CompareTag("Enemy") || damageReceiver.gameObject.CompareTag("Enemy")) + { + Debug.Log($"APPLYING DAMAGE TO ENEMY: {damageReceiver.gameObject.name}. Damage: {damage.damageValue}"); + } + + // Gửi sát thương đến đối tượng tìm thấy + damageReceiver.gameObject.ApplyDamage(damage, damage.sender ? damage.sender.GetComponent() : null); + } + else + { + Debug.LogWarning($"NO DAMAGE RECEIVER FOUND on {hitInfo.collider.name} or its parents. Đảm bảo Enemy có component vHealthController."); + } } var rigb = hitInfo.collider.gameObject.GetComponent();