Skip to content

Commit

Permalink
Hotfix/balance (#197)
Browse files Browse the repository at this point in the history
* hotfix: 벨런스 패치

* bugfix: ItemSpawner 버그 수정

* feat: 벨런스 패치 & 사운드 조절 및 변경

* hotfix: 팀명 적용 & 누락된 데이터 적용
  • Loading branch information
scarleter99 committed Jul 15, 2024
1 parent 26c0eb1 commit 61342b5
Show file tree
Hide file tree
Showing 38 changed files with 138 additions and 160 deletions.
2 changes: 1 addition & 1 deletion Client/Assets/Resources/Datas/ExcelData/AlienData.csv
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
DataId,Name,WalkSpeed
102000,Stalker,110
102000,Stalker,115
,,
4 changes: 2 additions & 2 deletions Client/Assets/Resources/Datas/ExcelData/CrewData.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
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
DataId,Name,WalkSpeed,SitSpeed,RunSpeed,MaxHp,MaxStamina,MaxSanity,RunUseStamina,PassiveRecoverStamina,DamagedRecoverStamina,ErosionReduceSanity,SitRecoverSanity
101000,CrewA,80,30,115,3,100,100,5,5,50,4,4
,,,,,,,,,,,,
,,,,,,,,,,,
,,,,,,,,,,,,
8 changes: 4 additions & 4 deletions Client/Assets/Resources/Datas/ExcelData/SkillData.csv
Original file line number Diff line number Diff line change
@@ -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
301000,Basic Attack,2,2,1,0,1.2,-1
301001,Roar,15,13,0,30,2.5,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
301003,Leap Attack,10,2,2,0,1.8,0.1
,,,,,,,
,,,,,,,
,,,,,
2 changes: 1 addition & 1 deletion Client/Assets/Resources/Datas/JsonData/AlienData.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{
"DataId": 102000,
"Name": "Stalker",
"WalkSpeed": 110.0
"WalkSpeed": 115.0
}
]
}
6 changes: 3 additions & 3 deletions Client/Assets/Resources/Datas/JsonData/CrewData.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
"crews": [
{
"SitSpeed": 30.0,
"RunSpeed": 110.0,
"RunSpeed": 115.0,
"MaxHp": 3,
"MaxStamina": 100.0,
"MaxSanity": 100.0,
"RunUseStamina": 5.0,
"PassiveRecoverStamina": 5.0,
"DamagedRecoverStamina": 50.0,
"ErosionReduceSanity": 3.0,
"SitRecoverStamina": 5.0,
"ErosionReduceSanity": 4.0,
"SitRecoverSanity": 4.0,
"DataId": 101000,
"Name": "CrewA",
"WalkSpeed": 80.0
Expand Down
8 changes: 4 additions & 4 deletions Client/Assets/Resources/Datas/JsonData/SkillData.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"DataId": 301000,
"Name": "Basic Attack",
"CoolTime": 2.0,
"Range": 1.5,
"Range": 2.0,
"Damage": 1,
"SanityDamage": 0.0,
"TotalSkillAmount": 1.2,
Expand All @@ -14,9 +14,9 @@
"DataId": 301001,
"Name": "Roar",
"CoolTime": 15.0,
"Range": 10.0,
"Range": 13.0,
"Damage": 0,
"SanityDamage": 25.0,
"SanityDamage": 30.0,
"TotalSkillAmount": 2.5,
"TotalReadySkillAmount": 0.7
},
Expand All @@ -34,7 +34,7 @@
"DataId": 301003,
"Name": "Leap Attack",
"CoolTime": 10.0,
"Range": 1.5,
"Range": 2.0,
"Damage": 2,
"SanityDamage": 0.0,
"TotalSkillAmount": 1.8,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4979594052862338693, guid: 435e773138003d44889a52db8bfb50e4, type: 3}
propertyPath: SortKey
value: 422045260
value: 1904897812
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
Expand Down
2 changes: 1 addition & 1 deletion Client/Assets/Resources/Prefabs/Systems/@GameSystem.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ MonoBehaviour:
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
Expand Down
20 changes: 20 additions & 0 deletions Client/Assets/Resources/Prefabs/UI/Scene/UI_CrewIngame.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1963603420777180691, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_text
value: Insert Batteries in Battery Charger
objectReference: {fileID: 0}
- target: {fileID: 3011784763188807690, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down Expand Up @@ -653,6 +657,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5271272905746936489, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_text
value: Use Emergency Control Device to Open Panic Room
objectReference: {fileID: 0}
- target: {fileID: 5777593510621210554, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_text
value: Use Card Key on Central Control Computer
objectReference: {fileID: 0}
- target: {fileID: 6098284639046046349, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_Name
value: UI_CrewPlan
Expand All @@ -673,6 +685,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7332335580208286048, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_text
value: Insert USB Keys in Elevator Control Computer (0/5)
objectReference: {fileID: 0}
- target: {fileID: 7623851190638782733, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand All @@ -689,6 +705,10 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8805195526000276101, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_text
value: Insert Batteries in Battery Charger (0/10)
objectReference: {fileID: 0}
- target: {fileID: 8874926850589015463, guid: 7fb321c109484244da959fcbb55237a5, type: 3}
propertyPath: m_AnchorMax.y
value: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7419,9 +7419,9 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_text: "TEAM KGD\r\n\r\nGame Director\r\n\n\r\nLead Network Programmer\r\n\n\r\nLead
Client Programmer\r\n\n\r\nClient Programmer\r\n\n\n\n\n\r\nLead Game Designer\r\n\n\r\nMap
Designer\r\n\n\r\nLogo Artist\r\n\n\r\n\r\nSound & Music\r\n\r\nDeep Space Pulsing
Signals \r\n\n\r\nPanic Man\r\n\n\r\nIn Captivity\r\n\n\r\nBlack Magic\r"
Client Programmer\r\n\n\r\nClient Programmer\r\n\n\n\n\nLead Game Designer\r\n\n\r\nMap
Designer\r\n\n\r\nLogo Artist\r\n\n\r\n\r\nSound Track\n\nIn Captivity\r\n\n\r\nInfernal
Darkness\n\n\r\nPanic Man\r\n\n\nSpace Wind 01\n\n\n\r\nBlack Magic\r"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 59ee34472c5892a4196858080cc2141e, type: 2}
m_sharedMaterial: {fileID: -7472687217148228796, guid: 59ee34472c5892a4196858080cc2141e, type: 2}
Expand Down Expand Up @@ -20778,57 +20778,63 @@ MonoBehaviour:



JANG JAEMAN
Jang Jaeman



JANG JAEMAN
Jang Jaeman



KIM TAEBUM
Kim Taebum



CHO SEOJIN
Jo SeoJin

HAM
SUYEON
Ham
Suyeon

JANG MINSEOK
Jang Minseok



Song Jun

SONG JUN


Jo Seojin

CHO SEOJIN


Ham Suyeon

HAM SUYEON





Experia

RAFAELKRUX


ViraMiller

DAVID
FESLIYAN


David
Fesliyan

EXPERIA


Prosser

Heeing''s Music diary
https://freesound.org/people/Prosser/sounds/233995/



Heeing''s
Music diary

https://www.youtube.com/watch?v=SnPcG-8_66w'
m_isRightToLeft: 0
Expand Down
6 changes: 3 additions & 3 deletions Client/Assets/Resources/Rendering/GameVolumeProfile.asset
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,7 @@ MonoBehaviour:
m_Value: 1
fixedExposure:
m_OverrideState: 1
m_Value: -3.2
m_Value: -3
compensation:
m_OverrideState: 1
m_Value: 0
Expand Down Expand Up @@ -878,7 +878,7 @@ MonoBehaviour:
m_Value: 200
meanFreePath:
m_OverrideState: 1
m_Value: 7
m_Value: 8
enableVolumetricFog:
m_OverrideState: 1
m_Value: 1
Expand Down Expand Up @@ -1130,7 +1130,7 @@ MonoBehaviour:
m_Value: {x: 0.5, y: 0.5}
intensity:
m_OverrideState: 1
m_Value: 0.2
m_Value: 0.15
smoothness:
m_OverrideState: 1
m_Value: 1
Expand Down
Binary file not shown.
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ protected override void Init()

public override void PlayMove()
{
Rpc_PlayFootStepSound(1.33f, 0.7f);
Rpc_PlayFootStepSound(1.33f, 0.85f);
}

public void PlaySound(Define.AlienActionType alienActionType)
Expand Down Expand Up @@ -106,8 +106,8 @@ public override void CheckChasing()
Ray ray = CreatureCamera.Camera.ViewportPointToRay(
new Vector3(i, j, CreatureCamera.Camera.nearClipPlane));

if (i < 0.25f || j < 0.25f || i > 0.75f || j > 0.75f)
Debug.DrawRay(ray.origin, ray.direction * ChasingDistance, Color.green);
// if (i < 0.25f || j < 0.25f || i > 0.75f || j > 0.75f)
// Debug.DrawRay(ray.origin, ray.direction * ChasingDistance, Color.green);

if (Physics.Raycast(ray, out RaycastHit rayHit, maxDistance: ChasingDistance,
layerMask: LayerMask.GetMask("Crew", "MapObject", "InteractableObject")))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public override void CheckChasing()
IsChasing = true;

if (!Managers.SoundMng.IsPlaying(Define.SoundType.Bgm))
Managers.SoundMng.Play($"{Define.BGM_PATH}/Panic Man", Define.SoundType.Bgm, volume: 0.3f);
Managers.SoundMng.Play($"{Define.BGM_PATH}/Infernal Darkness", Define.SoundType.Bgm, volume: 0.3f);
}

SoundManager._audioSources[(int)Define.SoundType.Bgm].volume =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,13 @@ public override bool IsInteractable(Creature creature)
// 로컬 필드인 Worker를 사용해서 이를 해결함. InterruptWork()에서 0.5초간의 딜레이 후 Worker를 null로 초기화함. 또한, Worker != null이라면 상호작용이 불가능하도록 하여 버그를 방지함.
if (WorkerCount > 0 && Worker == null)
{
creature.IngameUI.ErrorTextUI.Show("Another player is interacting");
creature.IngameUI.ErrorTextUI.Show("Another Crew is in Use");
return false;
}

if (crew.Inventory.CurrentItem is not Battery)
{
creature.IngameUI.ErrorTextUI.Show("You should have battery on your hand");
creature.IngameUI.ErrorTextUI.Show("Hold Battery on Your Hand");
return false;
}

Expand Down Expand Up @@ -77,7 +77,7 @@ protected override void Rpc_PlaySound()
[Rpc(RpcSources.StateAuthority, RpcTargets.All)]
protected void Rpc_PlayCompleteSound()
{
Managers.SoundMng.Play($"{Define.EFFECT_PATH}/Interactable/Plan_BatteryCharge", volume:0.5f ,isOneShot:true);
Managers.SoundMng.Play($"{Define.EFFECT_PATH}/Interactable/Plan_BatteryCharge", volume:0.4f ,isOneShot:true);
}
}

Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ protected override void Init()
CanRememberWork = true;
IsCompleted = false;

TotalWorkAmount = 15f;
TotalWorkAmount = 10f;
}

public override bool IsInteractable(Creature creature)
Expand All @@ -26,8 +26,15 @@ public override bool IsInteractable(Creature creature)
return false;
}

if (!Managers.GameMng.PlanSystem.IsCentralComputerWorkFinished || IsCompleted)
if (!Managers.GameMng.PlanSystem.IsCentralComputerWorkFinished)
{
creature.IngameUI.ErrorTextUI.Show("Use Central Computer First");
return false;
}

if (Managers.GameMng.PlanSystem.IsCargoPassageOpen || IsCompleted)
{
creature.IngameUI.ErrorTextUI.Show("Cargo Gates are Already Open");
return false;
}

Expand Down Expand Up @@ -58,6 +65,6 @@ protected override void Rpc_PlaySound()
[Rpc(RpcSources.StateAuthority, RpcTargets.All)]
protected void Rpc_PlayCompleteSound()
{
Managers.SoundMng.Play($"{Define.EFFECT_PATH}/Interactable/Plan_B", isOneShot:true);
Managers.SoundMng.Play($"{Define.EFFECT_PATH}/Interactable/Plan_B", volume: 0.9f, isOneShot:true);
}
}
Loading

0 comments on commit 61342b5

Please sign in to comment.