diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index 6f925fc21..b7565176c 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -153,6 +153,16 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: de7344e90b711ec45a4764294a1f6c80 + m_Address: Cosmetics/Steve + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 43354319a89aa5e42afc30b631405f76 + m_Address: Cosmetics/6C + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: 819d03717e2ae4f4a8216ff1ba94ff77, type: 2} m_SchemaSet: diff --git a/Assets/Artists/Animtions/Properties/Properties Animator.controller b/Assets/Artists/Animtions/Properties/Properties Animator.controller index 9a0e25162..b2a5f58fc 100644 --- a/Assets/Artists/Animtions/Properties/Properties Animator.controller +++ b/Assets/Artists/Animtions/Properties/Properties Animator.controller @@ -21,6 +21,9 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -4043171781414743301} m_Position: {x: 305, y: 195, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1253309677106572187} + m_Position: {x: 340, y: 260, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -131,6 +134,32 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &1253309677106572187 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Property_Ready_Sniper_Aim + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1a0f3d896849fce47ac5475fefcf450a, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &4156959152054088877 AnimatorState: serializedVersion: 6 diff --git a/Assets/Artists/Animtions/Properties/Property_Ready_Sniper_Aim.anim b/Assets/Artists/Animtions/Properties/Property_Ready_Sniper_Aim.anim new file mode 100644 index 000000000..059bbdb8c --- /dev/null +++ b/Assets/Artists/Animtions/Properties/Property_Ready_Sniper_Aim.anim @@ -0,0 +1,278 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Property_Ready_Sniper_Aim + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0.45781696 + outSlope: 0.45781696 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.9992571 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0.39506844 + outSlope: 0.39506844 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.66539836 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 14.488998 + outSlope: 14.488998 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.24313346 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/Aim + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/AllowFire + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 1.9397798 + outSlope: 1.9397798 + tangentMode: 0 + weightedMode: 0 + inWeight: 1 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/Stable + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 3207461190 + attribute: 494360628 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 680316791 + attribute: 494360628 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 886196573 + attribute: 494360628 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + typeID: 114 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0.45781696 + outSlope: 0.45781696 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.9992571 + - serializedVersion: 3 + time: 0.26666668 + value: 0 + inSlope: 0.39506844 + outSlope: 0.39506844 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.66539836 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 14.488998 + outSlope: 14.488998 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.24313346 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/Aim + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/AllowFire + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 1.9397798 + outSlope: 1.9397798 + tangentMode: 0 + weightedMode: 0 + inWeight: 1 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: value + path: Properties/Stable + classID: 114 + script: {fileID: 11500000, guid: a970eb848545573428bd7acd46bdac3d, type: 3} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Artists/Configs/Animator/GunController.controller b/Assets/Artists/Configs/Animator/GunController.controller index 1c67f328a..5200c13db 100644 --- a/Assets/Artists/Configs/Animator/GunController.controller +++ b/Assets/Artists/Configs/Animator/GunController.controller @@ -764,7 +764,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ReloadBolt + m_Name: BoltAction m_Speed: 1 m_CycleOffset: 0 m_Transitions: diff --git a/Assets/Artists/Configs/Cosmetics/Cosmetic_6C.asset b/Assets/Artists/Configs/Cosmetics/Cosmetic_6C.asset new file mode 100644 index 000000000..f68f7f580 --- /dev/null +++ b/Assets/Artists/Configs/Cosmetics/Cosmetic_6C.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b27203fb1caca0642be9f904f1163533, type: 3} + m_Name: Cosmetic_6C + m_EditorClassIdentifier: + id: 3071 + addressablePath: Cosmetics/6C + icon: {fileID: 0} + type: + rid: -2 + contents: + - rid: 1055089212959490104 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1055089212959490104 + type: {class: CosmeticTextureContent, ns: BITFALL.Cosmetic, asm: BITFALL.Cosmetic.Runtime} + data: + texture: {fileID: 2800000, guid: 3f2001a044b4d1146b7c246c8c8d480c, type: 3} diff --git a/Assets/Artists/Configs/Cosmetics/Cosmetic_Steve.asset b/Assets/Artists/Configs/Cosmetics/Cosmetic_Steve.asset new file mode 100644 index 000000000..d19a605e6 --- /dev/null +++ b/Assets/Artists/Configs/Cosmetics/Cosmetic_Steve.asset @@ -0,0 +1,30 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b27203fb1caca0642be9f904f1163533, type: 3} + m_Name: Cosmetic_Steve + m_EditorClassIdentifier: + id: 3070 + addressablePath: Cosmetics/Steve + icon: {fileID: 0} + type: + rid: -2 + contents: + - rid: 1055089212959490104 + references: + version: 2 + RefIds: + - rid: -2 + type: {class: , ns: , asm: } + - rid: 1055089212959490104 + type: {class: CosmeticTextureContent, ns: BITFALL.Cosmetic, asm: BITFALL.Cosmetic.Runtime} + data: + texture: {fileID: 2800000, guid: fececaf19d25e1f409adb32147d3087a, type: 3} diff --git a/Assets/Artists/Configs/Items/Weapon_AWP.asset b/Assets/Artists/Configs/Items/Weapon_AWP.asset index 73808577c..37d4edeef 100644 --- a/Assets/Artists/Configs/Items/Weapon_AWP.asset +++ b/Assets/Artists/Configs/Items/Weapon_AWP.asset @@ -31,9 +31,9 @@ MonoBehaviour: heavyMeleeForce: 64 fireMode: rid: 806583747386015749 - initialDamage: 100 - initialBulletForce: 512 - initialBulletSpeed: 256 + initialDamage: 101 + initialBulletForce: 2048 + initialBulletSpeed: 128 initialAimZoom: 8 isScopeAim: 1 references: @@ -43,10 +43,11 @@ MonoBehaviour: type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item} data: fireRate: 1 + requireBoltAction: 1 - rid: 806583747386015752 type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment} data: - rid: 806583747386015753 type: {class: VectorRecoil, ns: BITFALL.Guns, asm: BITFALL.Item} data: - recoil: {x: -8, y: 8, z: 8} + recoil: {x: -2, y: 2, z: 8} diff --git a/Assets/Artists/Configs/Items/Weapon_Glock.asset b/Assets/Artists/Configs/Items/Weapon_Glock.asset index 1682471b8..0a8250094 100644 --- a/Assets/Artists/Configs/Items/Weapon_Glock.asset +++ b/Assets/Artists/Configs/Items/Weapon_Glock.asset @@ -19,6 +19,7 @@ MonoBehaviour: squareIcon: {fileID: 2800000, guid: ae3a3be8020e4e8448944df901ed45b3, type: 3} rectangleIcon: {fileID: 2800000, guid: 7910edbea6bc88e49ac8a733f8f40238, type: 3} quality: 0 + isImprovised: 0 factoryProperties: - rid: 749940167810482195 - rid: 749940167810482196 @@ -33,6 +34,9 @@ MonoBehaviour: rid: 806583484692037646 initialDamage: 12 initialBulletForce: 256 + initialBulletSpeed: 32 + initialAimZoom: 1 + isScopeAim: 0 references: version: 2 RefIds: @@ -50,6 +54,7 @@ MonoBehaviour: type: {class: SemiFireMode, ns: BITFALL.Guns, asm: BITFALL.Item} data: fireRate: 8 + requireBoltAction: 0 - rid: 6077775441645010964 type: {class: EquipmentAsWeapon, ns: BITFALL, asm: BITFALL.Entities.Equipment} data: diff --git a/Assets/Artists/Configs/Items/Weapon_M4A1.asset b/Assets/Artists/Configs/Items/Weapon_M4A1.asset index c46112cb3..4dae23fbd 100644 --- a/Assets/Artists/Configs/Items/Weapon_M4A1.asset +++ b/Assets/Artists/Configs/Items/Weapon_M4A1.asset @@ -35,8 +35,9 @@ MonoBehaviour: rid: 806583484692037645 initialDamage: 32 initialBulletForce: 512 - initialBulletSpeed: 128 + initialBulletSpeed: 64 initialAimZoom: 1 + isScopeAim: 0 references: version: 2 RefIds: diff --git a/Assets/Artists/Configs/Trails FX Profile.asset b/Assets/Artists/Configs/Trails FX Profile.asset new file mode 100644 index 000000000..f3817f969 --- /dev/null +++ b/Assets/Artists/Configs/Trails FX Profile.asset @@ -0,0 +1,160 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 98a0befda4b1f449b9721f7f70b9dcf0, type: 3} + m_Name: Trails FX Profile + m_EditorClassIdentifier: + profile: {fileID: 0} + active: 1 + ignoreVisibility: 0 + ignoreFrames: 0 + duration: 0.5 + continuous: 0 + smooth: 0 + checkWorldPosition: 0 + minDistance: 0.1 + worldPositionRelativeOption: 0 + worldPositionRelativeTransform: {fileID: 0} + checkScreenPosition: 1 + minPixelDistance: 10 + maxStepsPerFrame: 12 + checkTime: 0 + timeInterval: 1 + checkCollisions: 0 + orientToSurface: 1 + ground: 0 + surfaceOffset: 0.05 + collisionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + drawBehind: 1 + mask: {fileID: 0} + subMeshMask: -1 + cullMode: 2 + colorOverTime: + serializedVersion: 2 + key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorRamp: 0 + colorRampTexture: {fileID: 0} + fadeOut: 1 + colorSequence: 0 + color: {r: 1, g: 1, b: 1, a: 1} + colorCycleDuration: 3 + colorCycleLoop: 1 + pingPongSpeed: 1 + colorStartPalette: + serializedVersion: 2 + key0: {r: 1, g: 0, b: 0, a: 1} + key1: {r: 0, g: 1, b: 0, a: 1} + key2: {r: 0, g: 0, b: 1, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + cam: {fileID: 0} + effect: 0 + customMaterial: {fileID: 0} + texture: {fileID: 0} + scale: {x: 1, y: 1, z: 1} + scaleStartRandomMin: {x: 1, y: 1, z: 1} + scaleStartRandomMax: {x: 1, y: 1, z: 1} + ignoreTransformScale: 0 + scaleOverTime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + scaleUniform: 0 + localPositionRandomMin: {x: 0, y: 0, z: 0} + localPositionRandomMax: {x: 0, y: 0, z: 0} + laserBandWidth: 0.1 + laserIntensity: 20 + laserFlash: 0.2 + trailTint: {r: 0, g: 0, b: 0.1, a: 1} + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + lookTarget: {fileID: 0} + lookToCamera: 1 + textureCutOff: 0.25 + normalThreshold: 0.3 + useLastAnimationState: 0 + maxBatches: 50 + meshPoolSize: 256 + animationStates: + interpolate: 0 diff --git a/Assets/Artists/Materials/Bullet_Trail.mat b/Assets/Artists/Materials/Bullet_Trail.mat index 9caa9299f..ebbb26c13 100644 --- a/Assets/Artists/Materials/Bullet_Trail.mat +++ b/Assets/Artists/Materials/Bullet_Trail.mat @@ -117,7 +117,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 1.1132076, g: 0.50165886, b: 0, a: 1} + - _EmissionColor: {r: 1.4980392, g: 0.6750804, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &7552805881969327504 diff --git a/Assets/Artists/Models/FX/FX_Bullet.fbx b/Assets/Artists/Models/FX/FX_Bullet.fbx new file mode 100644 index 000000000..d4ac7b7c9 Binary files /dev/null and b/Assets/Artists/Models/FX/FX_Bullet.fbx differ diff --git a/Assets/Artists/Models/FX/Overlay_Scope.fbx b/Assets/Artists/Models/FX/Overlay_Scope.fbx new file mode 100644 index 000000000..e1943791b Binary files /dev/null and b/Assets/Artists/Models/FX/Overlay_Scope.fbx differ diff --git a/Assets/Artists/Models/FX/Overlay_Scope_BaseColor.mat b/Assets/Artists/Models/FX/Overlay_Scope_BaseColor.mat new file mode 100644 index 000000000..b29043b00 --- /dev/null +++ b/Assets/Artists/Models/FX/Overlay_Scope_BaseColor.mat @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7722037527298034331 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Overlay_Scope_BaseColor + m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BlendOp: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 0 + - _SampleGI: 0 + - _Smoothness: 0 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.028301895, g: 0.028301895, b: 0.028301895, a: 1} + - _Color: {r: 0.028301895, g: 0.028301895, b: 0.028301895, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Artists/Models/Guns/AWP/Weapon_AWP.overrideController b/Assets/Artists/Models/Guns/AWP/Weapon_AWP.overrideController index a58a10b3c..ccd2ede94 100644 --- a/Assets/Artists/Models/Guns/AWP/Weapon_AWP.overrideController +++ b/Assets/Artists/Models/Guns/AWP/Weapon_AWP.overrideController @@ -67,7 +67,7 @@ AnimatorOverrideController: - m_OriginalClip: {fileID: 7400000, guid: 8d9f33d150164f341a38ee4645421a42, type: 2} m_OverrideClip: {fileID: 7400000, guid: f8007ba940ee84340a80e0c3216d3bb4, type: 2} - m_OriginalClip: {fileID: 7400000, guid: ed88f135a8a788346a203496110202b7, type: 2} - m_OverrideClip: {fileID: 7400000, guid: 980b8fac79e56fa4ca893a489cd58f1c, type: 2} + m_OverrideClip: {fileID: 7400000, guid: 1a0f3d896849fce47ac5475fefcf450a, type: 2} - m_OriginalClip: {fileID: 7400000, guid: 4f865b7f02e5f224b8533fdd1498a38e, type: 2} m_OverrideClip: {fileID: 8610628468645657905, guid: 3a5fae624dead2f4f817de0db6c38aa5, type: 3} diff --git a/Assets/Artists/Models/Guns/M4A1/Gun_Glass.mat b/Assets/Artists/Models/Guns/M4A1/Gun_Glass.mat index 157210505..e620d78b0 100644 --- a/Assets/Artists/Models/Guns/M4A1/Gun_Glass.mat +++ b/Assets/Artists/Models/Guns/M4A1/Gun_Glass.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: RenderType: Opaque disabledShaderPasses: [] @@ -99,7 +99,7 @@ Material: - _GlossMapScale: 0 - _Glossiness: 0 - _GlossyReflections: 0 - - _Metallic: 0 + - _Metallic: 1 - _OcclusionStrength: 1 - _Parallax: 0.005 - _QueueOffset: 0 @@ -113,8 +113,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0} + - _Color: {r: 1, g: 1, b: 1, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Artists/Prefabs/BITBullet.prefab b/Assets/Artists/Prefabs/BITBullet.prefab index a381f80a9..541121e2e 100644 --- a/Assets/Artists/Prefabs/BITBullet.prefab +++ b/Assets/Artists/Prefabs/BITBullet.prefab @@ -1,5 +1,88 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1297237592376118043 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 85704831835494353} + - component: {fileID: 4518352093786847700} + - component: {fileID: 4799892786137225939} + m_Layer: 1 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &85704831835494353 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297237592376118043} + serializedVersion: 2 + m_LocalRotation: {x: -0.70710677, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -0.1088} + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 2956281190107464546} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!33 &4518352093786847700 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297237592376118043} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4799892786137225939 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1297237592376118043} + m_Enabled: 1 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c4a3b3cdb61437f49a87d07e3cfbb530, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &2956281190107464557 GameObject: m_ObjectHideFlags: 0 @@ -25,14 +108,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2956281190107464557} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.94, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8874121523024828726} + - {fileID: 85704831835494353} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &2956281190107464547 MonoBehaviour: @@ -49,13 +133,13 @@ MonoBehaviour: trailRenderer: {fileID: 8716880379926958720} --- !u!96 &8716880379926958720 TrailRenderer: - serializedVersion: 2 + serializedVersion: 3 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2956281190107464557} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -90,9 +174,10 @@ TrailRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_Time: 0.08 + m_PreviewTimeScale: 1 m_Parameters: serializedVersion: 3 - widthMultiplier: 1 + widthMultiplier: 0 widthCurve: serializedVersion: 2 m_Curve: @@ -153,24 +238,34 @@ TrailRenderer: 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.5 generateLightingData: 0 m_MinVertexDistance: 0.1 + m_MaskInteraction: 0 m_Autodestruct: 0 m_Emitting: 1 + m_ApplyActiveColorSpace: 0 --- !u!1001 &801374439789391961 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2956281190107464546} m_Modifications: + - target: {fileID: 3591767580669312998, guid: fe2fc116936b3a34481528b002824f25, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 8086278330932947311, guid: fe2fc116936b3a34481528b002824f25, type: 3} propertyPath: m_RootOrder @@ -233,6 +328,9 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: - {fileID: -2751375205870227775, guid: fe2fc116936b3a34481528b002824f25, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fe2fc116936b3a34481528b002824f25, type: 3} --- !u!4 &8874121523024828726 stripped Transform: diff --git a/Assets/Artists/Prefabs/EntityProxy.prefab b/Assets/Artists/Prefabs/EntityProxy.prefab index 9ab2e64ad..f1f632731 100644 --- a/Assets/Artists/Prefabs/EntityProxy.prefab +++ b/Assets/Artists/Prefabs/EntityProxy.prefab @@ -109,7 +109,7 @@ MonoBehaviour: firePoint: {fileID: 2322454793245516490} bulletService: rid: 806583666069995709 - forceFire: 1 + forceFire: 0 customFireRate: allow: 0 value: 0 @@ -203,7 +203,7 @@ MonoBehaviour: assetableItem: {fileID: 11400000, guid: 9bba7152a5d65c049b17a8461ad4e844, type: 2} meleeService: rid: 806583703969988608 - forceAttack: 1 + forceAttack: 0 references: version: 2 RefIds: @@ -467,11 +467,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d61f8d5d7b83b1941831e20da974aa54, type: 3} m_Name: m_EditorClassIdentifier: - InitialFov: 0 virtualCamera: {fileID: 0} overrideIndex: allow: 0 value: 0 + optionalScope: + allow: 0 + value: {fileID: 0} --- !u!114 &4900988971439423463 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Prefabs/Main Camera.prefab b/Assets/Artists/Prefabs/Main Camera.prefab index 65c3d3468..53ee997d4 100644 --- a/Assets/Artists/Prefabs/Main Camera.prefab +++ b/Assets/Artists/Prefabs/Main Camera.prefab @@ -75,7 +75,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 98295 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -185,13 +185,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 903f3eba17c4fcf41990c0bf8a0f3fcd, type: 3} m_Name: m_EditorClassIdentifier: - ads: - rid: 5474080413458366464 brain: {fileID: 4248894547058506011} - references: - version: 2 - RefIds: - - rid: 5474080413458366464 - type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit} - data: - so: {fileID: 11400000, guid: c361f1704f508b142ab5d7313ea8354c, type: 2} diff --git a/Assets/Artists/Prefabs/Player.prefab b/Assets/Artists/Prefabs/Player.prefab index e7519038e..05bd9e7dd 100644 --- a/Assets/Artists/Prefabs/Player.prefab +++ b/Assets/Artists/Prefabs/Player.prefab @@ -1100,6 +1100,7 @@ GameObject: - component: {fileID: 7303924725377500738} - component: {fileID: 532745093476038155} - component: {fileID: 1894260874635406670} + - component: {fileID: 6479486122723758942} m_Layer: 6 m_Name: Player m_TagString: Untagged @@ -1471,57 +1472,9 @@ MonoBehaviour: overrideIndex: allow: 0 value: 0 - zoomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 75 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 60 - inSlope: -12.5 - outSlope: -12.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2 - value: 50 - inSlope: -7.5 - outSlope: -7.5 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 3 - value: 45 - inSlope: -3.3333333 - outSlope: -3.3333333 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 8 - value: 25 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 + optionalScope: + allow: 1 + value: {fileID: 8058098936547477565} --- !u!114 &7063041954768829124 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2381,7 +2334,9 @@ MonoBehaviour: dampValue: {x: 1, y: 1, z: 1} damp: 16 frequence: 32 - locationAdditive: {fileID: 4486952052422082421} + locationAdditives: + - {fileID: 4486952052422082421} + - {fileID: 4630340609974338260} damageBasedMotion: serializedVersion: 2 m_Curve: @@ -2430,6 +2385,26 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c4e62fe503fa9eb45aba921100310343, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &6479486122723758942 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4826102346843731729} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7a830f58f533f474e8b7683cff1134b9, type: 3} + m_Name: + m_EditorClassIdentifier: + steamService: + rid: 1055089212959490105 + references: + version: 2 + RefIds: + - rid: 1055089212959490105 + type: {class: SteamServiceSingleton, ns: BITKit.Steamwork, asm: BITKit.Extension.Steamwork} + data: --- !u!1 &4826102347057741775 GameObject: m_ObjectHideFlags: 0 @@ -2562,6 +2537,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 7250741415002362503} - {fileID: 9103858848549245432} - {fileID: 7999429370730056110} - {fileID: 3277717096784339497} @@ -3248,6 +3224,37 @@ Transform: m_Children: [] m_Father: {fileID: 2019605867538852436} m_LocalEulerAnglesHint: {x: -10, y: 0, z: 0} +--- !u!1 &8044417550327552958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 124510608249809550} + m_Layer: 7 + m_Name: Sight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &124510608249809550 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8044417550327552958} + serializedVersion: 2 + m_LocalRotation: {x: -0.000000023542961, y: -0.7071068, z: -0.7071068, w: -0.000000018109972} + m_LocalPosition: {x: -0.0001, y: -0.0202, z: 0.01} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2268749414226167964} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8325772932023106936 GameObject: m_ObjectHideFlags: 0 @@ -3586,7 +3593,11 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 518203656061299679} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4059732203151340930} m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} --- !u!4 &461740354935876669 stripped Transform: @@ -3594,12 +3605,47 @@ Transform: type: 3} m_PrefabInstance: {fileID: 984723819954259080} m_PrefabAsset: {fileID: 0} +--- !u!137 &2348331999583567347 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 3259623828982151547, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 984723819954259080} + m_PrefabAsset: {fileID: 0} +--- !u!1 &3619673866897773348 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 984723819954259080} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4059732203151340930 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3619673866897773348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 2348331999583567347} + - {fileID: 6484788819145901710} + steveRenderers: [] + alexRenderers: [] --- !u!4 &4138942853584030110 stripped Transform: m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} m_PrefabInstance: {fileID: 984723819954259080} m_PrefabAsset: {fileID: 0} +--- !u!137 &6484788819145901710 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 6076736928665862662, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 984723819954259080} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1040364863550748081 PrefabInstance: m_ObjectHideFlags: 0 @@ -4010,6 +4056,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2513368842649961580} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 8ce64bfbf2bb80840af381346bccb782, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3695162061770177013} m_SourcePrefab: {fileID: 100100000, guid: 8ce64bfbf2bb80840af381346bccb782, type: 3} --- !u!137 &735532174701725946 stripped SkinnedMeshRenderer: @@ -4170,6 +4220,23 @@ MonoBehaviour: type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit} data: so: {fileID: 11400000, guid: 4a847097a446a4c42b582c2a2f878b11, type: 2} +--- !u!114 &3695162061770177013 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1772301879848412717} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 8312879711771833223} + - {fileID: 735532174701725946} + steveRenderers: [] + alexRenderers: [] --- !u!4 &2437386659687487010 stripped Transform: m_CorrespondingSourceObject: {fileID: 3857971597623217502, guid: 8ce64bfbf2bb80840af381346bccb782, @@ -4697,6 +4764,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2486523390929547415} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: c1a991e2fc6f6f54c977926f66a4acec, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4043934240236099025} m_SourcePrefab: {fileID: 100100000, guid: c1a991e2fc6f6f54c977926f66a4acec, type: 3} --- !u!4 &2817909135410992819 stripped Transform: @@ -4797,6 +4868,23 @@ MonoBehaviour: debug: 0 animator: {fileID: 514671996699977757} layerInfos: [] +--- !u!114 &4043934240236099025 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3193309152473533449} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 5158269637596109219} + - {fileID: 4538978027255161566} + steveRenderers: [] + alexRenderers: [] --- !u!137 &4538978027255161566 stripped SkinnedMeshRenderer: m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: c1a991e2fc6f6f54c977926f66a4acec, @@ -5645,6 +5733,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 2751918525240053213} + - targetCorrespondingSourceObject: {fileID: 3857971597623217502, guid: 644cb63bc5228d44e901a3251d09e8cd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 124510608249809550} m_AddedComponents: - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} @@ -5662,6 +5754,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 8065589936586356455} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 644cb63bc5228d44e901a3251d09e8cd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 4896034696061477889} m_SourcePrefab: {fileID: 100100000, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} --- !u!137 &279771559974666008 stripped SkinnedMeshRenderer: @@ -5813,6 +5909,13 @@ MonoBehaviour: damp: 16 frequence: 16 value: {x: 0, y: 0, z: 0} + initialSight: {fileID: 124510608249809550} + newSight: + allow: 0 + value: {fileID: 0} + breathingAdditive: + allow: 0 + value: {fileID: 0} fireAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} aimAction: {fileID: 5345126666820269769, guid: e0e9267cab824e8489fc27d83f1d07b7, @@ -5821,6 +5924,7 @@ MonoBehaviour: type: 3} meleeAction: {fileID: 709374767176041235, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + steadyAimAction: {fileID: 0} cameraView: {fileID: 8525020893898639929} locationAdditive: {fileID: 4486952052422082421} expectFiring: @@ -5903,6 +6007,25 @@ MonoBehaviour: type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit} data: so: {fileID: 11400000, guid: b7664d3b6512cb042bd9716363153bc1, type: 2} +--- !u!114 &4896034696061477889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2753699357243898003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 3790416042972862020} + - {fileID: 5616597724130929977} + steveRenderers: + - {fileID: 3790416042972862020} + alexRenderers: + - {fileID: 5616597724130929977} --- !u!4 &3277717096784339497 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 644cb63bc5228d44e901a3251d09e8cd, @@ -7042,14 +7165,47 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6204566845109346367} m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} +--- !u!1 &405759294741924888 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 4192940043719826356} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6204566845109346367 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 405759294741924888} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 1660933650970010319} + - {fileID: 1660933650970010319} + steveRenderers: [] + alexRenderers: [] --- !u!4 &1074771797319587490 stripped Transform: m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} m_PrefabInstance: {fileID: 4192940043719826356} m_PrefabAsset: {fileID: 0} +--- !u!137 &1660933650970010319 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 3259623828982151547, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 4192940043719826356} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4394035954756314480 PrefabInstance: m_ObjectHideFlags: 0 @@ -7423,6 +7579,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 3269250633790738649} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 2457bdeea68be7942b83d81070b7e9b5, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8391365113968233690} m_SourcePrefab: {fileID: 100100000, guid: 2457bdeea68be7942b83d81070b7e9b5, type: 3} --- !u!137 &456800702483242086 stripped SkinnedMeshRenderer: @@ -7537,6 +7697,23 @@ MonoBehaviour: - rid: 806583611772633088 type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} data: +--- !u!114 &8391365113968233690 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5547240782841867409} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 6797791864527372870} + - {fileID: 2827962871058561339} + steveRenderers: [] + alexRenderers: [] --- !u!137 &6797791864527372870 stripped SkinnedMeshRenderer: m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: 2457bdeea68be7942b83d81070b7e9b5, @@ -7771,6 +7948,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4846561725160298145} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 59fe55bce6eff274ba5812ea0ffba739, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2801954557211680929} m_SourcePrefab: {fileID: 100100000, guid: 59fe55bce6eff274ba5812ea0ffba739, type: 3} --- !u!137 &230503227726884351 stripped SkinnedMeshRenderer: @@ -7878,6 +8059,23 @@ MonoBehaviour: - rid: 806583526086934616 type: {class: MeleeServiceSingleton, ns: BITFALL.Melee, asm: BITFALL.Melee.Runtime} data: +--- !u!114 &2801954557211680929 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5194518571645982618} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 2581565581698908720} + - {fileID: 6538094884673845581} + steveRenderers: [] + alexRenderers: [] --- !u!137 &6538094884673845581 stripped SkinnedMeshRenderer: m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: 59fe55bce6eff274ba5812ea0ffba739, @@ -8193,6 +8391,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7853171868855391787} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 644cb63bc5228d44e901a3251d09e8cd, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7178772687569022135} m_SourcePrefab: {fileID: 100100000, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} --- !u!4 &1468024213681948635 stripped Transform: @@ -8206,6 +8408,12 @@ Animator: type: 3} m_PrefabInstance: {fileID: 5253447055459780640} m_PrefabAsset: {fileID: 0} +--- !u!137 &3450782833313095899 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -1800213932466231045, guid: 644cb63bc5228d44e901a3251d09e8cd, + type: 3} + m_PrefabInstance: {fileID: 5253447055459780640} + m_PrefabAsset: {fileID: 0} --- !u!1 &4910779100086252913 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 644cb63bc5228d44e901a3251d09e8cd, @@ -8240,12 +8448,35 @@ MonoBehaviour: debug: 0 animator: {fileID: 1841246478262089137} layerInfos: [] +--- !u!114 &7178772687569022135 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4910779100086252913} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 6236304764949568422} + - {fileID: 3450782833313095899} + steveRenderers: [] + alexRenderers: [] --- !u!4 &5723309033838735307 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 644cb63bc5228d44e901a3251d09e8cd, type: 3} m_PrefabInstance: {fileID: 5253447055459780640} m_PrefabAsset: {fileID: 0} +--- !u!137 &6236304764949568422 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 2192180338147824518, guid: 644cb63bc5228d44e901a3251d09e8cd, + type: 3} + m_PrefabInstance: {fileID: 5253447055459780640} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5352611233010789815 PrefabInstance: m_ObjectHideFlags: 0 @@ -8358,14 +8589,53 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 3789395749545569824} - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1027577094763004658} m_SourcePrefab: {fileID: 100100000, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} +--- !u!137 &2169788911960666033 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 6076736928665862662, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 5352611233010789815} + m_PrefabAsset: {fileID: 0} --- !u!4 &4722680610291221762 stripped Transform: m_CorrespondingSourceObject: {fileID: 847274249425463477, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, type: 3} m_PrefabInstance: {fileID: 5352611233010789815} m_PrefabAsset: {fileID: 0} +--- !u!137 &7454804374024262860 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 3259623828982151547, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 5352611233010789815} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8491977599744358939 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4580683282014377900, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, + type: 3} + m_PrefabInstance: {fileID: 5352611233010789815} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1027577094763004658 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8491977599744358939} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 2169788911960666033} + - {fileID: 7454804374024262860} + steveRenderers: [] + alexRenderers: [] --- !u!4 &9120422628210139297 stripped Transform: m_CorrespondingSourceObject: {fileID: 3808369081287560470, guid: 4d2e2ea1a5d15fa4a90ca3a79baa74fa, @@ -8563,6 +8833,16 @@ PrefabInstance: propertyPath: recoilSpring.frequence value: 16 objectReference: {fileID: 0} + - target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: breathingAdditive.allow + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: breathingAdditive.value + value: + objectReference: {fileID: 4630340609974338260} - target: {fileID: 5543385129991014922, guid: 9fca9f6a9cb170842bc149a7236856d5, type: 3} propertyPath: renderers.Array.data[0] @@ -8648,6 +8928,41 @@ PrefabInstance: propertyPath: locationAdditive value: objectReference: {fileID: 843716438194269699} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: renderers.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: renderers.Array.data[0] + value: + objectReference: {fileID: 8431697307891967359} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: renderers.Array.data[1] + value: + objectReference: {fileID: 8431697307891967359} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: alexRenderers.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: steveRenderers.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: alexRenderers.Array.data[0] + value: + objectReference: {fileID: 894811798723960322} + - target: {fileID: 7413175997429740669, guid: 9fca9f6a9cb170842bc149a7236856d5, + type: 3} + propertyPath: steveRenderers.Array.data[0] + value: + objectReference: {fileID: 8431697307891967359} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -8669,6 +8984,96 @@ Transform: type: 3} m_PrefabInstance: {fileID: 6977410695001814958} m_PrefabAsset: {fileID: 0} +--- !u!1001 &7139744295657977196 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2019605867538852436} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000044703472 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000059604633 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071071 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071064 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_Name + value: Overlay_Scope + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + propertyPath: m_Layer + value: 7 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 14d27f819f1c3f641bb51485b2b91d39, type: 3} +--- !u!4 &7250741415002362503 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + m_PrefabInstance: {fileID: 7139744295657977196} + m_PrefabAsset: {fileID: 0} +--- !u!1 &8058098936547477565 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 14d27f819f1c3f641bb51485b2b91d39, + type: 3} + m_PrefabInstance: {fileID: 7139744295657977196} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7741503455564478201 PrefabInstance: m_ObjectHideFlags: 0 @@ -8757,6 +9162,11 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: -6750367996407960833, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: -6565134293425240629, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Layer @@ -8802,11 +9212,26 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: -1800213932466231045, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: -1745863489998566550, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: -1402092856403460385, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -637720069155821485, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: -457497680185661411, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Layer @@ -8827,6 +9252,11 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 855576828669387838, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Name @@ -8837,6 +9267,11 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 2192180338147824518, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4387719810744567721, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Layer @@ -8862,6 +9297,16 @@ PrefabInstance: propertyPath: m_Layer value: 7 objectReference: {fileID: 0} + - target: {fileID: 6349161354037280008, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6443177987131862144, guid: 6ee63b2c7f132b34aa209a54ae1d549c, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7297106052900782587, guid: 6ee63b2c7f132b34aa209a54ae1d549c, type: 3} propertyPath: m_Layer @@ -9207,6 +9652,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4925042838238742529} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5bbc8731abf94f94a8849dd8106296fe, + type: 3} + insertIndex: -1 + addedObject: {fileID: 252739679728340193} m_SourcePrefab: {fileID: 100100000, guid: 5bbc8731abf94f94a8849dd8106296fe, type: 3} --- !u!137 &727301493299199162 stripped SkinnedMeshRenderer: @@ -9358,6 +9807,13 @@ MonoBehaviour: damp: 20 frequence: 15 value: {x: 0, y: 0, z: 0} + initialSight: {fileID: 0} + newSight: + allow: 0 + value: {fileID: 0} + breathingAdditive: + allow: 0 + value: {fileID: 0} fireAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} aimAction: {fileID: 5345126666820269769, guid: e0e9267cab824e8489fc27d83f1d07b7, @@ -9366,6 +9822,7 @@ MonoBehaviour: type: 3} meleeAction: {fileID: 709374767176041235, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + steadyAimAction: {fileID: 0} cameraView: {fileID: 3579016247041219514} locationAdditive: {fileID: 4486952052422082421} expectFiring: @@ -9463,6 +9920,23 @@ MonoBehaviour: type: {class: ReferenceScriptableObject, ns: BITKit, asm: BITKit} data: so: {fileID: 11400000, guid: b7664d3b6512cb042bd9716363153bc1, type: 2} +--- !u!114 &252739679728340193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7048933845581474064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 727301493299199162} + - {fileID: 8322527087331379143} + steveRenderers: [] + alexRenderers: [] --- !u!4 &7681178683086533546 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5bbc8731abf94f94a8849dd8106296fe, diff --git a/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab b/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab index 2fda0cfa3..19b2e1e63 100644 --- a/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab +++ b/Assets/Artists/Prefabs/Props/Prop Throwing Knife.prefab @@ -107,6 +107,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 8823825610688837616} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1166721261996592115} m_SourcePrefab: {fileID: 100100000, guid: a5afe13492c9acf478def44319cb3619, type: 3} --- !u!1 &3130178554240382059 stripped GameObject: @@ -307,3 +311,175 @@ TrailRenderer: m_Autodestruct: 0 m_Emitting: 1 m_ApplyActiveColorSpace: 1 +--- !u!114 &1166721261996592115 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3130178554240382059} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 47f233e4c5d6f4aa6a1618016c2233f3, type: 3} + m_Name: + m_EditorClassIdentifier: + profile: {fileID: 11400000, guid: 59ab4c84f9f4ed34d9f2ae41d7edc40e, type: 2} + profileSync: 1 + target: {fileID: 8902346065236267787} + _active: 1 + ignoreVisibility: 0 + executeInEditMode: 0 + ignoreFrames: 0 + duration: 0.5 + continuous: 0 + smooth: 0 + checkWorldPosition: 1 + minDistance: 0.1 + worldPositionRelativeOption: 0 + worldPositionRelativeTransform: {fileID: 0} + checkScreenPosition: 1 + minPixelDistance: 10 + stepsBufferSize: 1023 + maxStepsPerFrame: 12 + checkTime: 0 + timeInterval: 1 + checkCollisions: 0 + orientToSurface: 1 + ground: 0 + surfaceOffset: 0.05 + collisionLayerMask: + serializedVersion: 2 + m_Bits: 4294967295 + mask: {fileID: 0} + drawBehind: 1 + cullMode: 2 + subMeshMask: -1 + colorOverTime: + serializedVersion: 2 + key0: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key1: {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + colorRamp: 0 + colorRampTexture: {fileID: 0} + colorRampStart: {fileID: 0} + colorRampEnd: {fileID: 0} + fadeOut: 1 + colorSequence: 0 + color: {r: 1, g: 1, b: 1, a: 1} + colorCycleDuration: 3 + colorCycleLoop: 1 + pingPongSpeed: 1 + colorStartPalette: + serializedVersion: 2 + key0: {r: 1, g: 0, b: 0, a: 1} + key1: {r: 0, g: 1, b: 0, a: 1} + key2: {r: 0, g: 0, b: 1, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 32768 + ctime2: 65535 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 3 + m_NumAlphaKeys: 2 + cam: {fileID: 0} + effect: 5 + customMaterial: {fileID: 0} + texture: {fileID: 0} + scale: {x: 1, y: 1, z: 1} + scaleStartRandomMin: {x: 1, y: 1, z: 1} + scaleStartRandomMax: {x: 1, y: 1, z: 1} + scaleOverTime: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + ignoreTransformScale: 0 + scaleUniform: 0 + parent: {fileID: 0} + localPositionRandomMin: {x: 0, y: 0, z: 0} + localPositionRandomMax: {x: 0, y: 0, z: 0} + laserBandWidth: 0.1 + laserIntensity: 20 + laserFlash: 0.2 + trailTint: {r: 0, g: 0, b: 0.1, a: 1} + cameraDistanceFade: 0 + cameraDistanceFadeNear: 0 + cameraDistanceFadeFar: 1000 + animationStates: + animator: {fileID: 0} + lookTarget: {fileID: 0} + lookToCamera: 1 + textureCutOff: 0.25 + normalThreshold: 0.3 + useLastAnimationState: 0 + maxBatches: 50 + meshPoolSize: 256 + interpolate: 0 +--- !u!4 &8902346065236267787 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -2577548232221058511, guid: a5afe13492c9acf478def44319cb3619, + type: 3} + m_PrefabInstance: {fileID: 2860288370872289594} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Artists/Prefabs/Rig/EquipController.prefab b/Assets/Artists/Prefabs/Rig/EquipController.prefab index c1d282e45..6a2b721f8 100644 --- a/Assets/Artists/Prefabs/Rig/EquipController.prefab +++ b/Assets/Artists/Prefabs/Rig/EquipController.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 8365587156604046498} - component: {fileID: 3168693612350792015} - component: {fileID: 6759274799101860308} + - component: {fileID: 2658742347464340854} m_Layer: 0 m_Name: EquipController m_TagString: Untagged @@ -97,6 +98,19 @@ MonoBehaviour: debug: 0 animator: {fileID: 8365587156604046498} layerInfos: [] +--- !u!114 &2658742347464340854 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2231966161653709123} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: [] --- !u!1 &2241040556830830124 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Artists/Prefabs/Rig/GunController Variant.prefab b/Assets/Artists/Prefabs/Rig/GunController Variant.prefab index 49264a865..9473925d8 100644 --- a/Assets/Artists/Prefabs/Rig/GunController Variant.prefab +++ b/Assets/Artists/Prefabs/Rig/GunController Variant.prefab @@ -159,6 +159,13 @@ MonoBehaviour: damp: 20 frequence: 15 value: {x: 0, y: 0, z: 0} + initialSight: {fileID: 0} + newSight: + allow: 0 + value: {fileID: 0} + breathingAdditive: + allow: 0 + value: {fileID: 0} fireAction: {fileID: 4390646709627658297, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} aimAction: {fileID: 5345126666820269769, guid: e0e9267cab824e8489fc27d83f1d07b7, @@ -167,6 +174,8 @@ MonoBehaviour: type: 3} meleeAction: {fileID: 709374767176041235, guid: e0e9267cab824e8489fc27d83f1d07b7, type: 3} + steadyAimAction: {fileID: 2241482626736855995, guid: e0e9267cab824e8489fc27d83f1d07b7, + type: 3} cameraView: {fileID: 2427857643014188708} locationAdditive: {fileID: 0} expectFiring: diff --git a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab index 4097edf88..2f7177a56 100644 --- a/Assets/Artists/Prefabs/Rig/Physics Variant.prefab +++ b/Assets/Artists/Prefabs/Rig/Physics Variant.prefab @@ -302,6 +302,10 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7613617252232372131} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1311415486234117464} - targetCorrespondingSourceObject: {fileID: 3227681933796678702, guid: b805b0f643b3776478b9ea3e6701ebb8, type: 3} insertIndex: -1 @@ -1281,6 +1285,32 @@ MonoBehaviour: overrideAngularMotion: allow: 0 value: 0 +--- !u!114 &1311415486234117464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1630585989029977934} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1eaae13bc84ab5f4abf433021f1b9499, type: 3} + m_Name: + m_EditorClassIdentifier: + renderers: + - {fileID: 6323914363302859334} + - {fileID: 7427218707016986437} + - {fileID: 5019296759075670233} + - {fileID: 4378624254320444163} + - {fileID: 7354814916988172562} + - {fileID: 7367222540271198610} + - {fileID: 2668854896512285276} + steveRenderers: + - {fileID: 6323914363302859334} + - {fileID: 4378624254320444163} + alexRenderers: + - {fileID: 7427218707016986437} + - {fileID: 7354814916988172562} --- !u!1 &1729084152005531091 stripped GameObject: m_CorrespondingSourceObject: {fileID: -8241982726922733620, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -1616,6 +1646,12 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!137 &2668854896512285276 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -4653971157396203453, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} --- !u!1 &3840099519353866764 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3398720915967387667, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -1963,6 +1999,12 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!137 &4378624254320444163 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -6439136948098473700, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} --- !u!1 &4498669756109410294 stripped GameObject: m_CorrespondingSourceObject: {fileID: -6625335125320094231, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -2121,6 +2163,12 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!137 &5019296759075670233 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -2321474423952446778, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} --- !u!1 &5222408372585942371 stripped GameObject: m_CorrespondingSourceObject: {fileID: -3307383484744224900, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -2279,6 +2327,12 @@ CapsuleCollider: m_Height: 0.3 m_Direction: 1 m_Center: {x: 0, y: 0.05, z: 0} +--- !u!137 &6323914363302859334 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: 5594427428836028505, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} --- !u!1 &7036148079364461546 stripped GameObject: m_CorrespondingSourceObject: {fileID: -304833110879391243, guid: b805b0f643b3776478b9ea3e6701ebb8, @@ -2437,6 +2491,24 @@ ConfigurableJoint: m_EnablePreprocessing: 1 m_MassScale: 1 m_ConnectedMassScale: 1 +--- !u!137 &7354814916988172562 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -256171143935583475, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} +--- !u!137 &7367222540271198610 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -261831800944540787, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} +--- !u!137 &7427218707016986437 stripped +SkinnedMeshRenderer: + m_CorrespondingSourceObject: {fileID: -183908091694985894, guid: b805b0f643b3776478b9ea3e6701ebb8, + type: 3} + m_PrefabInstance: {fileID: 1900633944933622303} + m_PrefabAsset: {fileID: 0} --- !u!1 &8317327607978938029 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7569844970340953266, guid: b805b0f643b3776478b9ea3e6701ebb8, diff --git a/Assets/Artists/Prefabs/Services/Framework.prefab b/Assets/Artists/Prefabs/Services/Framework.prefab index bd99375f8..970dcde70 100644 --- a/Assets/Artists/Prefabs/Services/Framework.prefab +++ b/Assets/Artists/Prefabs/Services/Framework.prefab @@ -67,6 +67,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1621845164855518716} + - component: {fileID: 804197744649964323} - component: {fileID: -2281902509228225294} - component: {fileID: 4083894557606377552} - component: {fileID: -3918555459250571244} @@ -103,6 +104,14 @@ Transform: - {fileID: 3380121738530805390} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &804197744649964323 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 594564951014165300} + m_Mesh: {fileID: -8023080413318814639, guid: f2e64a0364f41734798d5f179e8dbf89, type: 3} --- !u!114 &-2281902509228225294 MonoBehaviour: m_ObjectHideFlags: 0 @@ -117,6 +126,10 @@ MonoBehaviour: m_EditorClassIdentifier: appId: 1934920 allowCharacters: {fileID: 4900000, guid: 409d2554d9447844482d62f16b64f38b, type: 3} + overrideInventoryItemDefs: + allow: 1 + value: + - obj: {fileID: 11400000, guid: cc2d583887d8ad8448aa10300cf43732, type: 2} --- !u!114 &4083894557606377552 MonoBehaviour: m_ObjectHideFlags: 0 @@ -132,17 +145,13 @@ MonoBehaviour: layerMask: serializedVersion: 2 m_Bits: 513 + material: {fileID: 2100000, guid: c4a3b3cdb61437f49a87d07e3cfbb530, type: 2} entitiesService: rid: -2 netProvider: rid: -2 damageService: rid: 6077775219685064714 - pool: - defaultCapacity: 16 - prefab: {fileID: 2956281190107464547, guid: cd8502ee01a85944bbccb38128facc13, - type: 3} - root: {fileID: 1621845164855518716} references: version: 2 RefIds: @@ -1301,7 +1310,6 @@ MonoBehaviour: seleableLabel: {fileID: 5870675284324803859} crosshairImage: {fileID: 7197977614289111421} crosshairParentImage: {fileID: 1020875659093885614} - scopeImage: {fileID: 5667603518862187298} playerNameLabel: {fileID: 3634826882621984808} playerAvatarImage: {fileID: 2959116518108072906} playerInfo: {fileID: 3013491651699976577} diff --git a/Assets/Artists/Scenes/DMZ.unity b/Assets/Artists/Scenes/DMZ.unity index 6fa691298..a13b6d6ee 100644 --- a/Assets/Artists/Scenes/DMZ.unity +++ b/Assets/Artists/Scenes/DMZ.unity @@ -4221,6 +4221,344 @@ MonoBehaviour: mr: {fileID: 94625108} mf: {fileID: 94625109} garbageCollectMesh: {fileID: 94625110} +--- !u!1001 &95542418 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.49999925 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000011920929 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000019861227 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.09999974 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.000000037252903 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (4) + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.02 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.007835388 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 7.42 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.39520368 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9185935 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 133.443 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.2999997 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000019861234 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000066204116 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.4999996 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000019861234 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000033102057 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.2999998 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000033102054 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000019861241 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000012665987 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 8.7659685e-15 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000012665987 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000012665987 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000012665987 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &96180150 PrefabInstance: m_ObjectHideFlags: 0 @@ -38826,6 +39164,369 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 754538823} m_PrefabAsset: {fileID: 0} +--- !u!1001 &755767984 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.49999893 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000033102052 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.0000004634289 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.10000016 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000008195639 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (5) + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.00000004635251 + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000023386933 + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000001872535 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.0000001872535 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -3.33 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.007835388 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 12.22 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7727925 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.63465875 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 78.789 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.2999996 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000017881393 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.49999988 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000019861236 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000033102057 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.29999954 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.000000059604645 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000006620412 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000019861233 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.10000016 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000008195639 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 2.6297908e-14 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000028088027 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000016 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000008195639 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000016 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000008195639 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.10000016 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000008195639 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &758967405 PrefabInstance: m_ObjectHideFlags: 0 @@ -56702,6 +57403,8 @@ MonoBehaviour: allow: 0 value: 0 rigidbody: {fileID: 1135960256} + objects: [] + destroyedObjects: [] driveAnchor: {fileID: 1135960255} axisInfos: - wheels: @@ -61143,6 +61846,344 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1214267950} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1215034656 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.49999943 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000044703484 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000001986123 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 349114255037271128, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000033102063 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000003501773 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1213893366506059165, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1610736432900663163, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_Name + value: Zombie (3) + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5048704582744459601, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5489172654206952244, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -8.6 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.007835388 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 9.5 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.25881895 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.9659259 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 210 + objectReference: {fileID: 0} + - target: {fileID: 5964803017347144284, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.2999998 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000026481646 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6049064691190697996, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000026481646 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.49999943 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000044703484 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.00000026481644 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710665 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710695 + objectReference: {fileID: 0} + - target: {fileID: 6730377493262951647, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000026481655 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.2999998 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7064934576040447845, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000013240823 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.0000003501773 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 8.7659685e-15 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 7803955541690111875, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000003501773 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.00000009362675 + objectReference: {fileID: 0} + - target: {fileID: 8559872318023307372, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000003501773 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8844741683413517365, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.09999982 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.0000003501773 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9073861932364703135, guid: 87496a4c1c33c9f4a9a90a9757655d40, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 87496a4c1c33c9f4a9a90a9757655d40, type: 3} --- !u!1001 &1216185388 PrefabInstance: m_ObjectHideFlags: 0 @@ -68577,14 +69618,6 @@ PrefabInstance: propertyPath: m_RootOrder value: 995 objectReference: {fileID: 0} - - target: {fileID: 4671490559699700, guid: f5a0476d9eb4a484a9a808e3730c5889, type: 3} - propertyPath: m_LocalScale.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4671490559699700, guid: f5a0476d9eb4a484a9a808e3730c5889, type: 3} - propertyPath: m_LocalScale.z - value: 1 - objectReference: {fileID: 0} - target: {fileID: 4671490559699700, guid: f5a0476d9eb4a484a9a808e3730c5889, type: 3} propertyPath: m_LocalPosition.x value: 24.961002 @@ -101004,6 +102037,8 @@ MonoBehaviour: allow: 0 value: 0 rigidbody: {fileID: 2057076195} + objects: [] + destroyedObjects: [] driveAnchor: {fileID: 742058939} axisInfos: - wheels: @@ -129833,6 +130868,21 @@ PrefabInstance: propertyPath: m_Center.z value: 0.1543255 objectReference: {fileID: 0} + - target: {fileID: 1166721261996592115, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: effect + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166721261996592115, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: colorRamp + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1166721261996592115, guid: 2317f3177236a6d4d9bc28b8d669fca2, + type: 3} + propertyPath: checkWorldPosition + value: 0 + objectReference: {fileID: 0} - target: {fileID: 2322573603674746577, guid: 2317f3177236a6d4d9bc28b8d669fca2, type: 3} propertyPath: m_LocalPosition.x @@ -129995,6 +131045,9 @@ SceneRoots: - {fileID: 1554728538} - {fileID: 402751311} - {fileID: 1191705000} + - {fileID: 1215034656} + - {fileID: 95542418} + - {fileID: 755767984} - {fileID: 1787197848} - {fileID: 251601144} - {fileID: 1776442869} diff --git a/Assets/Artists/Scripts/BulletService/BulletService.cs b/Assets/Artists/Scripts/BulletService/BulletService.cs index 79387b134..c925736fc 100644 --- a/Assets/Artists/Scripts/BulletService/BulletService.cs +++ b/Assets/Artists/Scripts/BulletService/BulletService.cs @@ -16,10 +16,10 @@ namespace BITFALL [Serializable] public record InstanceBullet : SpawnBullet { + public Vector3 Velocity; public Vector3 currentPos; public float currentSpeed = 64; public float ElapsedTime; - public BITBullet model; } [Serializable] public class BulletServiceSingleton : IBulletService @@ -31,7 +31,8 @@ namespace BITFALL public static Action Spawn; [Header(Constant.Header.Settings)] - public LayerMask layerMask; + [SerializeField] private LayerMask layerMask; + [SerializeField] private Material material; [Header(Constant.Header.Providers)] [SerializeField, SerializeReference, SubclassSelector] @@ -41,25 +42,50 @@ namespace BITFALL [SerializeField, SerializeReference, SubclassSelector] private IDamageService damageService; - [Header(Constant.Header.Settings)] - [SerializeField] private UnityPool pool = new(); - [Header(Constant.Header.InternalVariables)] private readonly List instances = new(); private readonly RaycastHit[] _raycastHits = new RaycastHit[16]; + + private const float dragCoefficient = 0.045f; // 子弹的阻力系数 + private const float bulletMass = 0.015f; // 子弹的质量，单位：千克 + + private Mesh _mesh; + private void Start() { + _mesh = GetComponent().mesh; Spawn += SpawnBullet; } private void OnDestroy() { Spawn -= SpawnBullet; } + private void Update() + { + var camera = Camera.main; + if (!camera) return; + var rot = camera.transform.rotation * Quaternion.Euler(0, 180, 0); + foreach (var bullet in instances.ToArray()) + { + if (bullet.ElapsedTime >= 0.04f) + { + // Graphics.DrawMesh(_mesh, bullet.currentPos, bullet.rot, material, + // LayerMask.NameToLayer("TransparentFX")); + var martix = Matrix4x4.TRS( + bullet.currentPos, + rot, + Vector3.one + Vector3.one * Mathf.Clamp(bullet.ElapsedTime, 0, 16)); + Graphics.DrawMesh(_mesh, martix, material, + LayerMask.NameToLayer("TransparentFX")); + } + } + } + private void FixedUpdate() { foreach (var bullet in instances.ToArray()) { - var size = Physics.RaycastNonAlloc(bullet.currentPos, bullet.forward, _raycastHits, bullet.currentSpeed * Time.fixedDeltaTime, layerMask); + var size = Physics.RaycastNonAlloc(bullet.currentPos, bullet.Velocity, _raycastHits, Vector3.Distance(default,bullet.Velocity) * Time.fixedDeltaTime, layerMask); var validHit = false; foreach (var raycastHit in _raycastHits.Take(size).OrderBy(x => Vector3.Distance(bullet.pos, x.point))) { @@ -69,43 +95,73 @@ namespace BITFALL break; } - if (validHit ||bullet.currentSpeed <= 0) + if (validHit ||bullet.currentSpeed <= 0 || bullet.Velocity.sqrMagnitude <= 0.01f || bullet.ElapsedTime >= 8) { instances.TryRemove(bullet); - pool.Return(bullet.model); + //pool.Return(bullet.model); } else { - // 计算子弹的下坠距离 - float distance = 0.5f * Physics.gravity.y * bullet.ElapsedTime * bullet.ElapsedTime; + // // 计算子弹的下坠距离 + // float distance =Mathf.Clamp( + // 0.5f * Physics.gravity.y * bullet.ElapsedTime * bullet.ElapsedTime, + // Physics.gravity.y + // ,0 + // ) ; + // + // bullet.currentSpeed -= bullet.startSpeed * Time.fixedDeltaTime; + // bullet.currentPos += (Vector3)bullet.forward * (bullet.currentSpeed * Time.fixedDeltaTime); + // bullet.currentPos += Vector3.up * distance; + // bullet.model.transform.position = bullet.currentPos; + // + // bullet.ElapsedTime += Time.fixedDeltaTime; - bullet.currentSpeed -= bullet.startSpeed * Time.fixedDeltaTime; - bullet.currentPos += (Vector3)bullet.forward * (bullet.currentSpeed * Time.fixedDeltaTime); - bullet.currentPos += Vector3.up * distance; - bullet.model.transform.position = bullet.currentPos; + // 计算重力下坠 - bullet.ElapsedTime += Time.fixedDeltaTime; + bullet.ElapsedTime+=Time.fixedDeltaTime; + + bullet.Velocity+= Physics.gravity * (Time.fixedDeltaTime * bullet.ElapsedTime); + + // // 计算空气阻力 + // float airDragForce = 0.5f * dragCoefficient * 1.225f * bullet.Velocity.magnitude * bullet.Velocity.magnitude; + // + // if (float.IsNaN(airDragForce)) + // { + // bullet.Velocity=Vector3.zero; + // continue; + // } + // + // Vector3 airDragDirection = -bullet.Velocity.normalized; + // Vector3 airDrag = airDragDirection * airDragForce / bulletMass; + + var newVelocity =bullet.Velocity * Time.fixedDeltaTime; + + bullet.currentPos+=newVelocity; + + float CalculateElevationAngle(float distance) + { + float g = Mathf.Abs(Physics.gravity.y); + float angle = 0.5f * Mathf.Asin(distance * g / (bullet.startSpeed * bullet.startSpeed)); + return angle * Mathf.Rad2Deg; + } } } } private async void RpcSpawnBullet(SpawnBullet x) { await UniTask.SwitchToMainThread(); - var instance = pool.Get(); InstanceBullet bullet = new() { initiator = x.initiator, currentPos = x.pos, + startSpeed = x.startSpeed, pos = x.pos, rot = x.rot, forward = x.forward, initialDamage = x.initialDamage, - model = instance, InitialForce = x.InitialForce, + Velocity =x.forward * x.startSpeed, }; - var instanceTransform = instance.transform; - instanceTransform.SetPositionAndRotation(x.pos, x.rot); - instanceTransform.forward = x.forward; instances.Add(bullet); } private void SpawnBullet(SpawnBullet x) @@ -156,7 +212,7 @@ namespace BITFALL { "BulletHit", }; - if (raycastHit.transform.TryGetComponent(out var _tag)) + if (raycastHit.collider.TryGetComponent(out var _tag)) { tags.AddRange(_tag.GetTags()); } @@ -191,5 +247,7 @@ namespace BITFALL } void IBulletService.Spawn(SpawnBullet bullet) => SpawnBullet(bullet); + + } } diff --git a/Assets/Artists/Scripts/CosmeticInventory/AssetableCosmetic.cs b/Assets/Artists/Scripts/CosmeticInventory/AssetableCosmetic.cs new file mode 100644 index 000000000..a788e883e --- /dev/null +++ b/Assets/Artists/Scripts/CosmeticInventory/AssetableCosmetic.cs @@ -0,0 +1,28 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +// ReSharper disable ConvertToAutoProperty + +namespace BITFALL.Cosmetic +{ + [Serializable] + public struct CosmeticTextureContent:ICosmeticContent + { + [SerializeField] private Texture texture; + public Texture Texture => texture; + } + public class AssetableCosmetic : ScriptableObject,ICosmetic + { + [SerializeField] private ulong id; + [SerializeField] private string addressablePath; + [SerializeField] private Sprite icon; + [SerializeReference, SubclassSelector] private ICosmeticType type; + [SerializeReference, SubclassSelector] private ICosmeticContent[] contents; + + public string AddressablePath=> addressablePath; + public ulong Id => id; + public ICosmeticType Type=> type; + public ICosmeticContent[] Contents=> contents; + } +} diff --git a/Assets/Artists/Scripts/CosmeticInventory/BITFALL.Cosmetic.Runtime.asmdef b/Assets/Artists/Scripts/CosmeticInventory/BITFALL.Cosmetic.Runtime.asmdef new file mode 100644 index 000000000..1302d71f0 --- /dev/null +++ b/Assets/Artists/Scripts/CosmeticInventory/BITFALL.Cosmetic.Runtime.asmdef @@ -0,0 +1,20 @@ +{ + "name": "BITFALL.Cosmetic.Runtime", + "rootNamespace": "", + "references": [ + "GUID:14fe60d984bf9f84eac55c6ea033a8f4", + "GUID:677cd05ca06c46b4395470200b1acdad", + "GUID:d525ad6bd40672747bde77962f1c401e", + "GUID:49b49c76ee64f6b41bf28ef951cb0e50", + "GUID:2b6752324f5c76d4cad13e2095c77b9e" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Artists/Scripts/Entities/Cosmetic/BITFALL.Entities.Cosmetic.Runtime.asmdef b/Assets/Artists/Scripts/Entities/Cosmetic/BITFALL.Entities.Cosmetic.Runtime.asmdef new file mode 100644 index 000000000..d16f5c2c6 --- /dev/null +++ b/Assets/Artists/Scripts/Entities/Cosmetic/BITFALL.Entities.Cosmetic.Runtime.asmdef @@ -0,0 +1,25 @@ +{ + "name": "BITFALL.Entities.Cosmetic.Runtime", + "rootNamespace": "", + "references": [ + "GUID:14fe60d984bf9f84eac55c6ea033a8f4", + "GUID:709caf8d7fb6ef24bbba0ab9962a3ad0", + "GUID:2b6752324f5c76d4cad13e2095c77b9e", + "GUID:0743625b554095843871fab2dd150305", + "GUID:1bb4187526a9431478feccaef064696a", + "GUID:d525ad6bd40672747bde77962f1c401e", + "GUID:49b49c76ee64f6b41bf28ef951cb0e50", + "GUID:f51ebe6a0ceec4240a699833d6309b23", + "GUID:9e24947de15b9834991c9d8411ea37cf", + "GUID:84651a3751eca9349aac36a66bba901b" + ], + "includePlatforms": [], + "excludePlatforms": [], + "allowUnsafeCode": false, + "overrideReferences": false, + "precompiledReferences": [], + "autoReferenced": true, + "defineConstraints": [], + "versionDefines": [], + "noEngineReferences": false +} \ No newline at end of file diff --git a/Assets/Artists/Scripts/Entities/Cosmetic/CosmeticTextureBehaviour.cs b/Assets/Artists/Scripts/Entities/Cosmetic/CosmeticTextureBehaviour.cs new file mode 100644 index 000000000..6e293a713 --- /dev/null +++ b/Assets/Artists/Scripts/Entities/Cosmetic/CosmeticTextureBehaviour.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using BITFALL.Cosmetic; +using BITKit; +using BITKit.Entities; +using UnityEngine; + +namespace BITFALL.Entities.Cosmetic +{ + public sealed class CosmeticTextureBehaviour : EntityBehavior + { + [SerializeField] private Renderer[] renderers; + [SerializeField] private Renderer[] steveRenderers; + [SerializeField] private Renderer[] alexRenderers; + [Inject(true)] private ICosmeticService _cosmeticService; + + public override void OnAwake() + { + if (_cosmeticService is not null) + _cosmeticService.OnCosmeticsChanged += OnCosmeticsChanged; + } + + private void OnCosmeticsChanged() + { + foreach (var cosmetic in _cosmeticService.Cosmetics) + { + foreach (var content in cosmetic.Contents.OfType()) + { + foreach (var _renderer in renderers) + { + if (content.Texture is Texture2D texture2D) + { + var multiple = texture2D.width / 64; + var color = texture2D.GetPixels32()[17 * multiple * texture2D.width + 51* multiple]; + var isSteve = color.a is 1; + Debug.Log(color); + steveRenderers.ForEach(x => x.enabled = isSteve); + alexRenderers.ForEach(x => x.enabled = !isSteve); + } + _renderer.material.mainTexture = content.Texture; + } + } + } + } + } + +} diff --git a/Assets/Artists/Scripts/Entities/Cosmetic/EntityCosmeticService.cs b/Assets/Artists/Scripts/Entities/Cosmetic/EntityCosmeticService.cs new file mode 100644 index 000000000..b64e2e966 --- /dev/null +++ b/Assets/Artists/Scripts/Entities/Cosmetic/EntityCosmeticService.cs @@ -0,0 +1,29 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Security; +using BITFALL.Cosmetic; +using BITKit; +using BITKit.Entities; +using BITKit.Steamwork; +using UnityEngine; +using UnityEngine.AddressableAssets; + +namespace BITFALL.Entities.Cosmetic +{ + [CustomType(typeof(ICosmeticService))] + public class EntityCosmeticService : EntityBehavior,ICosmeticService + { + [SerializeReference, SubclassSelector] private ISteamService steamService; + + public ICosmetic[] Cosmetics { get; private set; } + public event Action OnCosmeticsChanged; + public override async void OnStart() + { + base.OnStart();var items =await steamService.GetInventoryItemDefsAsync(destroyCancellationToken); + Cosmetics = items.Select(itemDef => Addressables.LoadAssetAsync(itemDef.AddressablePath).WaitForCompletion()).ToArray(); + OnCosmeticsChanged?.Invoke(); + } + } +} diff --git a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs index d6f8bca88..29d53b12b 100644 --- a/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs +++ b/Assets/Artists/Scripts/Entities/Equipment/EntityEquipment.cs @@ -15,6 +15,7 @@ using BITKit.Entities.Melee; using BITKit.Entities.VFX; using Cinemachine; using Cysharp.Threading.Tasks; +using Unity.Mathematics; namespace BITKit.Entities { @@ -171,7 +172,7 @@ namespace BITKit.Entities [SerializeField] private Optional overrideIndex; - [SerializeField] private AnimationCurve zoomCurve; + [SerializeField] private Optional optionalScope; public event Action OnEquip; public event Action OnUnEquip; @@ -180,7 +181,6 @@ namespace BITKit.Entities private readonly EntryGroup equips = new(); protected IEquipBase entryComplete; - private PlayerConfig playerConfig; private IBasicItem _currentItem; @@ -244,7 +244,24 @@ namespace BITKit.Entities if (virtualCamera is not null) { - virtualCamera.m_Lens.FieldOfView =zoomCurve.Evaluate(Zoom.Allow?Zoom.Value:0); + virtualCamera.m_Lens.FieldOfView = + Mathf.Lerp( + virtualCamera.m_Lens.FieldOfView, + Zoom.Allow ? + Mathf.Rad2Deg * CalcZoomFOV(Mathf.Deg2Rad * 60f, Zoom.Value) : PlayerConfig.Singleton.Fov, + 16*deltaTime + ); + + + float CalcZoomFOV(float baseFOV, float zoom) + { + return 2.0f * Mathf.Atan(Mathf.Tan(baseFOV / 2.0f) / zoom); + } + } + + if (optionalScope.Allow) + { + optionalScope.Value.SetActive(AllowScope); } if (overrideIndex.Allow && (_health?.IsAlive ?? true)) diff --git a/Assets/Artists/Scripts/Equip/BITGun.cs b/Assets/Artists/Scripts/Equip/BITGun.cs index 035215d41..4cdea4e1e 100644 --- a/Assets/Artists/Scripts/Equip/BITGun.cs +++ b/Assets/Artists/Scripts/Equip/BITGun.cs @@ -62,14 +62,21 @@ namespace BITFALL.Guns [Header(Constant.Header.Settings)] [SerializeField] private Vector3 bulletInitialOffset; [SerializeField] private SpringEulerAngle recoilSpring=new(); + + [Header(Constant.Header.Gameobjects)] + [SerializeField] private Transform initialSight; + [SerializeField] private Optional newSight; + + [Header(nameof(Optional))] + [SerializeField] private Optional breathingAdditive; // 输入系统 [Header(Constant.Header.Input)] - public InputActionReference fireAction; - public InputActionReference aimAction; - public InputActionReference reloadAction; - public InputActionReference meleeAction; - + [SerializeField] internal InputActionReference fireAction; + [SerializeField] internal InputActionReference aimAction; + [SerializeField] internal InputActionReference reloadAction; + [SerializeField] internal InputActionReference meleeAction; + [SerializeField] internal InputActionReference steadyAimAction; [Header(Constant.Header.HotFix)] [SerializeField] private Transform cameraView; @@ -97,6 +104,7 @@ namespace BITFALL.Guns private static readonly int IsGrounded = Animator.StringToHash("IsGrounded"); private AssetableGun _gun=>item as AssetableGun; private bool isHolstered; + private bool isSteadyAim; public bool RequireBolt { get; set; } @@ -111,6 +119,7 @@ namespace BITFALL.Guns inputActionGroup.RegisterCallback(aimAction, OnAim); inputActionGroup.RegisterCallback(reloadAction, OnReload); inputActionGroup.RegisterCallback(meleeAction, OnMelee); + inputActionGroup.RegisterCallback(steadyAimAction, OnSteadyAim); _movement.OnStateChanged += OnMovementStateChanged; _movement.OnCommand += OnMovementCommand; @@ -119,6 +128,20 @@ namespace BITFALL.Guns isHolstered = state is BITConstant.Player.Holster; }; } + + private void OnSteadyAim(InputAction.CallbackContext obj) + { + switch (obj) + { + case { interaction: PressInteraction, performed: true } when CurrentState is Aim: + isSteadyAim = true; + break; + case { interaction: PressInteraction, canceled: true }: + isSteadyAim = false; + break; + } + } + private void OnMovementCommand(object obj) { switch (obj) @@ -215,7 +238,6 @@ namespace BITFALL.Guns { } } - public override void OnUpdate(float deltaTime) { UpdateState(deltaTime); @@ -240,6 +262,8 @@ namespace BITFALL.Guns break; } + + animator.animator.SetBool(IsGrounded,_movement.IsGrounded); animator.animator.SetFloat(BITConstant.Player.SqrMagnitude,_movement.LocomotionBasedVelocity.sqrMagnitude); @@ -250,8 +274,50 @@ namespace BITFALL.Guns if(AnimationProperties.TryGetValue(BITConstant.Player.Aim, out var _aim)) { _equipService.Zoom.Allow = CurrentState is Aim; - _equipService.Zoom.Value =Mathf.Lerp(0,_gun.InitialAimZoom, _aim); + _equipService.Zoom.Value =Mathf.Lerp(1,_gun.InitialAimZoom, _aim); _equipService.AllowScope = _aim > 0.86f && _gun.IsScopeAim; + + if (breathingAdditive.Allow) + { + var breatheFrequency = 0.5f; // 呼吸的频率，值越大呼吸越快 + var breatheAmplitude = 0.005f; // 呼吸的幅度，即准星上下移动的最大距离 + + if (_playerMovement.Stamina <= 8) + { + breatheFrequency = 8; + breatheAmplitude = 0.1f; + } + + var breatheOffset = Mathf.Sin(Time.time * breatheFrequency) * breatheAmplitude; + + if (isSteadyAim) + { + if (_playerMovement.Stamina > 0) + { + _playerMovement.Stamina -= 16 * deltaTime; + breatheOffset *= 0.16f; + } + else + { + isSteadyAim = false; + } + } + else + { + breatheOffset *= _aim; + } + + _playerMovement.AddViewEuler(new float2(breatheOffset, breatheOffset)); + } + + if (newSight.Allow) + { + transform.localPosition=Vector3.Lerp(default, newSight.Value.position-initialSight.position, _aim); + } + else + { + transform.localPosition = default; + } } if (AnimationProperties.TryGetValue(BITConstant.Player.Stable, out var stable)) @@ -266,7 +332,7 @@ namespace BITFALL.Guns AllowRendering.SetDisableElements(64564,_equipService.AllowScope); } - + public override void AnimationEvent(string eventName) { if(IsEntered is false) return; @@ -302,10 +368,11 @@ namespace BITFALL.Guns BulletService.Spawn(new SpawnBullet { initiator = Entity.Id, - pos = (_transform.position+rotation * bulletInitialOffset).Fix(), + pos = (_transform.position+rotation * bulletInitialOffset), rot = rotation, - forward = _transform.forward.Fix(), + forward = _transform.forward, initialDamage = _gun.InitialDamage, + startSpeed = _gun.InitialBulletSpeed, InitialForce = _gun.InitialBulletForce, }); @@ -352,11 +419,10 @@ namespace BITFALL.Guns case AutoFireMode : switch (context) { - case {interaction:TapInteraction , started:true}: + case {interaction:PressInteraction , started:true}: expectFiring.shouldBe = true; break; - case {interaction:TapInteraction , performed:true}: - case {interaction:HoldInteraction , canceled:true}: + case {interaction:PressInteraction , canceled:true}: expectFiring.shouldBe = false; break; } @@ -364,7 +430,7 @@ namespace BITFALL.Guns case SemiFireMode: switch (context) { - case { interaction: TapInteraction, started: true }: + case { interaction: PressInteraction, started: true } when fireInterval.AllowUpdateWithoutReset && RequireBolt is false: expectFiring.shouldBe = true; break; } diff --git a/Assets/Artists/Scripts/Equip/BITGunStates.cs b/Assets/Artists/Scripts/Equip/BITGunStates.cs index 03023cb90..22c79ab74 100644 --- a/Assets/Artists/Scripts/Equip/BITGunStates.cs +++ b/Assets/Artists/Scripts/Equip/BITGunStates.cs @@ -167,7 +167,13 @@ namespace BITFALL.Guns.States root.animator.CrossFade(BITConstant.Player.Aim, 0.16f); break; } - _entityMovement.ExecuteCommand(); + _entityMovement.ExecuteCommand(new(this)); + } + + public override void OnStateExit(IState old, IState newState) + { + base.OnStateExit(old, newState); + _entityMovement.ExecuteCommand(new(this)); } public override void OnStateUpdate(float deltaTime) diff --git a/Assets/Artists/Scripts/Equip/EquipSway.cs b/Assets/Artists/Scripts/Equip/EquipSway.cs index cecaf9c01..428d27209 100644 --- a/Assets/Artists/Scripts/Equip/EquipSway.cs +++ b/Assets/Artists/Scripts/Equip/EquipSway.cs @@ -35,9 +35,10 @@ namespace BITFALL.Player.Movement if (_equipService.Zoom.Allow) { velocity = default; - angularVelocity = default; + if (_equipService.AllowScope is false) + angularVelocity = default; } - + currentPosition = Vector3.Lerp(currentPosition,velocity * posValue,posDelta * deltaTime); currentRotation = Quaternion.Lerp(currentRotation,Quaternion.Euler(angularVelocity * rotValue),rotDelta * deltaTime); diff --git a/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs b/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs index d410987d0..08f7a7e90 100644 --- a/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs +++ b/Assets/Artists/Scripts/Feel/PlayerHitMotion.cs @@ -8,7 +8,7 @@ namespace BITKit.Entities.Player.Feel public sealed class PlayerHitMotion : EntityBehavior { [SerializeField] private Spring3 spring; - [SerializeField] private LocationAdditive locationAdditive; + [SerializeField] private LocationAdditive[] locationAdditives; [SerializeField] private AnimationCurve damageBasedMotion; public override void OnStart() { @@ -25,7 +25,10 @@ namespace BITKit.Entities.Player.Feel public override void OnUpdate(float deltaTime) { spring.Update(deltaTime,default); - locationAdditive.AddEuler(spring.value); + foreach (var x in locationAdditives) + { + x.AddEuler(spring.value); + } } } diff --git a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs index afae60d97..751206395 100644 --- a/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs +++ b/Assets/Artists/Scripts/Player/CharacterControllerPro/PlayerCharacterController.cs @@ -275,7 +275,7 @@ namespace BITFALL.Entities.Player.Movement { //case { interaction: PressInteraction, started: true }: case { interaction: PressInteraction, performed:true }: - if (ExpectRun.shouldBe) + if (ExpectRun.shouldBe && Stamina> 0) ExpectSprint.shouldBe = true; ExpectRun.shouldBe = true; ExpectCrouch.Reset(); diff --git a/Assets/Artists/Scripts/UX/UXHud.cs b/Assets/Artists/Scripts/UX/UXHud.cs index 553dc3daf..32ca83054 100644 --- a/Assets/Artists/Scripts/UX/UXHud.cs +++ b/Assets/Artists/Scripts/UX/UXHud.cs @@ -30,7 +30,6 @@ namespace BITFALL.UX [SerializeField] private UXLabel seleableLabel; [SerializeField] private UXImage crosshairImage; [SerializeField] private UXImage crosshairParentImage; - [SerializeField] private UXImage scopeImage; [SerializeField] private UXLabel playerNameLabel; [SerializeField] private UXImage playerAvatarImage; [SerializeField] private UXElement playerInfo; @@ -145,8 +144,6 @@ namespace BITFALL.UX crosshairImage.visualElement.SetActive(_equipService.AllowAttack); - scopeImage.SetActive(_equipService.AllowScope); - crosshairImage.visualElement.transform.scale = Vector3.one * Mathf.Lerp(1.25f, 1, _equipService.Stable); @@ -163,7 +160,9 @@ namespace BITFALL.UX if(_equipService is null) return; var currentCrosshairOpacity = crosshairParentImage.visualElement.style.opacity.value; - crosshairParentImage.visualElement.style.opacity = Mathf.Lerp(currentCrosshairOpacity, _equipService.Zoom.Allow ? 0 : 1, Time.deltaTime * 5); + crosshairParentImage.visualElement.style.opacity = + _equipService.AllowScope?0: + Mathf.Lerp(currentCrosshairOpacity, _equipService.Zoom.Allow ? 0 : 1, Time.deltaTime * 5); } private static void OnReturn(InputAction.CallbackContext context) diff --git a/Assets/Artists/UX/HUD.uxml b/Assets/Artists/UX/HUD.uxml index dd313e58b..500c63788 100644 --- a/Assets/Artists/UX/HUD.uxml +++ b/Assets/Artists/UX/HUD.uxml @@ -3,7 +3,7 @@