diff --git a/Client/Assets/Resources/Animators/Crew.controller b/Client/Assets/Resources/Animators/Crew.controller index 333ba3b695..7cc3753623 100644 --- a/Client/Assets/Resources/Animators/Crew.controller +++ b/Client/Assets/Resources/Animators/Crew.controller @@ -252,7 +252,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 5216835599920345141, guid: d6557ad5f7261ce4c8fe9f8f67c9d4cd, type: 3} + m_Motion: {fileID: -203655887218126122, guid: 7dfcb45f5c756e742b235f376eaee6ee, type: 3} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -472,67 +472,67 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Speed m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: X m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Z m_Type: 1 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: IsDead m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Damaged m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: OpenDoor m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: KeypadUse m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: ChargeBattery m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: OpenItemKit m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Throw m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv index 5d0bf91c18..c0437a82d3 100644 --- a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv @@ -2,4 +2,5 @@ DataId,Name,Value 201000,Battery,0 202000,Bandage,1 202001,Morphine,10 +202002,Antipsychotic,5 203000,FlashBang,3 diff --git a/Client/Assets/Resources/Datas/JsonData/ItemData.json b/Client/Assets/Resources/Datas/JsonData/ItemData.json index b6a2a30026..16b669a8ad 100644 --- a/Client/Assets/Resources/Datas/JsonData/ItemData.json +++ b/Client/Assets/Resources/Datas/JsonData/ItemData.json @@ -15,6 +15,11 @@ "Name": "Morphine", "Value": 10.0 }, + { + "DataId": 202002, + "Name": "Antipsychotic", + "Value": 5.0 + }, { "DataId": 203000, "Name": "FlashBang", diff --git a/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab new file mode 100644 index 0000000000..3ab95a5ba3 --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab @@ -0,0 +1,187 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1061438788469442 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4019648518718052} + - component: {fileID: 33655888014389408} + - component: {fileID: 23785993381503042} + - component: {fileID: 797234450809373684} + - component: {fileID: -9211614204738383694} + - component: {fileID: 1721600605747860171} + - component: {fileID: -4077914618212329576} + - component: {fileID: 9149718619079815700} + m_Layer: 11 + m_Name: Antipsychotic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4019648518718052 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3, y: 1.3, z: 1.3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33655888014389408 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Mesh: {fileID: 4300012, guid: 3104badb274776e418b3666450af6501, type: 3} +--- !u!23 &23785993381503042 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + 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: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ce6ae769ef188754e8997094b375ac77, 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!65 &797234450809373684 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.09, y: 0.08, z: 0.1} + m_Center: {x: 0, y: 0.02, z: 0.04} +--- !u!54 &-9211614204738383694 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &1721600605747860171 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + SortKey: 3856890080 + ObjectInterest: 1 + Flags: 262145 + NestedObjects: [] + NetworkedBehaviours: + - {fileID: -4077914618212329576} + - {fileID: 9149718619079815700} +--- !u!114 &-4077914618212329576 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + SyncScale: 1 + SyncParent: 1 + _autoAOIOverride: 1 + DisableSharedModeInterpolation: 0 +--- !u!114 &9149718619079815700 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2d752e49131243cf9c052203c4ac69d3, type: 3} + m_Name: + m_EditorClassIdentifier: + _CanGet: + _value: 0 diff --git a/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab.meta new file mode 100644 index 0000000000..6961aaf1a6 --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Antipsychotic.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 30bd6a1d3919f9e499b52679842e30d1 +labels: +- FusionPrefab +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Bandage.prefab b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Bandage.prefab index d644e673c4..656fca1732 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Bandage.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/ItemObjects/Bandage.prefab @@ -31,7 +31,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557910113621458} serializedVersion: 2 - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_ConstrainProportionsScale: 1 @@ -183,3 +183,5 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8b9454f8c99d2ef4cafe6dfc0e10c807, type: 3} m_Name: m_EditorClassIdentifier: + _CanGet: + _value: 0 diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab new file mode 100644 index 0000000000..8872584075 --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab @@ -0,0 +1,381 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1197494383185850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4061469558252398} + - component: {fileID: 33200654189607436} + - component: {fileID: 23703867775575484} + m_Layer: 11 + m_Name: Box + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4061469558252398 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197494383185850} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4837046210294490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33200654189607436 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197494383185850} + m_Mesh: {fileID: 4300000, guid: 0f5c2670160978e4e9de07e57ea4c86a, type: 3} +--- !u!23 &23703867775575484 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1197494383185850} + 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: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2e7f5d932d9dffd4f9e53ab46c3a64cd, 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 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1343902041442310 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4837046210294490} + - component: {fileID: 6359789285050933429} + - component: {fileID: 110683046638787488} + - component: {fileID: 8902609261021581761} + - component: {fileID: 6666183428592964458} + - component: {fileID: -7557234133260900366} + m_Layer: 11 + m_Name: MedKit_Antipsychotic + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4837046210294490 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4061469558252398} + - {fileID: 4179970227569940} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!54 &6359789285050933429 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!65 &110683046638787488 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.8, y: 0.05, z: 0.55} + m_Center: {x: 0, y: 0.025, z: 0} +--- !u!82 &8902609261021581761 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 20 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!114 &6666183428592964458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} + m_Name: + m_EditorClassIdentifier: + SortKey: 3964706541 + ObjectInterest: 1 + Flags: 262145 + NestedObjects: [] + NetworkedBehaviours: + - {fileID: -7557234133260900366} +--- !u!114 &-7557234133260900366 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343902041442310} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} + m_Name: + m_EditorClassIdentifier: + _itemId: 202002 +--- !u!1 &1935870254814166 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4179970227569940} + - component: {fileID: 33078128777629482} + - component: {fileID: 23363505543020046} + m_Layer: 0 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4179970227569940 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935870254814166} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0.27, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4837046210294490} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33078128777629482 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935870254814166} + m_Mesh: {fileID: 4300002, guid: 0f5c2670160978e4e9de07e57ea4c86a, type: 3} +--- !u!23 &23363505543020046 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1935870254814166} + 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: 257 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 2e7f5d932d9dffd4f9e53ab46c3a64cd, 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 + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta new file mode 100644 index 0000000000..5a17941c7c --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f4237d496f5a44b4d8deae31d2d43666 +labels: +- FusionPrefab +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Client/Assets/Resources/Prefabs/Bottles_07.prefab b/Client/Assets/Resources/Prefabs/Items/Antipsychotic.prefab similarity index 66% rename from Client/Assets/Resources/Prefabs/Bottles_07.prefab rename to Client/Assets/Resources/Prefabs/Items/Antipsychotic.prefab index 701fa5f087..cd2f89b03f 100644 --- a/Client/Assets/Resources/Prefabs/Bottles_07.prefab +++ b/Client/Assets/Resources/Prefabs/Items/Antipsychotic.prefab @@ -1,28 +1,18 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1061438788469442} - m_IsPrefabParent: 1 --- !u!1 &1061438788469442 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4019648518718052} - component: {fileID: 33655888014389408} - component: {fileID: 23785993381503042} m_Layer: 0 - m_Name: Bottles_07 + m_Name: Antipsychotic m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30,30 +20,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4019648518718052 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1061438788469442} - m_LocalRotation: {x: 0.000000053385083, y: 0.7071068, z: 0.7071068, w: -0.000000053385083} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33655888014389408 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1061438788469442} + m_Mesh: {fileID: 4300012, guid: 3104badb274776e418b3666450af6501, type: 3} --- !u!23 &23785993381503042 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1061438788469442} 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: 257 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: ce6ae769ef188754e8997094b375ac77, type: 2} m_StaticBatchInfo: @@ -63,6 +69,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -75,10 +82,4 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33655888014389408 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1061438788469442} - m_Mesh: {fileID: 4300012, guid: 3104badb274776e418b3666450af6501, type: 3} + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Bottles_07.prefab.meta b/Client/Assets/Resources/Prefabs/Items/Antipsychotic.prefab.meta similarity index 100% rename from Client/Assets/Resources/Prefabs/Bottles_07.prefab.meta rename to Client/Assets/Resources/Prefabs/Items/Antipsychotic.prefab.meta diff --git a/Client/Assets/Resources/Prefabs/Items/Bandage.prefab b/Client/Assets/Resources/Prefabs/Items/Bandage.prefab index 691636d427..96af312cdd 100644 --- a/Client/Assets/Resources/Prefabs/Items/Bandage.prefab +++ b/Client/Assets/Resources/Prefabs/Items/Bandage.prefab @@ -1,22 +1,12 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_ParentPrefab: {fileID: 0} - m_RootGameObject: {fileID: 1557910113621458} - m_IsPrefabParent: 1 --- !u!1 &1557910113621458 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 4723580612327722} - component: {fileID: 33239681904489618} @@ -30,30 +20,46 @@ GameObject: m_IsActive: 1 --- !u!4 &4723580612327722 Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557910113621458} - m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &33239681904489618 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1557910113621458} + m_Mesh: {fileID: 4300010, guid: 7af43f2a0c1aada47be6fdfcd64fc85e, type: 3} --- !u!23 &23839962919715470 MeshRenderer: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1557910113621458} 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: 257 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: f85134c803bb45449a8ff32d5c8e9d67, type: 2} m_StaticBatchInfo: @@ -63,6 +69,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 + m_ReceiveGI: 1 m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -75,10 +82,4 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 ---- !u!33 &33239681904489618 -MeshFilter: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1557910113621458} - m_Mesh: {fileID: 4300010, guid: 7af43f2a0c1aada47be6fdfcd64fc85e, type: 3} + m_AdditionalVertexStreams: {fileID: 0} diff --git a/Client/Assets/Resources/Prefabs/Items/Battery.prefab b/Client/Assets/Resources/Prefabs/Items/Battery.prefab index 128c655209..68f6559a66 100644 --- a/Client/Assets/Resources/Prefabs/Items/Battery.prefab +++ b/Client/Assets/Resources/Prefabs/Items/Battery.prefab @@ -28,8 +28,8 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 2, y: 2, z: 2} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Client/Assets/Scenes/TestScene/Test_Scene.unity b/Client/Assets/Scenes/TestScene/Test_Scene.unity index 926c73b8a6..2a066524df 100644 --- a/Client/Assets/Scenes/TestScene/Test_Scene.unity +++ b/Client/Assets/Scenes/TestScene/Test_Scene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.7479761, g: 0.5767737, b: 0.64641577, a: 1} + m_IndirectSpecularColor: {r: 0.747763, g: 0.57657677, b: 0.6462794, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -9347,6 +9347,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1501787418130949391, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} + propertyPath: _itemSpawnDatas.Array.data[1].Prefab + value: + objectReference: {fileID: 1343902041442310, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} - target: {fileID: 1501787418130949391, guid: 6d8fe5216f97dfb4685557dfcf8e213d, type: 3} propertyPath: _itemSpawnDatas.Array.data[2].Prefab value: diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs b/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs new file mode 100644 index 0000000000..794cf6aad4 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs @@ -0,0 +1,12 @@ +using Fusion; + +public class AntipsychoticObject : BaseItemObject +{ + [Rpc(RpcSources.StateAuthority, RpcTargets.All)] + public override void Rpc_SetInfo(NetworkBool canGet) + { + DataId = Define.ITEM_ANTIPSYCHOTIC_ID; + + base.Rpc_SetInfo(canGet); + } +} diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs.meta b/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs.meta new file mode 100644 index 0000000000..0250aab121 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Interactables/ItemObject/AntipsychoticObject.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2d752e49131243cf9c052203c4ac69d3 +timeCreated: 1714378623 \ No newline at end of file diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/BaseItemObject.cs b/Client/Assets/Scripts/Contents/Interactables/ItemObject/BaseItemObject.cs index 71d679a804..d03547ebd6 100644 --- a/Client/Assets/Scripts/Contents/Interactables/ItemObject/BaseItemObject.cs +++ b/Client/Assets/Scripts/Contents/Interactables/ItemObject/BaseItemObject.cs @@ -7,7 +7,7 @@ public abstract class BaseItemObject : NetworkBehaviour, IInteractable public ItemData ItemData { get; protected set; } public string Description { get; protected set; } - [Networked] public NetworkBool CanGet { get; set; } + [Networked] public NetworkBool CanGet { get; protected set; } [Rpc(RpcSources.StateAuthority, RpcTargets.All)] public virtual void Rpc_SetInfo(NetworkBool canGet) diff --git a/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs new file mode 100644 index 0000000000..336760b139 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs @@ -0,0 +1,31 @@ +using DG.Tweening; +using UnityEngine; + +public class Antipsychotic : BaseItem +{ + public override void SetInfo(int templateId, Crew owner) + { + base.SetInfo(templateId, owner); + + ItemGameObject.transform.localPosition = new Vector3(0.02f, 0.01f, -0.043f); + ItemGameObject.transform.localEulerAngles = new Vector3(-9f, -83f, 83f); + ItemGameObject.transform.localScale = new Vector3(1.3f, 1.3f, 1.3f); + ItemGameObject.SetActive(false); + } + public override bool CheckAndUseItem() + { + if (Owner.CrewStat.Sanity >= Owner.CrewStat.MaxSanity) + return false; + + UseItem(); + return true; + } + + protected override void UseItem() + { + DOVirtual.Float(0, 0, 5, value => + { + Owner.CrewStat.ChangeSanity(ItemData.Value * Time.deltaTime); + }); + } +} diff --git a/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs.meta b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs.meta new file mode 100644 index 0000000000..92fa33d8f0 --- /dev/null +++ b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 3b7dd9cc2898421dba95e9c2cee114df +timeCreated: 1714378548 \ No newline at end of file diff --git a/Client/Assets/Scripts/Contents/Items/Bandage.cs b/Client/Assets/Scripts/Contents/Items/Bandage.cs index 154e43e6f9..b5bc667152 100644 --- a/Client/Assets/Scripts/Contents/Items/Bandage.cs +++ b/Client/Assets/Scripts/Contents/Items/Bandage.cs @@ -6,8 +6,8 @@ public override void SetInfo(int templateId, Crew owner) { base.SetInfo(templateId, owner); - ItemGameObject.transform.localPosition = new Vector3(-0.1f, 0.03f, -0.04f); - ItemGameObject.transform.localEulerAngles = new Vector3(2f, 92f, 0f); + ItemGameObject.transform.localPosition = new Vector3(0.02f, 0.01f, -0.043f); + ItemGameObject.transform.localEulerAngles = new Vector3(-9f, -83f, 83f); ItemGameObject.transform.localScale = new Vector3(0.7f, 0.7f, 0.7f); ItemGameObject.SetActive(false); } diff --git a/Client/Assets/Scripts/Contents/Items/FlashBang.cs b/Client/Assets/Scripts/Contents/Items/FlashBang.cs index 2b3c863810..670e743b5c 100644 --- a/Client/Assets/Scripts/Contents/Items/FlashBang.cs +++ b/Client/Assets/Scripts/Contents/Items/FlashBang.cs @@ -8,9 +8,10 @@ public override void SetInfo(int templateId, Crew owner) { base.SetInfo(templateId, owner); - ItemGameObject.transform.localPosition = new Vector3(-0.03f, 0f, -0.03f); - ItemGameObject.transform.localEulerAngles = new Vector3(-6f, 20f, 88f); - ItemGameObject.transform.localScale = new Vector3(1f, 1f, 1f); + ItemGameObject.transform.localPosition = new Vector3(0.02f, 0.01f, -0.043f); + ItemGameObject.transform.localEulerAngles = new Vector3(-9f, 7f, 83f); + ItemGameObject.transform.localScale = new Vector3(1.2f, 1.2f, 1.2f); + ItemGameObject.SetActive(false); } public override bool CheckAndUseItem() diff --git a/Client/Assets/Scripts/Contents/Items/Morphine.cs b/Client/Assets/Scripts/Contents/Items/Morphine.cs index 8ceed3bcd6..5df4c6a717 100644 --- a/Client/Assets/Scripts/Contents/Items/Morphine.cs +++ b/Client/Assets/Scripts/Contents/Items/Morphine.cs @@ -14,7 +14,7 @@ public override void SetInfo(int templateId, Crew owner) } public override bool CheckAndUseItem() { - if (Owner.CrewStat.Sanity >= Owner.CrewStat.MaxSanity) + if (Owner.CrewStat.Doped) return false; UseItem(); @@ -23,9 +23,11 @@ public override bool CheckAndUseItem() protected override void UseItem() { - DOVirtual.Float(0, 0, 5, value => + Owner.CrewStat.Doped = true; + + DOVirtual.DelayedCall(ItemData.Value, () => { - Owner.CrewStat.ChangeSanity(ItemData.Value * Time.deltaTime); + Owner.CrewStat.Doped = false; }); } } diff --git a/Client/Assets/Scripts/Contents/Stats/CrewStat.cs b/Client/Assets/Scripts/Contents/Stats/CrewStat.cs index fe1ff1bd21..b9beba7cc0 100644 --- a/Client/Assets/Scripts/Contents/Stats/CrewStat.cs +++ b/Client/Assets/Scripts/Contents/Stats/CrewStat.cs @@ -16,6 +16,7 @@ public class CrewStat : BaseStat public bool IsRunnable { get; set; } public bool Exhausted { get; set; } + public bool Doped { get; set; } public Action OnHpChanged; public Action OnSanityChanged; diff --git a/Client/Assets/Scripts/Creatures/Crew.cs b/Client/Assets/Scripts/Creatures/Crew.cs index e46098433a..eeaf01de65 100644 --- a/Client/Assets/Scripts/Creatures/Crew.cs +++ b/Client/Assets/Scripts/Creatures/Crew.cs @@ -212,7 +212,10 @@ protected void UpdateStat() return; if (CreatureState == Define.CreatureState.Move && CreaturePose == Define.CreaturePose.Run) - CrewStat.ChangeStamina(-Define.RUN_USE_STAMINA * Runner.DeltaTime); + { + if (!CrewStat.Doped) + CrewStat.ChangeStamina(-Define.RUN_USE_STAMINA * Runner.DeltaTime); + } else CrewStat.ChangeStamina(Define.PASIVE_RECOVER_STAMINA * Runner.DeltaTime); @@ -221,7 +224,7 @@ protected void UpdateStat() CrewStat.ChangeStamina(Define.PASIVE_RECOVER_STAMINA * Runner.DeltaTime); CrewStat.ChangeSanity(Define.SIT_RECOVER_SANITY * Runner.DeltaTime); } - else + else if (CrewSoundController.IsChasing) CrewStat.ChangeSanity(-Define.PASIVE_REDUCE_SANITY * Runner.DeltaTime); } diff --git a/Client/Assets/Scripts/Utils/Define.cs b/Client/Assets/Scripts/Utils/Define.cs index dfbab9dc11..0a777d3852 100644 --- a/Client/Assets/Scripts/Utils/Define.cs +++ b/Client/Assets/Scripts/Utils/Define.cs @@ -140,6 +140,7 @@ public enum CameraMode public const int ITEM_BATTERY_ID = 201000; public const int ITEM_BANDAGE_ID = 202000; public const int ITEM_MORPHINE_ID = 202001; + public const int ITEM_ANTIPSYCHOTIC_ID = 202002; public const int ITEM_FLASHBANG_ID = 203000; public const int SKILL_BASIC_ATTACK_ID = 301000; @@ -165,12 +166,13 @@ public enum CameraMode public const int MAX_ITEM_NUM = 4; public const int MAX_SKILL_NUM = 4; - public const float PASIVE_RECOVER_STAMINA = 2.5f; + public const float PASIVE_RECOVER_STAMINA = 1.5f; public const float DAMAGED_RECOVER_STAMINA = 30f; - public const float RUN_USE_STAMINA = 10f; + public const float RUN_USE_STAMINA = 5f; public const float PASIVE_REDUCE_SANITY = 1f; - public const float SIT_RECOVER_SANITY = 0.5f; + public const float SIT_RECOVER_SANITY = 1f; public const int BATTERY_COLLECT_GOAL = 3; + #endregion }