From 6e641be1c79a156becf1ee102ae3e827cab52e5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=80=E1=85=B5=E1=86=B7=E1=84=86=E1=85=B5=E1=86=AB?= =?UTF-8?q?=E1=84=80=E1=85=AE?= Date: Wed, 8 Jul 2026 05:36:12 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=B4=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EB=B0=8F=20=EB=A6=AC=EC=86=8C=EC=8A=A4=20=EA=B9=A8?= =?UTF-8?q?=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/Main Camera.prefab | 131 +++++++-------- .../Sprites/Sliced/Materials/anim_light1.mat | 7 +- unity-client/Assets/Scenes/Lobby.unity | 150 ++++++++++++++++++ unity-client/Assets/Scenes/battleStage.unity | 12 ++ unity-client/Assets/Scripts/BattleManager.cs | 19 +++ unity-client/Assets/Scripts/Enemy.cs | 18 +++ .../Assets/Scripts/NPCDialogueManager.cs | 6 + unity-client/Assets/Scripts/Player.cs | 25 ++- unity-client/Assets/Scripts/SoundManager.cs | 97 +++++++++++ .../Assets/Scripts/SoundManager.cs.meta | 2 + unity-client/Assets/Scripts/WallTransition.cs | 6 + .../Crate - Surface Shader Scene.mat | 4 +- .../Materials/Ground - Logo Scene.mat | 4 +- .../Ground - Surface Shader Scene.mat | 6 +- .../Materials/Small Crate_diffuse.mat | 2 +- .../Anton SDF - Drop Shadow.mat | 7 +- .../Fonts & Materials/Anton SDF - Outline.mat | 7 +- .../Anton SDF - Sunny Days.mat | 7 +- .../Fonts & Materials/Anton SDF.asset | 7 +- .../Bangers SDF - Drop Shadow - 2 Pass.mat | 7 +- .../Bangers SDF - Drop Shadow.mat | 7 +- .../Bangers SDF - Outline.mat | 7 +- .../Fonts & Materials/Bangers SDF Glow.mat | 7 +- .../Fonts & Materials/Bangers SDF Logo.mat | 9 +- .../Fonts & Materials/Bangers SDF.asset | 7 +- .../Electronic Highway Sign SDF.asset | 7 +- .../Roboto-Bold SDF - Drop Shadow.mat | 7 +- .../Roboto-Bold SDF - Surface.mat | 9 +- .../Fonts & Materials/Roboto-Bold SDF.asset | 7 +- 29 files changed, 472 insertions(+), 119 deletions(-) create mode 100644 unity-client/Assets/Scripts/SoundManager.cs create mode 100644 unity-client/Assets/Scripts/SoundManager.cs.meta diff --git a/unity-client/Assets/Pixel Art/PixelArtRPGVFXLite/Prefabs/Main Camera.prefab b/unity-client/Assets/Pixel Art/PixelArtRPGVFXLite/Prefabs/Main Camera.prefab index d90bf98..7fca7ef 100644 --- a/unity-client/Assets/Pixel Art/PixelArtRPGVFXLite/Prefabs/Main Camera.prefab +++ b/unity-client/Assets/Pixel Art/PixelArtRPGVFXLite/Prefabs/Main Camera.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 4780385515529899730} - component: {fileID: 4780385515529899731} - component: {fileID: 4780385515529899732} + - component: {fileID: -5153057064418233697} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -25,14 +26,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4780385515529899733} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4780385513684838919} + m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &4780385515529899731 Camera: @@ -48,9 +48,17 @@ Camera: m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -85,78 +93,47 @@ AudioListener: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4780385515529899733} m_Enabled: 1 ---- !u!1001 &1187705533696614597 -PrefabInstance: +--- !u!114 &-5153057064418233697 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4780385515529899730} - m_Modifications: - - target: {fileID: 5921323870032956093, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_Name - value: Particle System - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalPosition.y - value: -5.49 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalPosition.z - value: 3.27 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fe5dc813431ee4d48806ea25cda69967, type: 3} ---- !u!4 &4780385513684838919 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5921323870032956098, guid: fe5dc813431ee4d48806ea25cda69967, - type: 3} - m_PrefabInstance: {fileID: 1187705533696614597} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4780385515529899733} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Runtime::UnityEngine.Rendering.Universal.UniversalAdditionalCameraData + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_TaaSettings: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 + m_Version: 2 diff --git a/unity-client/Assets/Pixel2DCastleTileset/Sprites/Sliced/Materials/anim_light1.mat b/unity-client/Assets/Pixel2DCastleTileset/Sprites/Sliced/Materials/anim_light1.mat index 14c9e46..dd04143 100644 --- a/unity-client/Assets/Pixel2DCastleTileset/Sprites/Sliced/Materials/anim_light1.mat +++ b/unity-client/Assets/Pixel2DCastleTileset/Sprites/Sliced/Materials/anim_light1.mat @@ -25,6 +25,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 @@ -35,6 +36,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -56,7 +59,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 341b226fa20286643a16a3fe05a3286b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: @@ -97,7 +100,7 @@ Material: - _SmoothnessSource: 0 - _SpecSource: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _XRMotionVectorsPass: 1 diff --git a/unity-client/Assets/Scenes/Lobby.unity b/unity-client/Assets/Scenes/Lobby.unity index 6050719..1682b4e 100644 --- a/unity-client/Assets/Scenes/Lobby.unity +++ b/unity-client/Assets/Scenes/Lobby.unity @@ -59541,6 +59541,155 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} m_Name: m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI +--- !u!1 &2016794386 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2016794389} + - component: {fileID: 2016794388} + - component: {fileID: 2016794387} + m_Layer: 0 + m_Name: SoundManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2016794387 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016794386} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99e32a34df5b44d91a7f5280093cd383, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::SoundManager + buttonClickClip: {fileID: 8300000, guid: a9aa2b3b2a44a784bba46038b467f994, type: 3} + attackSwingClip: {fileID: 8300000, guid: 04b0b69230019a140ad1818f9970a743, type: 3} + punchHitClip: {fileID: 8300000, guid: 64cf1790cb30f874590e1c96c4141691, type: 3} + enemyDeathClip: {fileID: 8300000, guid: 360b32a49bc83034e90cd96afdf65777, type: 3} + playerDeathClip: {fileID: 8300000, guid: 291608b8d286e2a4580ff36324455ce2, type: 3} + transitionClip: {fileID: 8300000, guid: 64795b87003c2324fa0814fbc336066c, type: 3} + typingClip: {fileID: 8300000, guid: a4559fb7c4092fb479860fa337317ac3, type: 3} +--- !u!82 &2016794388 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016794386} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} + m_Resource: {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: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + 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!4 &2016794389 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2016794386} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12.87144, y: -10.40692, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2053466365 PrefabInstance: m_ObjectHideFlags: 0 @@ -59816,3 +59965,4 @@ SceneRoots: - {fileID: 1411466694} - {fileID: 1673720196} - {fileID: 1094628445} + - {fileID: 2016794389} diff --git a/unity-client/Assets/Scenes/battleStage.unity b/unity-client/Assets/Scenes/battleStage.unity index 7228803..f03266f 100644 --- a/unity-client/Assets/Scenes/battleStage.unity +++ b/unity-client/Assets/Scenes/battleStage.unity @@ -5684,6 +5684,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 366661995} m_CullTransparentMesh: 1 +--- !u!114 &366789606 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5614311512920842161, guid: 995fb1b7b1d40f54f9494dfbb7dedfe2, type: 3} + m_PrefabInstance: {fileID: 963424159} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.TextMeshPro::TMPro.TextMeshProUGUI --- !u!1 &403148640 GameObject: m_ObjectHideFlags: 0 @@ -8225,6 +8236,7 @@ MonoBehaviour: enemy: {fileID: 957116747} skillInputField: {fileID: 1568869830} attackButton: {fileID: 1853696804} + skillResultText: {fileID: 366789606} --- !u!4 &966922002 Transform: m_ObjectHideFlags: 0 diff --git a/unity-client/Assets/Scripts/BattleManager.cs b/unity-client/Assets/Scripts/BattleManager.cs index d852d4c..ebdc0bd 100644 --- a/unity-client/Assets/Scripts/BattleManager.cs +++ b/unity-client/Assets/Scripts/BattleManager.cs @@ -11,6 +11,7 @@ public class BattleManager : MonoBehaviour [Header("UI 연결 (선택 사항)")] public TMPro.TMP_InputField skillInputField; // Canvas에 배치한 텍스트 입력창 public UnityEngine.UI.Button attackButton; // Canvas에 배치한 공격 버튼 + public TMPro.TextMeshProUGUI skillResultText; // 스킬 연성 결과 및 설명 출력용 텍스트 UI 추가 ⭐ private string debugInputText = "불화살을 힘차게 쏜다!"; // OnGUI 디버그용 입력 기본값 private string statusText = "스킬을 입력하여 전투를 시작하세요."; @@ -34,6 +35,12 @@ public class BattleManager : MonoBehaviour { if (isAttacking) return; + // 버튼 클릭음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayButtonClick(); + } + string prompt = ""; if (skillInputField != null) { @@ -92,9 +99,21 @@ public class BattleManager : MonoBehaviour statusText = $"[연성 완료] 스킬: {response.name} | 피해: {response.damage}"; Debug.Log($"[Battle] 스킬 연성 성공: {response.name} (대미지: {response.damage}) - {response.description}"); + // AI가 연성한 최종 스킬 정보를 화면상 텍스트 UI에 실시간 갱신 출력합니다. + if (skillResultText != null) + { + skillResultText.text = $"스킬 연성 성공: {response.name} (대미지: {response.damage})\n- {response.description}"; + } + // 2. 플레이어 공격 애니메이션 및 적 타격 처리 if (player != null && player.hp > 0) { + // 플레이어 휘두르기 공격음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayAttackSwing(); + } + Animator pAnim = player.GetComponentInChildren(); if (pAnim != null) { diff --git a/unity-client/Assets/Scripts/Enemy.cs b/unity-client/Assets/Scripts/Enemy.cs index 079e879..6de1920 100644 --- a/unity-client/Assets/Scripts/Enemy.cs +++ b/unity-client/Assets/Scripts/Enemy.cs @@ -66,12 +66,24 @@ public class Enemy : MonoBehaviour { if (hp <= 0) { + // 1. 적 전사 사망 효과음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayEnemyDeath(); + } + // SPUM 리소스 기준 사망(4_Death) 트리거 작동 animator.SetTrigger("4_Death"); Debug.Log($"[Enemy] 적 {enemyName}이(가) 사망하였습니다."); } else { + // 2. 적 피격 효과음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayPunchHit(); + } + // SPUM 리소스 기준 피격(3_Damaged) 트리거 작동 animator.SetTrigger("3_Damaged"); } @@ -85,6 +97,12 @@ public class Enemy : MonoBehaviour Debug.Log($"[Enemy] 적 {enemyName}이(가) 플레이어를 공격합니다! (데미지: {attackPower})"); + // 3. 적 공격 휘두르기 효과음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayAttackSwing(); + } + if (animator != null) { // SPUM 리소스 기준 공격(2_Attack) 트리거 작동 diff --git a/unity-client/Assets/Scripts/NPCDialogueManager.cs b/unity-client/Assets/Scripts/NPCDialogueManager.cs index 823b36f..e8147ee 100644 --- a/unity-client/Assets/Scripts/NPCDialogueManager.cs +++ b/unity-client/Assets/Scripts/NPCDialogueManager.cs @@ -127,6 +127,12 @@ public class NPCDialogueManager : MonoBehaviour { dialogueText.text = lastDialogueText; } + + // 공백 문자가 아닌 경우에만 츤데레 훈수 타자기 효과음 재생 + if (letter != ' ' && SoundManager.Instance != null) + { + SoundManager.Instance.PlayTyping(); + } // 쉼표(,)나 마침표(.) 등 문장이 끊기는 지점에서는 살짝 더 더듬는 효과(딜레이 추가) 제공 if (letter == ',' || letter == '.') diff --git a/unity-client/Assets/Scripts/Player.cs b/unity-client/Assets/Scripts/Player.cs index e49ed73..e379854 100644 --- a/unity-client/Assets/Scripts/Player.cs +++ b/unity-client/Assets/Scripts/Player.cs @@ -138,7 +138,15 @@ public class Player : MonoBehaviour return; } - InputContoller.UpdateInput(ref _inputs); + // 배틀 스테이지 씬에서는 이동 입력을 무시하여 움직이지 못하게 차단합니다 (채팅 공격 전용) + if (UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "battleStage") + { + _inputs.PlayerMove = Vector2.zero; + } + else + { + InputContoller.UpdateInput(ref _inputs); + } // 좌우 방향 전환 (Flip) if (_inputs.PlayerMove.x < 0f && isFacingRight) @@ -175,7 +183,8 @@ public class Player : MonoBehaviour { if (rb == null) return; - if (hp <= 0) + // 사망 상태이거나 배틀 스테이지 씬일 경우 움직임 강제 정지 + if (hp <= 0 || UnityEngine.SceneManagement.SceneManager.GetActiveScene().name == "battleStage") { rb.linearVelocity = new Vector2(0f, rb.linearVelocity.y); return; @@ -206,12 +215,24 @@ public class Player : MonoBehaviour { if (hp <= 0) { + // 1. 플레이어 전사 사운드 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayPlayerDeath(); + } + animator.SetTrigger("4_Death"); Debug.Log($"플레이어가 {attackerName}에 의해 사망했습니다."); StartCoroutine(SendDeathReport(attackerName)); } else { + // 2. 플레이어 피격 사운드 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayPunchHit(); + } + animator.SetTrigger("3_Damaged"); } } diff --git a/unity-client/Assets/Scripts/SoundManager.cs b/unity-client/Assets/Scripts/SoundManager.cs new file mode 100644 index 0000000..7d0a850 --- /dev/null +++ b/unity-client/Assets/Scripts/SoundManager.cs @@ -0,0 +1,97 @@ +using UnityEngine; + +[RequireComponent(typeof(AudioSource))] +public class SoundManager : MonoBehaviour +{ + // 전역 어디서나 효과음을 호출할 수 있는 싱글톤 인스턴스 + public static SoundManager Instance { get; private set; } + + [Header("효과음 오디오 클립 등록 슬롯")] + public AudioClip buttonClickClip; // 버튼 클릭음 (button sound 1/2) + public AudioClip attackSwingClip; // 플레이어/적 공격 휘두르기 소리 + public AudioClip punchHitClip; // 피격 타격음 (Punch Medium Big) + public AudioClip enemyDeathClip; // 적 사망음 (monster dead) + public AudioClip playerDeathClip; // 플레이어 사망음 (Dead) + public AudioClip transitionClip; // 성벽 통과 씬 전환음 (go to castle background1) + public AudioClip typingClip; // 대화창 글자 타이핑음 (button sound 1 등) + + [Header("타자기 효과음 풀링 설정")] + [SerializeField] private int typingPoolSize = 5; // 동시 중첩 재생 가능한 최대 채널 수 + private AudioSource[] typingAudioPool; + private int nextPoolIndex = 0; + + private AudioSource globalAudioSource; + + private void Awake() + { + // 싱글톤 보장 + if (Instance != null && Instance != this) + { + Destroy(gameObject); + return; + } + + Instance = this; + DontDestroyOnLoad(gameObject); + + globalAudioSource = GetComponent(); + if (globalAudioSource == null) + { + globalAudioSource = gameObject.AddComponent(); + } + + // 시작 시 타자기 효과음용 오디오 풀 컴포넌트를 자식으로 미리 생성해 둡니다. (영구 재사용) + InitializeTypingPool(); + } + + // 오브젝트 가비지를 줄이기 위한 오디오 풀링 초기화 + private void InitializeTypingPool() + { + typingAudioPool = new AudioSource[typingPoolSize]; + for (int i = 0; i < typingPoolSize; i++) + { + GameObject child = new GameObject($"TypingAudioChannel_{i}"); + child.transform.SetParent(this.transform); // SoundManager 자식으로 묶어 구조 정돈 + + AudioSource source = child.AddComponent(); + source.playOnAwake = false; + source.loop = false; + typingAudioPool[i] = source; + } + } + + // 기본 단발성 효과음 재생 메서드 + public void PlayOneShot(AudioClip clip, float volume = 1f) + { + if (clip != null && globalAudioSource != null) + { + globalAudioSource.PlayOneShot(clip, volume); + } + } + + // 편리한 인게임 사운드 트리거 래퍼들 + public void PlayButtonClick() => PlayOneShot(buttonClickClip, 0.7f); + public void PlayAttackSwing() => PlayOneShot(attackSwingClip, 0.85f); + public void PlayPunchHit() => PlayOneShot(punchHitClip, 0.95f); + public void PlayEnemyDeath() => PlayOneShot(enemyDeathClip, 1.0f); + public void PlayPlayerDeath() => PlayOneShot(playerDeathClip, 1.0f); + public void PlayTransition() => PlayOneShot(transitionClip, 0.9f); + + // 타자기 출력 연출 효과음 (풀링 및 피치 벤딩 결합) + public void PlayTyping() + { + if (typingClip == null || typingAudioPool == null || typingAudioPool.Length == 0) return; + + // 순환 순서 인덱스의 오디오 채널을 하나 획득합니다. + AudioSource channel = typingAudioPool[nextPoolIndex]; + nextPoolIndex = (nextPoolIndex + 1) % typingPoolSize; + + if (channel != null) + { + channel.clip = typingClip; + channel.volume = 0.22f; // 음질 중첩을 고려해 볼륨 세부 튜닝 + channel.pitch = Random.Range(0.85f, 1.15f); // 미세 피치 조절로 기계음 최소화 + channel.Play(); + } + } +} diff --git a/unity-client/Assets/Scripts/SoundManager.cs.meta b/unity-client/Assets/Scripts/SoundManager.cs.meta new file mode 100644 index 0000000..70da8ca --- /dev/null +++ b/unity-client/Assets/Scripts/SoundManager.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 99e32a34df5b44d91a7f5280093cd383 \ No newline at end of file diff --git a/unity-client/Assets/Scripts/WallTransition.cs b/unity-client/Assets/Scripts/WallTransition.cs index 9bdc07c..0c91882 100644 --- a/unity-client/Assets/Scripts/WallTransition.cs +++ b/unity-client/Assets/Scripts/WallTransition.cs @@ -36,6 +36,12 @@ public class WallTransition : MonoBehaviour Debug.LogWarning("[Transition] 씬에 GameManager 싱글톤 오브젝트가 존재하지 않아 플레이어 정보 임시 세이브를 스킵합니다."); } + // 성벽 통과/씬 전환 효과음 재생 + if (SoundManager.Instance != null) + { + SoundManager.Instance.PlayTransition(); + } + // 2. 유니티 씬 매니저를 통해 목표 씬(battleStage)을 즉시 로드합니다. Debug.Log($"[Transition] {targetSceneName} 씬으로 화면을 전환합니다."); SceneManager.LoadScene(targetSceneName); diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat index d31a1a5..5f5bae3 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Crate - Surface Shader Scene.mat @@ -53,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 602cb87b6a29443b8636370ea0751574, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -123,7 +123,7 @@ Material: - _ZWrite: 1 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.712} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.712} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Logo Scene.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Logo Scene.mat index 57b6dc9..066a20a 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Logo Scene.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Logo Scene.mat @@ -63,8 +63,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 1cdc5b506b1a4a33a53c30669ced1f51, type: 3} + m_Scale: {x: 20, y: 20} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Surface Shader Scene.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Surface Shader Scene.mat index e1af968..fe5a674 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Surface Shader Scene.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Ground - Surface Shader Scene.mat @@ -80,8 +80,8 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} + m_Texture: {fileID: 2800000, guid: 85ac55597b97403c82fc6601a93cf241, type: 3} + m_Scale: {x: 5, y: 5} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: m_Texture: {fileID: 0} @@ -165,7 +165,7 @@ Material: m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.8784314} - _BorderColor: {r: 0, g: 0, b: 0, a: 1} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.8784314} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColorUI: {r: 1, g: 1, b: 1, a: 1} - _FaceColor: {r: 1, g: 1, b: 1, a: 1} diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Small Crate_diffuse.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Small Crate_diffuse.mat index 83e1cbd..584d7f0 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Small Crate_diffuse.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Materials/Small Crate_diffuse.mat @@ -52,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 602cb87b6a29443b8636370ea0751574, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Drop Shadow.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Drop Shadow.mat index 02db42c..fd70cb5 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Drop Shadow.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Drop Shadow.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -25,6 +26,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -50,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28933816116536082, guid: 8a89fa14b10d46a99122fd4f73fca9a2, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -129,7 +132,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Outline.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Outline.mat index 820b961..7e418ca 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Outline.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Outline.mat @@ -25,6 +25,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -37,6 +38,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -62,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28933816116536082, guid: 8a89fa14b10d46a99122fd4f73fca9a2, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -141,7 +144,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Sunny Days.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Sunny Days.mat index 314eb86..79c2331 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Sunny Days.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF - Sunny Days.mat @@ -25,6 +25,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -38,6 +39,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -63,7 +66,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: -0.15} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28933816116536082, guid: 8a89fa14b10d46a99122fd4f73fca9a2, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -142,7 +145,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset index aa82751..c9138e7 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Anton SDF.asset @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -23,6 +24,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -48,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28933816116536082} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -127,7 +130,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow - 2 Pass.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow - 2 Pass.mat index 0f6e7d0..99ce9b2 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow - 2 Pass.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow - 2 Pass.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -25,6 +26,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -50,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -134,7 +137,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat index cb3efec..9abbc1c 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Drop Shadow.mat @@ -25,6 +25,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -38,6 +39,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -63,7 +66,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -147,7 +150,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat index 1eef566..d6d6ac0 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF - Outline.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -24,6 +25,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -49,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -133,7 +136,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat index 57048ba..4c8248f 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Glow.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -25,6 +26,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -50,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MaskTex: @@ -136,7 +139,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat index a1b1c56..be67b46 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF Logo.mat @@ -12,18 +12,21 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - GLOW_ON m_LightmapFlags: 1 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -49,7 +52,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946, guid: 125cb55b44b24c4393181402bc6200e6, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -130,7 +133,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Surface: 1 - _TextureHeight: 1024 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset index 584f1dc..4cd1ee5 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Bangers SDF.asset @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -23,6 +24,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -48,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28584486757587946} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -127,7 +130,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset index 5aabaff..ff5f56f 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Electronic Highway Sign SDF.asset @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -23,6 +24,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -48,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28981121099961358} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -127,7 +130,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Drop Shadow.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Drop Shadow.mat index 2991fed..0c802b0 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Drop Shadow.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Drop Shadow.mat @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: @@ -25,6 +26,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -50,7 +53,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28204114720316640, guid: 5302535af1044152a457ed104f1f4b91, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -129,7 +132,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Surface.mat b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Surface.mat index 79108a0..e67db57 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Surface.mat +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF - Surface.mat @@ -25,18 +25,21 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - UNDERLAY_ON m_LightmapFlags: 1 m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 + m_DoubleSidedGI: 1 m_CustomRenderQueue: 3000 stringTagMap: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -62,7 +65,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28204114720316640, guid: 5302535af1044152a457ed104f1f4b91, type: 2} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -143,7 +146,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8 diff --git a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset index 7aa8bf9..a466516 100644 --- a/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset +++ b/unity-client/Assets/TextMesh Pro/Examples & Extras/Resources/Fonts & Materials/Roboto-Bold SDF.asset @@ -12,6 +12,7 @@ Material: m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON - _EMISSION - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] @@ -23,6 +24,8 @@ Material: RenderType: Transparent disabledShaderPasses: - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -48,7 +51,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 28204114720316640} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OutlineTex: @@ -127,7 +130,7 @@ Material: - _SpecSource: 0 - _SpecularHighlights: 1 - _SpecularPower: 2 - - _SrcBlend: 5 + - _SrcBlend: 1 - _SrcBlendAlpha: 1 - _Stencil: 0 - _StencilComp: 8