diff --git a/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03.prefab b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03.prefab index 3decfab..6044415 100644 --- a/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03.prefab +++ b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03.prefab @@ -48,7 +48,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4603945878882944 Transform: m_ObjectHideFlags: 0 @@ -81,6 +81,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -139,7 +142,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4750059307815838 Transform: m_ObjectHideFlags: 0 @@ -187,6 +190,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 5032635380409734639} - {fileID: 4929037739677682} - {fileID: 4245893490206170} - {fileID: 4603945878882944} @@ -461,7 +465,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4929037739677682 Transform: m_ObjectHideFlags: 0 @@ -494,6 +498,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -680,7 +687,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4245893490206170 Transform: m_ObjectHideFlags: 0 @@ -713,6 +720,9 @@ SkinnedMeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 3 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -750,3 +760,71 @@ SkinnedMeshRenderer: m_Center: {x: -0.08829942, y: -0.008933023, z: -0.000000059604645} m_Extent: {x: 0.22466841, y: 0.057021745, z: 0.28214875} m_DirtyAABB: 0 +--- !u!1001 &5033191428913137583 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4856824566971938} + m_Modifications: + - target: {fileID: 1326644406914710, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_Name + value: SM_Prop_Parachute + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 23274573821294630, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 2b817cff4dbd89b4293676ff91af5ae5, type: 2} + m_RemovedComponents: + - {fileID: 64852807574807790, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + - {fileID: 95467771131722454, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} +--- !u!4 &5032635380409734639 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4221879360033344, guid: 123b3811c9dc2084ab1e830ee9f8beb8, type: 3} + m_PrefabInstance: {fileID: 5033191428913137583} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab new file mode 100644 index 0000000..e1c514c --- /dev/null +++ b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab @@ -0,0 +1,752 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1026274622225506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4159510895437026} + m_Layer: 0 + m_Name: P_R_Rotation_Crew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4159510895437026 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1026274622225506} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.33769247, y: 0, z: 0.0010494995} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4407655051361372} + m_Father: {fileID: 4731330461812810} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1068117159963288 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4603945878882944} + - component: {fileID: 137247781424402800} + m_Layer: 0 + m_Name: BackPack_Screw_Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4603945878882944 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068117159963288} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0.0000000123437935, y: 0.86138594, z: 0.0143468855} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4856824566971938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &137247781424402800 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1068117159963288} + 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: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ade96bc9e7773ce4c946519e840588c4, 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: 0 + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 1712e8fa72bc3e4499444b73b0e57c45, type: 2} + m_Bones: + - {fileID: 4407655051361372} + - {fileID: 4987113337765296} + - {fileID: 4668218210278006} + - {fileID: 4338386564182438} + - {fileID: 4154956456244802} + - {fileID: 4698782442092024} + - {fileID: 4545509049876794} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 4545509049876794} + m_AABB: + m_Center: {x: 0.14278427, y: -0.36099988, z: -0.017030105} + m_Extent: {x: 0.36245283, y: 0.9961862, z: 0.08584389} + m_DirtyAABB: 0 +--- !u!1 &1186351713921756 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4750059307815838} + m_Layer: 0 + m_Name: P_Base_Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4750059307815838 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186351713921756} + serializedVersion: 2 + m_LocalRotation: {x: 0.00000008146034, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 2.2351741e-10, y: 0.5994465, z: 0.0043710605} + m_LocalScale: {x: 1.1874708, y: 1.1874708, z: 1.1874708} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4987113337765296} + - {fileID: 4422900314691388} + - {fileID: 4731330461812810} + m_Father: {fileID: 4856824566971938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1226885354541598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4856824566971938} + m_Layer: 0 + m_Name: BackPack_03_Backup + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4856824566971938 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1226885354541598} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4929037739677682} + - {fileID: 4245893490206170} + - {fileID: 4603945878882944} + - {fileID: 4750059307815838} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1260734884559994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4844467282307548} + m_Layer: 0 + m_Name: P_L_Rotation_Crew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4844467282307548 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1260734884559994} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.33769247, y: 0, z: 0.0010494995} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4154956456244802} + m_Father: {fileID: 4422900314691388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1265878275065994 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4545509049876794} + m_Layer: 0 + m_Name: B_L_Rotation_Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4545509049876794 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1265878275065994} + serializedVersion: 2 + m_LocalRotation: {x: -0.49999976, y: 0.50000024, z: 0.49999976, w: 0.50000024} + m_LocalPosition: {x: 0.000000076293944, y: 0, z: -0.000000076293944} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4034861594764460} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1410481786175458 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4987113337765296} + m_Layer: 0 + m_Name: B_Base_Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4987113337765296 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1410481786175458} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: -0.49999976, z: 0.50000024, w: -0.5} + m_LocalPosition: {x: -2.7329373e-11, y: 0, z: 0.000000038146972} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4750059307815838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1424570421305634 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4422900314691388} + m_Layer: 0 + m_Name: P_L_Rotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4422900314691388 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1424570421305634} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.19537325, y: 0.21553901, z: 0.0076639554} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4698782442092024} + - {fileID: 4844467282307548} + - {fileID: 4034861594764460} + m_Father: {fileID: 4750059307815838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1427825141565340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4154956456244802} + m_Layer: 0 + m_Name: B_L_Rotation_Crew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4154956456244802 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1427825141565340} + serializedVersion: 2 + m_LocalRotation: {x: -0.49999976, y: 0.49999976, z: -0.50000024, w: 0.50000024} + m_LocalPosition: {x: 0.000000076293944, y: 0, z: -0.000000076293944} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4844467282307548} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1525103611543554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4668218210278006} + m_Layer: 0 + m_Name: B_R_Rotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4668218210278006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1525103611543554} + serializedVersion: 2 + m_LocalRotation: {x: 0.70710707, y: -0.00000011098618, z: 0.000000110986264, w: 0.7071065} + m_LocalPosition: {x: -0.000000019073486, y: 0, z: 0} + m_LocalScale: {x: -0.842126, y: -0.842126, z: -0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4731330461812810} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1681953056535778 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4698782442092024} + m_Layer: 0 + m_Name: B_L_Rotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4698782442092024 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1681953056535778} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071065, y: -0.00000011098628, z: -0.00000011098617, w: 0.7071072} + m_LocalPosition: {x: 0.000000019073486, y: 0, z: 0} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4422900314691388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1696917575984444 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4338386564182438} + m_Layer: 0 + m_Name: B_R_Rotation_Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4338386564182438 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1696917575984444} + serializedVersion: 2 + m_LocalRotation: {x: -0.49999976, y: 0.50000024, z: 0.49999976, w: 0.50000024} + m_LocalPosition: {x: -0.000000076293944, y: 0, z: -0.000000076293944} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4613435313203992} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1743039063256964 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4929037739677682} + - component: {fileID: 137197818362033000} + m_Layer: 0 + m_Name: BackPack_Base_Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4929037739677682 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743039063256964} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068} + m_LocalPosition: {x: -0.000000012401441, y: 0.77507645, z: -0.002599144} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4856824566971938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &137197818362033000 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1743039063256964} + 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: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ade96bc9e7773ce4c946519e840588c4, 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: 0 + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 33c03c98d9859474f8ce9e78372f11b4, type: 2} + m_Bones: + - {fileID: 4987113337765296} + - {fileID: 4698782442092024} + - {fileID: 4668218210278006} + - {fileID: 4545509049876794} + - {fileID: 4338386564182438} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 4338386564182438} + m_AABB: + m_Center: {x: 0.15973032, y: 0.3609998, z: -0.10334021} + m_Extent: {x: 0.27052048, y: 0.23362002, z: 0.5028009} + m_DirtyAABB: 0 +--- !u!1 &1791136769425590 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4613435313203992} + m_Layer: 0 + m_Name: P_R_Rotation_Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4613435313203992 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1791136769425590} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.1086342, y: 0.019388732, z: 0.12097931} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4338386564182438} + m_Father: {fileID: 4731330461812810} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1863417496588542 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4034861594764460} + m_Layer: 0 + m_Name: P_L_Rotation_Gun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4034861594764460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863417496588542} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: -0.1086342, y: 0.019388732, z: 0.12097931} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4545509049876794} + m_Father: {fileID: 4422900314691388} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1936893402447150 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4731330461812810} + m_Layer: 0 + m_Name: P_R_Rotation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4731330461812810 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1936893402447150} + serializedVersion: 2 + m_LocalRotation: {x: -7.1054274e-15, y: 0, z: -0, w: 1} + m_LocalPosition: {x: 0.19537325, y: 0.21553901, z: 0.0076639554} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4668218210278006} + - {fileID: 4159510895437026} + - {fileID: 4613435313203992} + m_Father: {fileID: 4750059307815838} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1990216393136050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4407655051361372} + m_Layer: 0 + m_Name: B_R_Rotation_Crew + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4407655051361372 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990216393136050} + serializedVersion: 2 + m_LocalRotation: {x: -0.49999976, y: 0.49999976, z: -0.50000024, w: 0.50000024} + m_LocalPosition: {x: -0.000000076293944, y: 0, z: -0.000000076293944} + m_LocalScale: {x: 0.842126, y: 0.842126, z: 0.842126} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4159510895437026} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1999297123406854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4245893490206170} + - component: {fileID: 137084560946625326} + m_Layer: 0 + m_Name: BackPack_detail_Mesh + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4245893490206170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999297123406854} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: -0.000000012401441, y: 0.77507645, z: -0.002599144} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4856824566971938} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!137 &137084560946625326 +SkinnedMeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1999297123406854} + 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: 3 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ade96bc9e7773ce4c946519e840588c4, 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: 0 + 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 + serializedVersion: 2 + m_Quality: 0 + m_UpdateWhenOffscreen: 0 + m_SkinnedMotionVectors: 1 + m_Mesh: {fileID: 4300000, guid: 2cddb466a60d47b4d9df71bcf0fd16b5, type: 2} + m_Bones: + - {fileID: 4987113337765296} + m_BlendShapeWeights: [] + m_RootBone: {fileID: 4987113337765296} + m_AABB: + m_Center: {x: -0.08829942, y: -0.008933023, z: -0.000000059604645} + m_Extent: {x: 0.22466841, y: 0.057021745, z: 0.28214875} + m_DirtyAABB: 0 diff --git a/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab.meta b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab.meta new file mode 100644 index 0000000..553dda2 --- /dev/null +++ b/Assets/3rdParty/PBR_Military_Pack/Characters/Elite_Soldiers/Prefab/BackPack_03_Backup.prefab.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 4bbcc7bb53dc91043a6a3f9b339781f9 +timeCreated: 1567163710 +licenseType: Store +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab b/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab index ee0e6c9..db5a853 100644 --- a/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab +++ b/Assets/Prefabs/GameplayChars/AmericanOfficer.prefab @@ -1762,6 +1762,18 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveForce + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -1770,6 +1782,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: -0.093 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.315 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9928963 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.11898286 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -13.667 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: Flags value: 262145 diff --git a/Assets/Prefabs/GameplayChars/ChillGuy.prefab b/Assets/Prefabs/GameplayChars/ChillGuy.prefab index bbccb3b..fba6245 100644 --- a/Assets/Prefabs/GameplayChars/ChillGuy.prefab +++ b/Assets/Prefabs/GameplayChars/ChillGuy.prefab @@ -2954,6 +2954,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -2962,6 +2970,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.211 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.191 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9928648 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.11924624 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -13.697 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/GigaChad.prefab b/Assets/Prefabs/GameplayChars/GigaChad.prefab index 533bfd1..e78dcd9 100644 --- a/Assets/Prefabs/GameplayChars/GigaChad.prefab +++ b/Assets/Prefabs/GameplayChars/GigaChad.prefab @@ -2222,6 +2222,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -2230,6 +2238,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.331 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.239 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99528265 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.09701778 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -11.135 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/IbizaBoss.prefab b/Assets/Prefabs/GameplayChars/IbizaBoss.prefab index 58d2f2a..2309a69 100644 --- a/Assets/Prefabs/GameplayChars/IbizaBoss.prefab +++ b/Assets/Prefabs/GameplayChars/IbizaBoss.prefab @@ -2222,6 +2222,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -2230,6 +2238,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.006 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.119 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9983667 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.057130724 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -6.55 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/Labubu.prefab b/Assets/Prefabs/GameplayChars/Labubu.prefab index d9b8a47..0eb0adb 100644 --- a/Assets/Prefabs/GameplayChars/Labubu.prefab +++ b/Assets/Prefabs/GameplayChars/Labubu.prefab @@ -1716,6 +1716,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -1724,6 +1732,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.221 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.313 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99150616 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.13006002 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -14.946 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/Pengu.prefab b/Assets/Prefabs/GameplayChars/Pengu.prefab index 7364ec1..4c5b4a5 100644 --- a/Assets/Prefabs/GameplayChars/Pengu.prefab +++ b/Assets/Prefabs/GameplayChars/Pengu.prefab @@ -1676,6 +1676,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -1684,6 +1692,46 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.x + value: -0.001 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.068 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.273 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9894254 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.14494815 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.y + value: -0.00075899373 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.z + value: 0.005180939 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -16.668 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.18 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.626 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/Pepe.prefab b/Assets/Prefabs/GameplayChars/Pepe.prefab index dcc07e4..f4b364b 100644 --- a/Assets/Prefabs/GameplayChars/Pepe.prefab +++ b/Assets/Prefabs/GameplayChars/Pepe.prefab @@ -2258,6 +2258,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -2266,6 +2274,30 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.x + value: -0.188 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.045 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.194 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9934527 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.11424439 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -13.12 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/Shiba.prefab b/Assets/Prefabs/GameplayChars/Shiba.prefab index d10b36d..d378b2a 100644 --- a/Assets/Prefabs/GameplayChars/Shiba.prefab +++ b/Assets/Prefabs/GameplayChars/Shiba.prefab @@ -1762,6 +1762,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -1770,6 +1778,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.027 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.328 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.99062204 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.13663124 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -15.706 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/Prefabs/GameplayChars/UnicornFartDust.prefab b/Assets/Prefabs/GameplayChars/UnicornFartDust.prefab index 8463cea..8764fd2 100644 --- a/Assets/Prefabs/GameplayChars/UnicornFartDust.prefab +++ b/Assets/Prefabs/GameplayChars/UnicornFartDust.prefab @@ -1662,6 +1662,14 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _moveDownForce + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 3227591614157517285, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: _gravityMultiplier + value: 1.2 + objectReference: {fileID: 0} - target: {fileID: 4348347289748489880, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: m_RootOrder value: 6 @@ -1670,6 +1678,26 @@ PrefabInstance: propertyPath: m_RootOrder value: 10 objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.y + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalPosition.z + value: 0.62 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.w + value: 0.98733467 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalRotation.x + value: -0.15865166 + objectReference: {fileID: 0} + - target: {fileID: 4894901888554791462, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -18.257 + objectReference: {fileID: 0} - target: {fileID: 5990956033835523603, guid: c17b47fcacdfc8d4b80809005a2b2555, type: 3} propertyPath: AoiMode value: 0 diff --git a/Assets/TPSBR/Scripts/Gameplay/Agent/Agent.cs b/Assets/TPSBR/Scripts/Gameplay/Agent/Agent.cs index caec4a8..d353cbd 100644 --- a/Assets/TPSBR/Scripts/Gameplay/Agent/Agent.cs +++ b/Assets/TPSBR/Scripts/Gameplay/Agent/Agent.cs @@ -280,22 +280,22 @@ namespace TPSBR _character.AnimationController.SwitchWeapons(); } - if (_agentInput.WasActivated(EGameplayInputAction.ToggleJetpack, input) == true) - { - if (_jetpack.IsActive == true) - { - _jetpack.Deactivate(); - } - else if (_character.AnimationController.CanSwitchWeapons(true) == true) - { - _jetpack.Activate(); - } - } + // if (_agentInput.WasActivated(EGameplayInputAction.ToggleJetpack, input) == true) + // { + // if (_jetpack.IsActive == true) + // { + // _jetpack.Deactivate(); + // } + // else if (_character.AnimationController.CanSwitchWeapons(true) == true) + // { + // _jetpack.Activate(); + // } + // } - if (_jetpack.IsActive == true) - { - _jetpack.FullThrust = input.Thrust; - } + // if (_jetpack.IsActive == true) + // { + // _jetpack.FullThrust = input.Thrust; + // } _agentInput.SetFixedInput(input, false); } diff --git a/Assets/TPSBR/Scripts/Gameplay/Jetpack/Jetpack.cs b/Assets/TPSBR/Scripts/Gameplay/Jetpack/Jetpack.cs index d4a85a7..7b7da09 100644 --- a/Assets/TPSBR/Scripts/Gameplay/Jetpack/Jetpack.cs +++ b/Assets/TPSBR/Scripts/Gameplay/Jetpack/Jetpack.cs @@ -143,14 +143,16 @@ namespace TPSBR // Ensure no weapon can be held _agent.Weapons.DisarmCurrentWeapon(); - float consumption = FullThrust == true ? _fullThrustConsumption : _idleThrustConsumption; + float consumption = 0; _fuel -= consumption * Runner.DeltaTime; - - if (_fuel <= 0f) - { - _fuel = 0f; - //Deactivate(); - } + // // float consumption = FullThrust == true ? _fullThrustConsumption : _idleThrustConsumption; + // _fuel -= consumption * Runner.DeltaTime; + // + // if (_fuel <= 0f) + // { + // _fuel = 0f; + // //Deactivate(); + // } } public void OnDespawned()