diff --git a/Client/Assets/Resources/Animators/Alien.controller b/Client/Assets/Resources/Animators/Alien.controller index b3ca457b53..f1605beebc 100644 --- a/Client/Assets/Resources/Animators/Alien.controller +++ b/Client/Assets/Resources/Animators/Alien.controller @@ -211,7 +211,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: HitDelay - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: 5029254579014951104} @@ -803,7 +803,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: GetBlind - m_Speed: 1 + m_Speed: 0.5 m_CycleOffset: 0 m_Transitions: - {fileID: 5494457350978872260} @@ -935,7 +935,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: ReadyLeapAttack - m_Speed: -0.2 + m_Speed: -1 m_CycleOffset: 0 m_Transitions: - {fileID: -6358154947262754084} diff --git a/Client/Assets/Resources/Animators/Crew.controller b/Client/Assets/Resources/Animators/Crew.controller index 764254e4f9..98e80a7a16 100644 --- a/Client/Assets/Resources/Animators/Crew.controller +++ b/Client/Assets/Resources/Animators/Crew.controller @@ -580,79 +580,79 @@ 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: Insert 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_Name: Bandage 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 @@ -1085,7 +1085,7 @@ AnimatorState: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Throw - m_Speed: 1 + m_Speed: 1.5 m_CycleOffset: 0 m_Transitions: - {fileID: -9178555982932793547} diff --git a/Client/Assets/Resources/Datas/ExcelData/AlienData.csv b/Client/Assets/Resources/Datas/ExcelData/AlienData.csv index f34c56b76d..6bd255dc8d 100644 --- a/Client/Assets/Resources/Datas/ExcelData/AlienData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/AlienData.csv @@ -1,2 +1,3 @@ -DataId,Name,WalkSpeed,RunSpeed -102000,Stalker,110,125 +DataId,Name,WalkSpeed +102000,Stalker,110 +,, diff --git a/Client/Assets/Resources/Datas/ExcelData/CrewData.csv b/Client/Assets/Resources/Datas/ExcelData/CrewData.csv index a4bdba1d70..f4c28d5f1d 100644 --- a/Client/Assets/Resources/Datas/ExcelData/CrewData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/CrewData.csv @@ -1,3 +1,5 @@ -DataId,Name,WalkSpeed,RunSpeed,MaxHp,MaxStamina,MaxSanity,SitSpeed -101000,CrewA,80,110,3,100,100,40 -,,,,,,, +DataId,Name,WalkSpeed,SitSpeed,RunSpeed,MaxHp,MaxStamina,MaxSanity,RunUseStamina,PassiveRecoverStamina,DamagedRecoverStamina,ErosionReduceSanity,SitRecoverStamina +101000,CrewA,80,30,110,3,100,100,5,5,50,3,5 +,,,,,,,,,,,, +,,,,,,,,,,, +,,,,,,,,,,,, diff --git a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv index 265c5569a5..9afa085b2e 100644 --- a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv @@ -5,4 +5,5 @@ DataId,Name,Value 202000,Bandage,1 202001,Morphine,10 202002,Antipsychotic,40 -203000,FlashBang,2 +203000,FlashBang,4 +,, diff --git a/Client/Assets/Resources/Datas/ExcelData/SkillData.csv b/Client/Assets/Resources/Datas/ExcelData/SkillData.csv index e4fdc780a0..08d6b3f708 100644 --- a/Client/Assets/Resources/Datas/ExcelData/SkillData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/SkillData.csv @@ -1,7 +1,7 @@ DataId,Name,CoolTime,Range,Damage,SanityDamage,TotalSkillAmount,TotalReadySkillAmount 301000,Basic Attack,2,1.5,1,0,1.2,-1 301001,Roar,15,10,0,25,2.5,0.7 -301002,Cursed Howl,60,-1,0,0,3.5,0.7 -301003,Leap Attack,20,1.5,2,0,1.8,0.7 +301002,Cursed Howl,40,-1,0,0,3.5,0.7 +301003,Leap Attack,10,1.5,2,0,1.8,0.1 ,,,,,,, ,,,,, diff --git a/Client/Assets/Resources/Datas/JsonData/AlienData.json b/Client/Assets/Resources/Datas/JsonData/AlienData.json index 31b2f0f23f..80c94f44b6 100644 --- a/Client/Assets/Resources/Datas/JsonData/AlienData.json +++ b/Client/Assets/Resources/Datas/JsonData/AlienData.json @@ -3,9 +3,7 @@ { "DataId": 102000, "Name": "Stalker", - "WalkSpeed": 110.0, - "RunSpeed": 125.0, - "WorkSpeed": 10.0 + "WalkSpeed": 110.0 } ] } \ No newline at end of file diff --git a/Client/Assets/Resources/Datas/JsonData/CrewData.json b/Client/Assets/Resources/Datas/JsonData/CrewData.json index 0630f6937c..51d47581f6 100644 --- a/Client/Assets/Resources/Datas/JsonData/CrewData.json +++ b/Client/Assets/Resources/Datas/JsonData/CrewData.json @@ -1,15 +1,19 @@ { "crews": [ { + "SitSpeed": 30.0, + "RunSpeed": 110.0, "MaxHp": 3, "MaxStamina": 100.0, "MaxSanity": 100.0, - "SitSpeed": 40.0, + "RunUseStamina": 5.0, + "PassiveRecoverStamina": 5.0, + "DamagedRecoverStamina": 50.0, + "ErosionReduceSanity": 3.0, + "SitRecoverStamina": 5.0, "DataId": 101000, "Name": "CrewA", - "WalkSpeed": 80.0, - "RunSpeed": 110.0, - "WorkSpeed": 10.0 + "WalkSpeed": 80.0 } ] } \ No newline at end of file diff --git a/Client/Assets/Resources/Datas/JsonData/ItemData.json b/Client/Assets/Resources/Datas/JsonData/ItemData.json index c62d2db689..0d0c64130c 100644 --- a/Client/Assets/Resources/Datas/JsonData/ItemData.json +++ b/Client/Assets/Resources/Datas/JsonData/ItemData.json @@ -33,7 +33,7 @@ { "DataId": 203000, "Name": "FlashBang", - "Value": 2.0 + "Value": 4.0 } ] } \ No newline at end of file diff --git a/Client/Assets/Resources/Datas/JsonData/SkillData.json b/Client/Assets/Resources/Datas/JsonData/SkillData.json index cb090acbff..d49c9a1ab6 100644 --- a/Client/Assets/Resources/Datas/JsonData/SkillData.json +++ b/Client/Assets/Resources/Datas/JsonData/SkillData.json @@ -6,7 +6,7 @@ "CoolTime": 2.0, "Range": 1.5, "Damage": 1, - "SanityDamage": 20.0, + "SanityDamage": 0.0, "TotalSkillAmount": 1.2, "TotalReadySkillAmount": -1.0 }, @@ -16,29 +16,29 @@ "CoolTime": 15.0, "Range": 10.0, "Damage": 0, - "SanityDamage": 30.0, + "SanityDamage": 25.0, "TotalSkillAmount": 2.5, "TotalReadySkillAmount": 0.7 }, { "DataId": 301002, "Name": "Cursed Howl", - "CoolTime": 60.0, + "CoolTime": 40.0, "Range": -1.0, - "Damage": -1, - "SanityDamage": -1.0, + "Damage": 0, + "SanityDamage": 0.0, "TotalSkillAmount": 3.5, "TotalReadySkillAmount": 0.7 }, { "DataId": 301003, "Name": "Leap Attack", - "CoolTime": 20.0, + "CoolTime": 10.0, "Range": 1.5, "Damage": 2, - "SanityDamage": 20.0, + "SanityDamage": 0.0, "TotalSkillAmount": 1.8, - "TotalReadySkillAmount": 0.7 + "TotalReadySkillAmount": 0.1 } ] } \ No newline at end of file diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab deleted file mode 100644 index a449c71a80..0000000000 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab +++ /dev/null @@ -1,435 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &1120575333297816 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4538653446468868} - - component: {fileID: 6732339422781032047} - - component: {fileID: -7063927424009573794} - - component: {fileID: 4388194047007253240} - - component: {fileID: 6781550415590428301} - - component: {fileID: 6304200391465576354} - - component: {fileID: -379113403093983909} - m_Layer: 12 - m_Name: ItemKit _USBKey - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4538653446468868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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: 4491669852711458} - - {fileID: 4629890202513766} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6732339422781032047 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &-7063927424009573794 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &4388194047007253240 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 &6781550415590428301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SortKey: 2970769364 - ObjectInterest: 1 - Flags: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: 6304200391465576354} - - {fileID: -379113403093983909} ---- !u!114 &6304200391465576354 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &-379113403093983909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} - m_Name: - m_EditorClassIdentifier: - _itemId: 201001 ---- !u!1 &1140513267480146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4629890202513766} - - component: {fileID: 33900571781984672} - - component: {fileID: 23470484814428156} - m_Layer: 12 - m_Name: Cover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4629890202513766 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33900571781984672 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - m_Mesh: {fileID: 4300002, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23470484814428156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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 &1755213825497560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4491669852711458} - - component: {fileID: 33269320054627020} - - component: {fileID: 23333584414628522} - m_Layer: 12 - m_Name: case04 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4491669852711458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33269320054627020 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - m_Mesh: {fileID: 4300000, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23333584414628522 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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/ItemKit.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab index f630762870..4a7292a809 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1120575333297816 +--- !u!1 &3481522096991780755 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,13 +8,179 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4538653446468868} - - component: {fileID: 6732339422781032047} - - component: {fileID: -7063927424009573794} - - component: {fileID: 4388194047007253240} - - component: {fileID: 6781550415590428301} - - component: {fileID: -5219596980374729268} - - component: {fileID: -379113403093983909} + - component: {fileID: 3483834045967109225} + - component: {fileID: 3468009173756329095} + - component: {fileID: 3459890930567494881} + m_Layer: 12 + m_Name: case04 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3483834045967109225 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3481522096991780755} + 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: 3478743038290006863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3468009173756329095 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3481522096991780755} + m_Mesh: {fileID: 4300000, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} +--- !u!23 &3459890930567494881 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3481522096991780755} + 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 &3482101611015671833 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3478634207147874093} + - component: {fileID: 3471877147205015531} + - component: {fileID: 3460321376020009399} + m_Layer: 12 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3478634207147874093 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3482101611015671833} + 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: 3478743038290006863} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3471877147205015531 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3482101611015671833} + m_Mesh: {fileID: 4300002, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} +--- !u!23 &3460321376020009399 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3482101611015671833} + 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 &3482723513933203667 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3478743038290006863} + - component: {fileID: 7870311602698068004} + - component: {fileID: 3287916702113205269} + - component: {fileID: 915104292201104563} + - component: {fileID: 7947179409271122118} + - component: {fileID: 7434283446469640681} + - component: {fileID: 5398685532768353040} m_Layer: 12 m_Name: ItemKit m_TagString: Untagged @@ -22,30 +188,30 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4538653446468868 +--- !u!4 &3478743038290006863 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} 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: 4491669852711458} - - {fileID: 4629890202513766} + - {fileID: 3483834045967109225} + - {fileID: 3478634207147874093} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6732339422781032047 +--- !u!54 &7870311602698068004 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -66,13 +232,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!65 &-7063927424009573794 +--- !u!65 &3287916702113205269 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -85,15 +251,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8, y: 0.05, z: 0.55} + m_Size: {x: 1, y: 0.05, z: 0.7} m_Center: {x: 0, y: 0.025, z: 0} ---- !u!82 &4388194047007253240 +--- !u!82 &915104292201104563 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} @@ -219,32 +385,32 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &6781550415590428301 +--- !u!114 &7947179409271122118 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} m_Name: m_EditorClassIdentifier: - SortKey: 3698272929 + SortKey: 3693087950 ObjectInterest: 1 Flags: 131073 NestedObjects: [] NetworkedBehaviours: - - {fileID: -5219596980374729268} - - {fileID: -379113403093983909} ---- !u!114 &-5219596980374729268 + - {fileID: 7434283446469640681} + - {fileID: 5398685532768353040} +--- !u!114 &7434283446469640681 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} @@ -254,182 +420,16 @@ MonoBehaviour: SyncParent: 1 _autoAOIOverride: 1 DisableSharedModeInterpolation: 0 ---- !u!114 &-379113403093983909 +--- !u!114 &5398685532768353040 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} + m_GameObject: {fileID: 3482723513933203667} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} m_Name: m_EditorClassIdentifier: _itemId: 0 ---- !u!1 &1140513267480146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4629890202513766} - - component: {fileID: 33900571781984672} - - component: {fileID: 23470484814428156} - m_Layer: 12 - m_Name: Cover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4629890202513766 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33900571781984672 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - m_Mesh: {fileID: 4300002, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23470484814428156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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 &1755213825497560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4491669852711458} - - component: {fileID: 33269320054627020} - - component: {fileID: 23333584414628522} - m_Layer: 12 - m_Name: case04 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4491669852711458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33269320054627020 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - m_Mesh: {fileID: 4300000, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23333584414628522 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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/ItemKit.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab.meta index 610b1c992b..9449cb0536 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21a179775bda8ed4f8ed37d46db54e54 +guid: 03ef84ec1ae335446b79aba2250ab38b labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab index c150cd1c9c..7b2bd09be0 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab @@ -1,435 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1120575333297816 -GameObject: +--- !u!1001 &3950760592440838929 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4538653446468868} - - component: {fileID: 6732339422781032047} - - component: {fileID: -7063927424009573794} - - component: {fileID: 4388194047007253240} - - component: {fileID: 6781550415590428301} - - component: {fileID: -7103701772259060352} - - component: {fileID: -379113403093983909} - m_Layer: 12 - m_Name: ItemKit_CardKey - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4538653446468868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} 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: 4491669852711458} - - {fileID: 4629890202513766} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6732339422781032047 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &-7063927424009573794 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &4388194047007253240 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.x value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.z 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 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.w 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 &6781550415590428301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SortKey: 2772794146 - ObjectInterest: 1 - Flags: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: -7103701772259060352} - - {fileID: -379113403093983909} ---- !u!114 &-7103701772259060352 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &-379113403093983909 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} - m_Name: - m_EditorClassIdentifier: - _itemId: 201002 ---- !u!1 &1140513267480146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4629890202513766} - - component: {fileID: 33900571781984672} - - component: {fileID: 23470484814428156} - m_Layer: 12 - m_Name: Cover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4629890202513766 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33900571781984672 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - m_Mesh: {fileID: 4300002, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23470484814428156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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 &1755213825497560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4491669852711458} - - component: {fileID: 33269320054627020} - - component: {fileID: 23333584414628522} - m_Layer: 12 - m_Name: case04 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4491669852711458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33269320054627020 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - m_Mesh: {fileID: 4300000, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23333584414628522 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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} + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3482723513933203667, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_Name + value: ItemKit_CardKey + objectReference: {fileID: 0} + - target: {fileID: 5398685532768353040, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: _itemId + value: 201002 + objectReference: {fileID: 0} + - target: {fileID: 7947179409271122118, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: SortKey + value: 3391742663 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab.meta index 11f025411b..483c6e7430 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_CardKey.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f021f29582a5fa84cb725ffb8c90dd4e +guid: 8112fcc7f7d151949bd18672398a1769 labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab index d092a0de2d..7f0482c8e6 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab @@ -1,435 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1120575333297816 -GameObject: +--- !u!1001 &3950760592440838929 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4538653446468868} - - component: {fileID: 6732339422781032047} - - component: {fileID: -7063927424009573794} - - component: {fileID: 4388194047007253240} - - component: {fileID: 6781550415590428301} - - component: {fileID: 2271232272687210999} - - component: {fileID: 864922733687208343} - m_Layer: 12 - m_Name: ItemKit_FlashBang - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4538653446468868 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} 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: 4491669852711458} - - {fileID: 4629890202513766} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6732339422781032047 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &-7063927424009573794 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &4388194047007253240 -AudioSource: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.x value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.z 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 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.w 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 &6781550415590428301 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SortKey: 639443664 - ObjectInterest: 1 - Flags: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: 2271232272687210999} - - {fileID: 864922733687208343} ---- !u!114 &2271232272687210999 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - 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 &864922733687208343 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1120575333297816} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} - m_Name: - m_EditorClassIdentifier: - _itemId: 203000 ---- !u!1 &1140513267480146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4629890202513766} - - component: {fileID: 33900571781984672} - - component: {fileID: 23470484814428156} - m_Layer: 12 - m_Name: Cover - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4629890202513766 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33900571781984672 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - m_Mesh: {fileID: 4300002, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23470484814428156 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1140513267480146} - 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 &1755213825497560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4491669852711458} - - component: {fileID: 33269320054627020} - - component: {fileID: 23333584414628522} - m_Layer: 12 - m_Name: case04 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4491669852711458 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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: 4538653446468868} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33269320054627020 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - m_Mesh: {fileID: 4300000, guid: 5da24ede3c7320e48ad7363d67cd223f, type: 3} ---- !u!23 &23333584414628522 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1755213825497560} - 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} + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3482723513933203667, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_Name + value: ItemKit_FlashBang + objectReference: {fileID: 0} + - target: {fileID: 5398685532768353040, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: _itemId + value: 203000 + objectReference: {fileID: 0} + - target: {fileID: 7947179409271122118, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: SortKey + value: 2889071050 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab.meta index c0ca772f7d..364202a690 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_FlashBang.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e33450eb92498084b835521234b119fc +guid: cc40b5b84e107324ba132505764788f0 labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab new file mode 100644 index 0000000000..75b952d817 --- /dev/null +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab @@ -0,0 +1,67 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &3950760592440838929 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3478743038290006863, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3482723513933203667, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: m_Name + value: ItemKit_USBKey + objectReference: {fileID: 0} + - target: {fileID: 5398685532768353040, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: _itemId + value: 201001 + objectReference: {fileID: 0} + - target: {fileID: 7947179409271122118, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} + propertyPath: SortKey + value: 1668309660 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03ef84ec1ae335446b79aba2250ab38b, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab.meta similarity index 77% rename from Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab.meta rename to Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab.meta index 3c385c3af2..d51deff452 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit _USBKey.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/ItemKit_USBKey.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc6ba6d4456b270499f734fb7ea40a86 +guid: a24bee852908bf04b8ef6749384a2830 labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab index 1a6743e3a5..cba5c5712b 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1197494383185850 +--- !u!1 &1845448866606119509 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4061469558252398} - - component: {fileID: 33200654189607436} - - component: {fileID: 23703867775575484} + - component: {fileID: 1843789776825210497} + - component: {fileID: 1868408062237790179} + - component: {fileID: 1858911739688521811} m_Layer: 12 m_Name: Box m_TagString: Untagged @@ -18,36 +18,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4061469558252398 +--- !u!4 &1843789776825210497 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1197494383185850} + m_GameObject: {fileID: 1845448866606119509} 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_Father: {fileID: 1840063145490548533} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33200654189607436 +--- !u!33 &1868408062237790179 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1197494383185850} + m_GameObject: {fileID: 1845448866606119509} m_Mesh: {fileID: 4300000, guid: 0f5c2670160978e4e9de07e57ea4c86a, type: 3} ---- !u!23 &23703867775575484 +--- !u!23 &1858911739688521811 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1197494383185850} + m_GameObject: {fileID: 1845448866606119509} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -83,7 +83,7 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &1343902041442310 +--- !u!1 &1845594792691236329 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -91,13 +91,13 @@ GameObject: 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: 7069807848051228662} - - component: {fileID: -7557234133260900366} + - component: {fileID: 1840063145490548533} + - component: {fileID: 4745274768593982810} + - component: {fileID: 1734203954431061583} + - component: {fileID: 7067400289601168430} + - component: {fileID: 4979594052862338693} + - component: {fileID: 8900546823731300889} + - component: {fileID: 1046901587955814941} m_Layer: 12 m_Name: MedKit m_TagString: Untagged @@ -105,30 +105,30 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4837046210294490 +--- !u!4 &1840063145490548533 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} 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} + - {fileID: 1843789776825210497} + - {fileID: 1843873591951028475} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!54 &6359789285050933429 +--- !u!54 &4745274768593982810 Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} serializedVersion: 4 m_Mass: 1 m_Drag: 0 @@ -149,13 +149,13 @@ Rigidbody: m_Interpolate: 0 m_Constraints: 0 m_CollisionDetection: 0 ---- !u!65 &110683046638787488 +--- !u!65 &1734203954431061583 BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -168,15 +168,15 @@ BoxCollider: m_ProvidesContacts: 0 m_Enabled: 1 serializedVersion: 3 - m_Size: {x: 0.8, y: 0.05, z: 0.55} + m_Size: {x: 1, y: 0.05, z: 0.7} m_Center: {x: 0, y: 0.025, z: 0} ---- !u!82 &8902609261021581761 +--- !u!82 &7067400289601168430 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} m_Enabled: 1 serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} @@ -302,32 +302,32 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!114 &6666183428592964458 +--- !u!114 &4979594052862338693 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -1552182283, guid: e725a070cec140c4caffb81624c8c787, type: 3} m_Name: m_EditorClassIdentifier: - SortKey: 4116477776 + SortKey: 2013548652 ObjectInterest: 1 Flags: 262145 NestedObjects: [] NetworkedBehaviours: - - {fileID: 7069807848051228662} - - {fileID: -7557234133260900366} ---- !u!114 &7069807848051228662 + - {fileID: 8900546823731300889} + - {fileID: 1046901587955814941} +--- !u!114 &8900546823731300889 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} @@ -337,20 +337,20 @@ MonoBehaviour: SyncParent: 1 _autoAOIOverride: 1 DisableSharedModeInterpolation: 0 ---- !u!114 &-7557234133260900366 +--- !u!114 &1046901587955814941 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343902041442310} + m_GameObject: {fileID: 1845594792691236329} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c9adb7049e404e52aebabf3566b57551, type: 3} m_Name: m_EditorClassIdentifier: _itemId: 0 ---- !u!1 &1935870254814166 +--- !u!1 &1846185868088206905 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -358,9 +358,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4179970227569940} - - component: {fileID: 33078128777629482} - - component: {fileID: 23363505543020046} + - component: {fileID: 1843873591951028475} + - component: {fileID: 1868321528655968965} + - component: {fileID: 1858605754441370593} m_Layer: 12 m_Name: Cover m_TagString: Untagged @@ -368,36 +368,36 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4179970227569940 +--- !u!4 &1843873591951028475 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1935870254814166} + m_GameObject: {fileID: 1846185868088206905} 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_Father: {fileID: 1840063145490548533} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &33078128777629482 +--- !u!33 &1868321528655968965 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1935870254814166} + m_GameObject: {fileID: 1846185868088206905} m_Mesh: {fileID: 4300002, guid: 0f5c2670160978e4e9de07e57ea4c86a, type: 3} ---- !u!23 &23363505543020046 +--- !u!23 &1858605754441370593 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1935870254814166} + m_GameObject: {fileID: 1846185868088206905} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab.meta index 73fc1177e9..aacd3d4a88 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 56acb4b35ef0e5740ae197b1dfa1a4a8 +guid: 435e773138003d44889a52db8bfb50e4 labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab index 6cce23e0dc..602a272e58 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab @@ -1,435 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1197494383185850 -GameObject: +--- !u!1001 &1844251441017976303 +PrefabInstance: 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: 12 - 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: 8494317797991653156} - - component: {fileID: -7557234133260900366} - m_Layer: 12 - 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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1046901587955814941, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: _itemId + value: 202002 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.x value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.z 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.w 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: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: 8494317797991653156} - - {fileID: -7557234133260900366} ---- !u!114 &8494317797991653156 -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: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SyncScale: 1 - SyncParent: 1 - _autoAOIOverride: 1 - DisableSharedModeInterpolation: 0 ---- !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: 12 - 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} + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1845594792691236329, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_Name + value: MedKit_Antipsychotic + objectReference: {fileID: 0} + - target: {fileID: 4979594052862338693, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: SortKey + value: 3830623502 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 435e773138003d44889a52db8bfb50e4, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta index 5a17941c7c..4996def679 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Antipsychotic.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4237d496f5a44b4d8deae31d2d43666 +guid: a815814a11f5b1a48a30ded555839ba1 labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab index f1daa88cfc..caacf5be6f 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Bandage.prefab @@ -1,435 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1197494383185850 -GameObject: +--- !u!1001 &1844251441017976303 +PrefabInstance: 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: 12 - 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: 1543664631133769609} - - component: {fileID: 6666183428592964458} - - component: {fileID: -7377052991600747646} - - component: {fileID: -7557234133260900366} - m_Layer: 12 - m_Name: MedKit_Bandage - 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 &1543664631133769609 -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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1046901587955814941, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: _itemId + value: 202000 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.x value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.z 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.w 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: 2633625224 - ObjectInterest: 1 - Flags: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: -7377052991600747646} - - {fileID: -7557234133260900366} ---- !u!114 &-7377052991600747646 -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: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SyncScale: 1 - SyncParent: 1 - _autoAOIOverride: 1 - DisableSharedModeInterpolation: 0 ---- !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: 202000 ---- !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: 12 - 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.27000007, 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} + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1845594792691236329, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_Name + value: MedKit_Bandage + objectReference: {fileID: 0} + - target: {fileID: 4979594052862338693, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: SortKey + value: 1904897812 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 435e773138003d44889a52db8bfb50e4, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab index 5050a8a0ca..ece82877e8 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab @@ -1,435 +1,67 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1197494383185850 -GameObject: +--- !u!1001 &1844251441017976303 +PrefabInstance: 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: 12 - 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: 5509646617270001875} - - component: {fileID: 6666183428592964458} - - component: {fileID: 822384369575669497} - - component: {fileID: -7557234133260900366} - m_Layer: 12 - m_Name: MedKit_Morphine - 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 &5509646617270001875 -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: 2 - BypassEffects: 0 - BypassListenerEffects: 0 - BypassReverbZones: 0 - rolloffCustomCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0.05 - value: 1 - inSlope: -20.007967 - outSlope: -20.007967 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 0.5 - inSlope: -5.0019917 - outSlope: -5.0019917 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 0.25 - inSlope: -1.2504979 - outSlope: -1.2504979 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.4 - value: 0.125 - inSlope: -0.31262448 - outSlope: -0.31262448 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.8 - value: 0.0625 - inSlope: -0.07815612 - outSlope: -0.07815612 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1046901587955814941, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: _itemId + value: 202001 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.x value: 0 - inSlope: -0.05001994 - outSlope: -0.05001994 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalPosition.z 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 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.w 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: 1698423467 - ObjectInterest: 1 - Flags: 131073 - NestedObjects: [] - NetworkedBehaviours: - - {fileID: 822384369575669497} - - {fileID: -7557234133260900366} ---- !u!114 &822384369575669497 -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: 158639473, guid: e725a070cec140c4caffb81624c8c787, type: 3} - m_Name: - m_EditorClassIdentifier: - SyncScale: 1 - SyncParent: 1 - _autoAOIOverride: 1 - DisableSharedModeInterpolation: 0 ---- !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: 202001 ---- !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: 12 - 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.27000007, 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} + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1840063145490548533, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1845594792691236329, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: m_Name + value: MedKit_Morphine + objectReference: {fileID: 0} + - target: {fileID: 4979594052862338693, guid: 435e773138003d44889a52db8bfb50e4, type: 3} + propertyPath: SortKey + value: 539155745 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 435e773138003d44889a52db8bfb50e4, type: 3} diff --git a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab.meta b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab.meta index e87de66f4e..6abde6c000 100644 --- a/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab.meta +++ b/Client/Assets/Resources/Prefabs/Interactables/WorkStation/MedKit_Morphine.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: afd9f2a65616cdf49ae849562f7ac14a +guid: 8d7e82dc86fe3b54999297cdfc904ecb labels: - FusionPrefab PrefabImporter: diff --git a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab index 12ba82f2cf..0fcd5d5945 100644 --- a/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab +++ b/Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab @@ -90,27 +90,27 @@ MonoBehaviour: GlobalMinCount: 13 GlobalMaxCount: 13 MaxCountPerSector: 2 - - Prefab: {fileID: 1120575333297816, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} + - Prefab: {fileID: 470332895390581698, guid: a24bee852908bf04b8ef6749384a2830, type: 3} GlobalMinCount: 8 GlobalMaxCount: 8 MaxCountPerSector: 1 - - Prefab: {fileID: 1120575333297816, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} + - Prefab: {fileID: 470332895390581698, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} GlobalMinCount: 1 GlobalMaxCount: 1 MaxCountPerSector: 1 - - Prefab: {fileID: 1343902041442310, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - Prefab: {fileID: 470332895390581698, guid: cc40b5b84e107324ba132505764788f0, type: 3} GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 - - Prefab: {fileID: 1343902041442310, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} + - Prefab: {fileID: 1343902041442310, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 - - Prefab: {fileID: 1343902041442310, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} + - Prefab: {fileID: 1343902041442310, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 - - Prefab: {fileID: 1120575333297816, guid: e33450eb92498084b835521234b119fc, type: 3} + - Prefab: {fileID: 1343902041442310, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} GlobalMinCount: 7 GlobalMaxCount: 7 MaxCountPerSector: 1 diff --git a/Client/Assets/Scenes/LobbyScene.unity b/Client/Assets/Scenes/LobbyScene.unity index 7f5552085a..4e10714542 100644 --- a/Client/Assets/Scenes/LobbyScene.unity +++ b/Client/Assets/Scenes/LobbyScene.unity @@ -377,6 +377,78 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 2683262678279714921, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_text + value: 'TEAM + + + Game Director + + JANG JAEMAN + + + Lead Network + Programmer + + JANG JAEMAN + + + Lead Client Programmer + + KIM + TAEBUM + + + Client Programmer + + JO SEOJIN + + HAM SUYEON + + JANG + MINSEOK + + + Lead Game Designer + + SONG JUN + + + Map Designer + + JO + SEOJIN + + + Logo Artist + + HAM SUYEON + + + + Sound & Music + + + Panic + Man + + DAVID FESLIYAN + + + In Captivity + + EXPERIA + + + Black + Magic + + https://www.youtube.com/watch?v=SnPcG-8_66w' + objectReference: {fileID: 0} + - target: {fileID: 2683262678279714921, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} + propertyPath: m_TextStyleHashCode + value: 2427 + objectReference: {fileID: 0} - target: {fileID: 2900374389301404373, guid: 334e0f237eb74b1459c57b54fa5d504a, type: 3} propertyPath: m_AnchorMax.y value: 0 diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity index d950fb8082..ad25ccc8e9 100644 --- a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity +++ b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity @@ -123,67 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &53529794 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1120575333297816, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_Name - value: ItemKit _USBKey (1) - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.x - value: 11.165 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.y - value: 0.51 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.z - value: 1.805 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6781550415590428301, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: SortKey - value: 2622287554 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} --- !u!1 &118287624 GameObject: m_ObjectHideFlags: 0 @@ -657,6 +596,67 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1001 &133869399 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 470332895390581698, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_Name + value: ItemKit_USBKey (1) + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.x + value: 10.627235 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5099999 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.z + value: 1.8 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6384387121119699927, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: SortKey + value: 62237309 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a24bee852908bf04b8ef6749384a2830, type: 3} --- !u!1001 &145415887 PrefabInstance: m_ObjectHideFlags: 0 @@ -2478,68 +2478,7 @@ Transform: - {fileID: 1321193195} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &695222965 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1120575333297816, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_Name - value: ItemKit_FlashBang - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalPosition.x - value: -0.8629694 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5036913 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalPosition.z - value: -1.7785659 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6781550415590428301, guid: e33450eb92498084b835521234b119fc, type: 3} - propertyPath: SortKey - value: 1091525451 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e33450eb92498084b835521234b119fc, type: 3} ---- !u!1001 &705518052 +--- !u!1001 &702667825 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -2547,59 +2486,59 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1343902041442310, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 470332895390581698, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_Name - value: MedKit_Antipsychotic + value: ItemKit_CardKey objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalPosition.x - value: 0.655 + value: 8.796493 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalPosition.y - value: 0.5036912 + value: 0.51 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalPosition.z - value: -1.775 + value: 1.8 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 474304642158680158, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6666183428592964458, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + - target: {fileID: 6384387121119699927, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} propertyPath: SortKey - value: 3623459989 + value: 3153552235 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f4237d496f5a44b4d8deae31d2d43666, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 8112fcc7f7d151949bd18672398a1769, type: 3} --- !u!1 &724088308 GameObject: m_ObjectHideFlags: 0 @@ -4272,6 +4211,67 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &795886070 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1343902041442310, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_Name + value: MedKit_Bandage + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalPosition.x + value: 1.4025277 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5036912 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6666183428592964458, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} + propertyPath: SortKey + value: 3647959341 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 56acb4b35ef0e5740ae197b1dfa1a4a8, type: 3} --- !u!1 &803888357 GameObject: m_ObjectHideFlags: 0 @@ -4849,67 +4849,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!1001 &822473360 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1120575333297816, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_Name - value: ItemKit _USBKey - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.x - value: 10.525 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.y - value: 0.51 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalPosition.z - value: 1.799 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6781550415590428301, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} - propertyPath: SortKey - value: 3852914003 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fc6ba6d4456b270499f734fb7ea40a86, type: 3} --- !u!1 &949048115 GameObject: m_ObjectHideFlags: 0 @@ -5383,69 +5322,8 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} ---- !u!1001 &988406837 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1120575333297816, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_Name - value: ItemKit_CardKey - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalPosition.x - value: 9.849 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5100001 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalPosition.z - value: 1.813 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4538653446468868, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6781550415590428301, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} - propertyPath: SortKey - value: 2576637349 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f021f29582a5fa84cb725ffb8c90dd4e, type: 3} ---- !u!1 &999382489 -GameObject: +--- !u!1 &999382489 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -5478,7 +5356,7 @@ MonoBehaviour: DefaultRoomName: Test Creature: 1 PrefabNum: 0 - ReadySceneSpawnPosition: {x: 0, y: 0.5, z: 0} + ReadySceneSpawnPosition: {x: 1.2, y: 0, z: 0} ReadySceneSpawnSector: 1 --- !u!114 &999382491 MonoBehaviour: @@ -6467,6 +6345,67 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} +--- !u!1001 &1230568782 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 470332895390581698, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_Name + value: ItemKit_USBKey + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.x + value: 9.699013 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.y + value: 0.51 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalPosition.z + value: 1.8 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6384387121119699927, guid: a24bee852908bf04b8ef6749384a2830, type: 3} + propertyPath: SortKey + value: 1780621080 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a24bee852908bf04b8ef6749384a2830, type: 3} --- !u!114 &1262866448 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7282011886384029575, guid: 5231a4bab55a19a4b9326cb5ecc5b6c7, type: 3} @@ -8890,67 +8829,6 @@ ReflectionProbe: m_UseOcclusionCulling: 1 m_Importance: 1 m_CustomBakedTexture: {fileID: 0} ---- !u!1001 &1592875129 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1343902041442310, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_Name - value: MedKit_Bandage - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalPosition.x - value: 1.287 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalPosition.y - value: 0.50369143 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalPosition.z - value: -1.7844967 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6666183428592964458, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} - propertyPath: SortKey - value: 3219346415 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 31d875d333a7ffa4ab3bf54dee03bf61, type: 3} --- !u!1 &1607580158 GameObject: m_ObjectHideFlags: 0 @@ -9635,6 +9513,67 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1711679960} m_CullTransparentMesh: 1 +--- !u!1001 &1712376117 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1343902041442310, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_Name + value: MedKit_Morphine + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalPosition.x + value: -0.20883167 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalPosition.y + value: 0.50369143 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6666183428592964458, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} + propertyPath: SortKey + value: 36825261 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 8d7e82dc86fe3b54999297cdfc904ecb, type: 3} --- !u!1 &1741809153 GameObject: m_ObjectHideFlags: 0 @@ -9780,67 +9719,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1741809153} m_CullTransparentMesh: 1 ---- !u!1001 &1759275590 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 1343902041442310, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_Name - value: MedKit_Morphine - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalPosition.x - value: 0.016 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalPosition.y - value: 0.5036913 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalPosition.z - value: -1.796 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4837046210294490, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6666183428592964458, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} - propertyPath: SortKey - value: 2733552659 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: afd9f2a65616cdf49ae849562f7ac14a, type: 3} --- !u!1001 &1812593887 PrefabInstance: m_ObjectHideFlags: 0 @@ -11556,6 +11434,128 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cad46550824812e4f9b777d47e6cc076, type: 3} +--- !u!1001 &2100522929 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 470332895390581698, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_Name + value: ItemKit_FlashBang + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalPosition.x + value: -1.0096949 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5036913 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 474304642158680158, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6384387121119699927, guid: cc40b5b84e107324ba132505764788f0, type: 3} + propertyPath: SortKey + value: 37425792 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cc40b5b84e107324ba132505764788f0, type: 3} +--- !u!1001 &2107820290 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1343902041442310, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_Name + value: MedKit_Antipsychotic + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalPosition.x + value: 0.5882664 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalPosition.y + value: 0.5036913 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalPosition.z + value: -1.8 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4837046210294490, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6666183428592964458, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} + propertyPath: SortKey + value: 1253941125 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a815814a11f5b1a48a30ded555839ba1, type: 3} --- !u!1001 &2109885561 PrefabInstance: m_ObjectHideFlags: 0 @@ -11702,10 +11702,10 @@ SceneRoots: - {fileID: 2090893555} - {fileID: 234444228} - {fileID: 145415887} - - {fileID: 988406837} - - {fileID: 822473360} - - {fileID: 53529794} - - {fileID: 695222965} - - {fileID: 705518052} - - {fileID: 1592875129} - - {fileID: 1759275590} + - {fileID: 702667825} + - {fileID: 1230568782} + - {fileID: 133869399} + - {fileID: 795886070} + - {fileID: 2107820290} + - {fileID: 1712376117} + - {fileID: 2100522929} diff --git a/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs b/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs index 4a2cc0507b..ad2fc486de 100644 --- a/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs +++ b/Client/Assets/Scripts/Contents/Controllers/AlienSoundController.cs @@ -12,15 +12,7 @@ protected override void Init() public override void PlayMove() { - switch (CreaturePose) - { - case Define.CreaturePose.Stand: - Rpc_PlayFootStepSound(1.33f, 1f); - break; - case Define.CreaturePose.Run: - Rpc_PlayFootStepSound(2f, 1f); - break; - } + Rpc_PlayFootStepSound(1.33f, 0.7f); } public void PlaySound(Define.AlienActionType alienActionType) diff --git a/Client/Assets/Scripts/Contents/Controllers/CrewSoundController.cs b/Client/Assets/Scripts/Contents/Controllers/CrewSoundController.cs index 9cae1da833..b8af40b62c 100644 --- a/Client/Assets/Scripts/Contents/Controllers/CrewSoundController.cs +++ b/Client/Assets/Scripts/Contents/Controllers/CrewSoundController.cs @@ -15,13 +15,13 @@ public override void PlayMove() switch (CreaturePose) { case Define.CreaturePose.Stand: - Rpc_PlayFootStepSound(1.205f, 0.2f); + Rpc_PlayFootStepSound(1.205f, 0.1f); break; case Define.CreaturePose.Sit: Rpc_StopEffectSound(); break; case Define.CreaturePose.Run: - Rpc_PlayFootStepSound(2f, 1f); + Rpc_PlayFootStepSound(2f, 0.7f); break; } } @@ -99,7 +99,7 @@ public override void CheckChasing() IsChasing = true; if (!Managers.SoundMng.IsPlaying(Define.SoundType.Bgm)) - Managers.SoundMng.Play($"{Define.BGM_PATH}/Deep Space Pulsing Signals", Define.SoundType.Bgm, volume: 0.3f); + Managers.SoundMng.Play($"{Define.BGM_PATH}/Panic Man", Define.SoundType.Bgm, volume: 0.3f); } SoundManager._audioSources[(int)Define.SoundType.Bgm].volume = diff --git a/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs b/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs index 11c45f7316..760673b363 100644 --- a/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs +++ b/Client/Assets/Scripts/Contents/Interactables/ItemObject/FlashBangObject.cs @@ -31,7 +31,7 @@ public void Rpc_Explode() public void Rpc_PlaySound() { AudioSource.clip = Managers.SoundMng.GetOrAddAudioClip($"{Define.EFFECT_PATH}/Interactable/FlashBang"); - AudioSource.volume = 0.5f; + AudioSource.volume = 0.3f; AudioSource.loop = false; AudioSource.Play(); } diff --git a/Client/Assets/Scripts/Contents/Interactables/WorkStation/ItemKit.cs b/Client/Assets/Scripts/Contents/Interactables/WorkStation/ItemKit.cs index 84ef272b37..004ba93b5b 100644 --- a/Client/Assets/Scripts/Contents/Interactables/WorkStation/ItemKit.cs +++ b/Client/Assets/Scripts/Contents/Interactables/WorkStation/ItemKit.cs @@ -23,7 +23,7 @@ protected override void Init() CanRememberWork = false; IsCompleted = false; - TotalWorkAmount = 7f; + TotalWorkAmount = 5f; } public override bool IsInteractable(Creature creature) diff --git a/Client/Assets/Scripts/Contents/Items/Bandage.cs b/Client/Assets/Scripts/Contents/Items/Bandage.cs index 4e609f200f..b42e2d70ca 100644 --- a/Client/Assets/Scripts/Contents/Items/Bandage.cs +++ b/Client/Assets/Scripts/Contents/Items/Bandage.cs @@ -12,7 +12,7 @@ public override void SetInfo(int templateId, Crew owner) ItemGameObject.SetActive(false); CrewActionType = Define.CrewActionType.Bandage; - TotalWorkAmount = 10f; + TotalWorkAmount = 7f; } public override bool CheckAndUseItem() { diff --git a/Client/Assets/Scripts/Contents/Items/BaseItem.cs b/Client/Assets/Scripts/Contents/Items/BaseItem.cs index db0d9a063d..0098e89b8a 100644 --- a/Client/Assets/Scripts/Contents/Items/BaseItem.cs +++ b/Client/Assets/Scripts/Contents/Items/BaseItem.cs @@ -62,14 +62,14 @@ protected void UseItemCompleteInterrupt() Owner.IngameUI.WorkProgressBarUI.Hide(); UseItemComplete(); Owner.Inventory.RemoveItem(); - Owner.ReturnToIdle(1f); + Owner.ReturnToIdle(0.2f); } protected void UseItemKilledInterrupt() { Owner.IngameUI.InteractInfoUI.Hide(); Owner.IngameUI.WorkProgressBarUI.Hide(); - Owner.ReturnToIdle(1f); + Owner.ReturnToIdle(0.2f); } protected virtual void UseItemComplete() {} diff --git a/Client/Assets/Scripts/Contents/Items/FlashBang.cs b/Client/Assets/Scripts/Contents/Items/FlashBang.cs index bc534705d4..c9ef203110 100644 --- a/Client/Assets/Scripts/Contents/Items/FlashBang.cs +++ b/Client/Assets/Scripts/Contents/Items/FlashBang.cs @@ -14,7 +14,7 @@ public override void SetInfo(int templateId, Crew owner) ItemGameObject.SetActive(false); CrewActionType = Define.CrewActionType.FlashBang; - TotalWorkAmount = 0.5f; + TotalWorkAmount = 0.4f; } public override bool CheckAndUseItem() { @@ -45,7 +45,7 @@ protected void Explode(Vector3 attackPosition) { foreach (var hitCollider in hitColliders) if (hitCollider.gameObject.TryGetComponent(out Creature creature)) - creature.Rpc_ApplyBlind(ItemData.Value, 3f); + creature.Rpc_ApplyBlind(ItemData.Value, 2f); } } } diff --git a/Client/Assets/Scripts/Contents/Skills/BasicAttack.cs b/Client/Assets/Scripts/Contents/Skills/BasicAttack.cs index 491c726338..fc2ae86e43 100644 --- a/Client/Assets/Scripts/Contents/Skills/BasicAttack.cs +++ b/Client/Assets/Scripts/Contents/Skills/BasicAttack.cs @@ -46,6 +46,6 @@ protected override IEnumerator ProgressSkill() yield return null; } - SkillInterrupt(1.5f); + SkillInterrupt(3f); } } diff --git a/Client/Assets/Scripts/Contents/Skills/LeapAttack.cs b/Client/Assets/Scripts/Contents/Skills/LeapAttack.cs index 41e614bbcd..8db677ebe5 100644 --- a/Client/Assets/Scripts/Contents/Skills/LeapAttack.cs +++ b/Client/Assets/Scripts/Contents/Skills/LeapAttack.cs @@ -60,14 +60,14 @@ protected override IEnumerator ProgressSkill() } IsMoving = false; - SkillInterrupt(1.5f); + SkillInterrupt(3f); } public override void FixedUpdateNetwork() { if (IsMoving) { - KCC.Move(ForwardDirection * (150f * Runner.DeltaTime), 0); + KCC.Move(ForwardDirection * (170f * Runner.DeltaTime), 0); } } } diff --git a/Client/Assets/Scripts/Contents/Stats/BaseStat.cs b/Client/Assets/Scripts/Contents/Stats/BaseStat.cs index 8d99921145..d114e593da 100644 --- a/Client/Assets/Scripts/Contents/Stats/BaseStat.cs +++ b/Client/Assets/Scripts/Contents/Stats/BaseStat.cs @@ -9,7 +9,6 @@ public abstract class BaseStat : NetworkBehaviour [Networked] public NetworkString<_16> Name { get; set; } public float Speed { get; set; } public float WalkSpeed { get; set; } - public float RunSpeed { get; set; } public bool IsUnderErosion { get; set; } = false; public override void Spawned() @@ -29,6 +28,5 @@ public virtual void SetStat(CreatureData creatureData) Name = creatureData.Name; Speed = creatureData.WalkSpeed; WalkSpeed = creatureData.WalkSpeed; - RunSpeed = creatureData.RunSpeed; } } diff --git a/Client/Assets/Scripts/Contents/Stats/CrewStat.cs b/Client/Assets/Scripts/Contents/Stats/CrewStat.cs index 6d89a9f587..bce7ea358e 100644 --- a/Client/Assets/Scripts/Contents/Stats/CrewStat.cs +++ b/Client/Assets/Scripts/Contents/Stats/CrewStat.cs @@ -6,13 +6,19 @@ public class CrewStat : BaseStat { CrewData CrewData => CreatureData as CrewData; + public float SitSpeed { get; set; } + public float RunSpeed { get; set; } public int Hp { get; set; } public int MaxHp { get; set; } public float Stamina { get; set; } public float MaxStamina { get; set; } public float Sanity { get; set; } public float MaxSanity { get; set; } - public float SitSpeed { get; set; } + public float RunUseStamina { get; set; } + public float PassiveRecoverStamina { get; set; } + public float DamagedRecoverStamina { get; set; } + public float ErosionReduceSanity { get; set; } + public float SitRecoverStamina { get; set; } public bool IsRunnable { get; set; } = true; public bool Exhausted { get; set; } = false; @@ -23,13 +29,19 @@ public override void SetStat(CreatureData creatureData) { base.SetStat(creatureData); + SitSpeed = CrewData.SitSpeed; + RunSpeed = CrewData.RunSpeed; Hp = CrewData.MaxHp; MaxHp = CrewData.MaxHp; Stamina = CrewData.MaxStamina; MaxStamina = CrewData.MaxStamina; Sanity = CrewData.MaxSanity; MaxSanity = CrewData.MaxSanity; - SitSpeed = CrewData.SitSpeed; + RunUseStamina = CrewData.RunUseStamina; + PassiveRecoverStamina = CrewData.PassiveRecoverStamina; + DamagedRecoverStamina = CrewData.DamagedRecoverStamina; + ErosionReduceSanity = CrewData.ErosionReduceSanity; + SitRecoverStamina = CrewData.SitRecoverStamina; } #region Event @@ -45,9 +57,9 @@ public void ChangeHp(int value) { Managers.GameMng.RenderingSystem.ApplyDamageEffect(Hp); - ChangeStamina(Define.DAMAGED_RECOVER_STAMINA); + ChangeStamina(DamagedRecoverStamina); DamagedBoost = true; - DOVirtual.DelayedCall(3.5f, () => + DOVirtual.DelayedCall(6.5f, () => { DamagedBoost = false; }); diff --git a/Client/Assets/Scripts/Creatures/Crew.cs b/Client/Assets/Scripts/Creatures/Crew.cs index 915c4c4ed5..91b4666ad3 100644 --- a/Client/Assets/Scripts/Creatures/Crew.cs +++ b/Client/Assets/Scripts/Creatures/Crew.cs @@ -165,18 +165,18 @@ protected void UpdateStat() if (CreatureState == Define.CreatureState.Move && CreaturePose == Define.CreaturePose.Run) { if (!CrewStat.Doped) - CrewStat.ChangeStamina(-Define.RUN_USE_STAMINA * Time.deltaTime); + CrewStat.ChangeStamina(-CrewStat.RunUseStamina * Time.deltaTime); } else - CrewStat.ChangeStamina(Define.PASIVE_RECOVER_STAMINA * Time.deltaTime); + CrewStat.ChangeStamina(CrewStat.PassiveRecoverStamina * Time.deltaTime); - if (CreatureState == Define.CreatureState.Idle && CreaturePose == Define.CreaturePose.Sit) - { - CrewStat.ChangeStamina(Define.PASIVE_RECOVER_STAMINA * Time.deltaTime); - CrewStat.ChangeSanity(Define.SIT_RECOVER_SANITY * Time.deltaTime); - } - else if (CrewStat.IsUnderErosion) - CrewStat.ChangeSanity(-Define.EROSION_REDUCE_SANITY * Time.deltaTime); + if (CrewStat.IsUnderErosion) + CrewStat.ChangeSanity(-CrewStat.ErosionReduceSanity * Time.deltaTime); + else if (CreaturePose == Define.CreaturePose.Sit) + CrewStat.ChangeSanity(CrewStat.SitRecoverStamina * Time.deltaTime); + + if (CreaturePose == Define.CreaturePose.Sit) + CrewStat.ChangeStamina(CrewStat.PassiveRecoverStamina * Time.deltaTime); } protected override void UpdateIdle() diff --git a/Client/Assets/Scripts/Datas/Data.Contents.cs b/Client/Assets/Scripts/Datas/Data.Contents.cs index ccfb34ed1e..d29d7a3efe 100644 --- a/Client/Assets/Scripts/Datas/Data.Contents.cs +++ b/Client/Assets/Scripts/Datas/Data.Contents.cs @@ -11,7 +11,6 @@ public class CreatureData public int DataId; public string Name; public float WalkSpeed; - public float RunSpeed; } #endregion @@ -21,10 +20,16 @@ public class CreatureData [Serializable] public class CrewData : CreatureData { + public float SitSpeed; + public float RunSpeed; public int MaxHp; public float MaxStamina; public float MaxSanity; - public float SitSpeed; + public float RunUseStamina; + public float PassiveRecoverStamina; + public float DamagedRecoverStamina; + public float ErosionReduceSanity; + public float SitRecoverStamina; } [Serializable] diff --git a/Client/Assets/Scripts/Systems/RenderingSystem.cs b/Client/Assets/Scripts/Systems/RenderingSystem.cs index 73a904150c..c11ca05cbe 100644 --- a/Client/Assets/Scripts/Systems/RenderingSystem.cs +++ b/Client/Assets/Scripts/Systems/RenderingSystem.cs @@ -16,7 +16,6 @@ public class RenderingSystem : NetworkBehaviour public Material DamageMaterial { get; protected set; } private Color _erosionColor = new Color(255.0f / 255.0f, 76.0f / 255.0f, 76.0f / 255.0f); - private Color _erosionColor2 = new Color(76.0f / 255.0f, 76.0f / 255.0f, 255.0f / 255.0f); private Color _defaultColor = new Color(255.0f / 255.0f, 255.0f / 255.0f, 255.0f / 255.0f); private float _defaultVignetteValue = 0.2f; diff --git a/Client/Assets/Scripts/UI/WorldScene/UI_CreditController.cs b/Client/Assets/Scripts/UI/WorldScene/UI_CreditController.cs index 1045438666..c4b7412bbb 100644 --- a/Client/Assets/Scripts/UI/WorldScene/UI_CreditController.cs +++ b/Client/Assets/Scripts/UI/WorldScene/UI_CreditController.cs @@ -1,5 +1,4 @@ using System.Collections; -using System.Collections.Generic; using TMPro; using UnityEngine; using UnityEngine.UI; @@ -39,7 +38,7 @@ public IEnumerator ScrollCredits() // 스크롤 시작 전 대기 yield return new WaitForSeconds(1f); - while (textscroll.anchoredPosition.y < 3500f) + while (textscroll.anchoredPosition.y < 4000f) { textscroll.anchoredPosition += new Vector2(0, scrollSpeed * Time.deltaTime); yield return null; // 다음 프레임까지 대기 diff --git a/Client/Assets/Scripts/Utils/Define.cs b/Client/Assets/Scripts/Utils/Define.cs index 83d2d67113..389ec0d02c 100644 --- a/Client/Assets/Scripts/Utils/Define.cs +++ b/Client/Assets/Scripts/Utils/Define.cs @@ -196,12 +196,6 @@ public enum MouseEvent public const int MAX_ITEM_NUM = 4; public const int MAX_SKILL_NUM = 4; - public const float PASIVE_RECOVER_STAMINA = 3f; - public const float DAMAGED_RECOVER_STAMINA = 40f; - public const float RUN_USE_STAMINA = 5f; - public const float EROSION_REDUCE_SANITY = 1f; - public const float SIT_RECOVER_SANITY = 2f; - public const int BATTERY_CHARGE_GOAL = 6; public const int USBKEY_INSERT_GOAL = 3;