diff --git a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv index 58986df5d6..265c5569a5 100644 --- a/Client/Assets/Resources/Datas/ExcelData/ItemData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/ItemData.csv @@ -4,5 +4,5 @@ DataId,Name,Value 201002,CardKey,-1 202000,Bandage,1 202001,Morphine,10 -202002,Antipsychotic,5 +202002,Antipsychotic,40 203000,FlashBang,2 diff --git a/Client/Assets/Resources/Datas/ExcelData/SkillData.csv b/Client/Assets/Resources/Datas/ExcelData/SkillData.csv index ee0bd33fbc..292e6bbf47 100644 --- a/Client/Assets/Resources/Datas/ExcelData/SkillData.csv +++ b/Client/Assets/Resources/Datas/ExcelData/SkillData.csv @@ -2,6 +2,6 @@ DataId,Name,CoolTime,Range,Damage,SanityDamage,TotalSkillAmount,TotalReadySkillA 301000,Basic Attack,2,1.5,1,20,1.2,-1 301001,Roar,15,10,0,30,2.5,0.7 301002,Cursed Howl,60,-1,-1,-1,3.5,0.7 -301003,Leap Attack,20,1.5,1,20,1.8,0.7 +301003,Leap Attack,20,1.5,2,20,1.8,0.7 ,,,,,,, ,,,,, diff --git a/Client/Assets/Resources/Datas/JsonData/ItemData.json b/Client/Assets/Resources/Datas/JsonData/ItemData.json index 1adee0279a..c62d2db689 100644 --- a/Client/Assets/Resources/Datas/JsonData/ItemData.json +++ b/Client/Assets/Resources/Datas/JsonData/ItemData.json @@ -28,7 +28,7 @@ { "DataId": 202002, "Name": "Antipsychotic", - "Value": 5.0 + "Value": 40.0 }, { "DataId": 203000, diff --git a/Client/Assets/Resources/Datas/JsonData/SkillData.json b/Client/Assets/Resources/Datas/JsonData/SkillData.json index 03a6ee1aa2..cb090acbff 100644 --- a/Client/Assets/Resources/Datas/JsonData/SkillData.json +++ b/Client/Assets/Resources/Datas/JsonData/SkillData.json @@ -35,7 +35,7 @@ "Name": "Leap Attack", "CoolTime": 20.0, "Range": 1.5, - "Damage": 1, + "Damage": 2, "SanityDamage": 20.0, "TotalSkillAmount": 1.8, "TotalReadySkillAmount": 0.7 diff --git a/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienDefeat.prefab b/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienDefeat.prefab index 402e738d53..ea9ad3da75 100644 --- a/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienDefeat.prefab +++ b/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienDefeat.prefab @@ -2399,7 +2399,7 @@ GameObject: m_Component: - component: {fileID: 8091886788036622568} m_Layer: 5 - m_Name: head + m_Name: Anglerox_ Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienWin.prefab b/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienWin.prefab index 75f84bad47..d530283f3d 100644 --- a/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienWin.prefab +++ b/Client/Assets/Resources/Prefabs/UI/Popup/UI_AlienWin.prefab @@ -2182,7 +2182,7 @@ GameObject: m_Component: - component: {fileID: 8091886788036622568} m_Layer: 5 - m_Name: head + m_Name: Anglerox_ Head m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Client/Assets/Resources/Rendering/GameVolumeProfile.asset b/Client/Assets/Resources/Rendering/GameVolumeProfile.asset index 36f54db529..480df85d3c 100644 --- a/Client/Assets/Resources/Rendering/GameVolumeProfile.asset +++ b/Client/Assets/Resources/Rendering/GameVolumeProfile.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f034cba68ab55e046ae1445a42f18c0e, type: 3} m_Name: IndirectLightingController m_EditorClassIdentifier: - active: 0 + active: 1 indirectDiffuseLightingMultiplier: m_OverrideState: 1 m_Value: 0 @@ -26,7 +26,7 @@ MonoBehaviour: m_OverrideState: 0 m_Value: 255 reflectionProbeIntensityMultiplier: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 3 --- !u!114 &-7630159202167355138 MonoBehaviour: @@ -450,10 +450,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 384c4d03a551c44448145f4093304119, type: 3} m_Name: ScreenSpaceReflection m_EditorClassIdentifier: - active: 0 + active: 1 quality: m_OverrideState: 1 - m_Value: 3 + m_Value: 1 enabled: m_OverrideState: 1 m_Value: 1 @@ -465,10 +465,10 @@ MonoBehaviour: m_Value: 1 m_MinSmoothness: m_OverrideState: 1 - m_Value: 0.397 + m_Value: 0.5 m_SmoothnessFadeStart: m_OverrideState: 1 - m_Value: 0.919 + m_Value: 1 reflectSky: m_OverrideState: 1 m_Value: 0 @@ -477,10 +477,10 @@ MonoBehaviour: m_Value: 0 depthBufferThickness: m_OverrideState: 1 - m_Value: 0.078 + m_Value: 0.1 screenFadeDistance: m_OverrideState: 1 - m_Value: 0.609 + m_Value: 0.5 accumulationFactor: m_OverrideState: 0 m_Value: 0.75 @@ -507,7 +507,7 @@ MonoBehaviour: m_Value: 0 m_RayMaxIterations: m_OverrideState: 1 - m_Value: 30 + m_Value: 32 rayMiss: m_OverrideState: 0 m_Value: 3 @@ -567,7 +567,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24f077503be6ae942a1e1245dbd53ea9, type: 3} m_Name: Bloom m_EditorClassIdentifier: - active: 0 + active: 1 quality: m_OverrideState: 1 m_Value: 1 @@ -979,10 +979,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9008a067f4d626c4d8bc4bc48f04bb89, type: 3} m_Name: AmbientOcclusion m_EditorClassIdentifier: - active: 0 + active: 1 quality: m_OverrideState: 1 - m_Value: 1 + m_Value: 2 rayTracing: m_OverrideState: 0 m_Value: 0 @@ -990,19 +990,19 @@ MonoBehaviour: m_OverrideState: 1 m_Value: 0.7 directLightingStrength: - m_OverrideState: 0 - m_Value: 0 + m_OverrideState: 1 + m_Value: 1 radius: m_OverrideState: 1 - m_Value: 0.84 + m_Value: 2 spatialBilateralAggressiveness: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.15 temporalAccumulation: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 1 ghostingReduction: - m_OverrideState: 0 + m_OverrideState: 1 m_Value: 0.5 blurSharpness: m_OverrideState: 0 @@ -1023,31 +1023,31 @@ MonoBehaviour: m_Value: 1 m_StepCount: m_OverrideState: 1 - m_Value: 6 + m_Value: 14 m_FullResolution: m_OverrideState: 1 - m_Value: 0 + m_Value: 1 m_MaximumRadiusInPixels: m_OverrideState: 1 - m_Value: 40 + m_Value: 70 m_BilateralUpsample: m_OverrideState: 1 m_Value: 1 m_DirectionCount: m_OverrideState: 1 - m_Value: 2 + m_Value: 4 m_RayLength: m_OverrideState: 1 - m_Value: 3 + m_Value: 20 m_SampleCount: m_OverrideState: 1 - m_Value: 2 + m_Value: 8 m_Denoise: m_OverrideState: 1 m_Value: 1 m_DenoiserRadius: m_OverrideState: 1 - m_Value: 0.5 + m_Value: 0.65 --- !u!114 &4067994899981118961 MonoBehaviour: m_ObjectHideFlags: 3 diff --git a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity index 79268ad245..c86f9d5fba 100644 --- a/Client/Assets/Scenes/TestScene/TestScene_SJ.unity +++ b/Client/Assets/Scenes/TestScene/TestScene_SJ.unity @@ -5476,8 +5476,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: PlayerName: Player - DefaultRoomName: TestMapScene2321 - Creature: 1 + DefaultRoomName: Test + Creature: 2 PrefabNum: 0 ReadySceneSpawnPosition: {x: 0, y: 0, z: 0} ReadySceneSpawnSector: 1 diff --git a/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs index 86272ff0f0..e4a7b0099e 100644 --- a/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs +++ b/Client/Assets/Scripts/Contents/Items/Antipsychotic.cs @@ -3,6 +3,7 @@ public class Antipsychotic : BaseItem { + public float Duration { get; protected set; } = 5; public override void SetInfo(int templateId, Crew owner) { base.SetInfo(templateId, owner); @@ -22,9 +23,9 @@ protected override void UseItem() { Owner.CrewSoundController.PlaySound(Define.CrewActionType.Antipsychotic); - DOVirtual.Float(0, 0, 10, value => + DOVirtual.Float(0, 0, Duration, value => { - Owner.CrewStat.ChangeSanity(ItemData.Value * Time.deltaTime); + Owner.CrewStat.ChangeSanity(ItemData.Value / Duration * Time.deltaTime); }); Owner.Inventory.RemoveItem();