"옵션 메뉴에 다음 수정 사항을 반영해주시기 바랍니다.

1. 추천 게임에 ""젖어버린 그녀"" 추가
2. 옵션 메뉴에 Voice On/Off 기능 추가
(※신음소리 보이스로 인해 공공장소에서 진행하기 힘든 문제를 해소하기 위한 목적)
"

Assets/ResWork/UI_Animation/Gacha_LuckyPoint.anim

@@ -120,6 +120,36 @@ AnimationClip:
     classID: 114
     script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: GameObject
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
   m_PPtrCurves: []
   m_SampleRate: 60
   m_WrapMode: 0
@@ -155,6 +185,15 @@ AnimationClip:
       isPPtrCurve: 0
       isIntCurve: 0
       isSerializeReferenceCurve: 0
+    - serializedVersion: 2
+      path: 1482111001
+      attribute: 2086281974
+      script: {fileID: 0}
+      typeID: 1
+      customType: 0
+      isPPtrCurve: 0
+      isIntCurve: 0
+      isSerializeReferenceCurve: 0
     pptrCurveMapping: []
   m_AnimationClipSettings:
     serializedVersion: 2
@@ -345,6 +384,36 @@ AnimationClip:
     classID: 114
     script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
     flags: 0
+  - serializedVersion: 2
+    curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: Infinity
+        outSlope: Infinity
+        tangentMode: 103
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_IsActive
+    path: GameObject
+    classID: 1
+    script: {fileID: 0}
+    flags: 0
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0

Assets/ResWork/UI_Image/OtherGame/rgame3.png.meta

@@ -0,0 +1,156 @@
+fileFormatVersion: 2
+guid: 07d6b8866bc6f37478a5676001bbed52
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: 982360510996237158
+    second: AppIcon_0
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 4
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 4
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: AppIcon_0
+      rect:
+        serializedVersion: 2
+        x: 0
+        y: 0
+        width: 512
+        height: 512
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      customData: 
+      outline: []
+      physicsShape: []
+      tessellationDetail: -1
+      bones: []
+      spriteID: 66b4d431eab02ad00800000000000000
+      internalID: 982360510996237158
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    customData: 
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    spriteCustomMetadata:
+      entries: []
+    nameFileIdTable:
+      AppIcon_0: 982360510996237158
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/ResWork/VFX/VFX_Klaus/Materials/Mat_fx_HCFX_Circle_01_add.mat

@@ -138,6 +138,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 1
+    - _DstBlendAlpha: 1
     - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
     - _EnvironmentReflections: 1
@@ -155,6 +156,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
     - _StencilRef: 0
     - _StencilRefDepth: 0
     - _StencilRefDistortionVec: 4

Assets/ResWork/VFX/VFX_Klaus/Materials/Mat_fx_HCFX_Paper_01.mat

@@ -138,6 +138,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 10
+    - _DstBlendAlpha: 10
     - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
     - _EnvironmentReflections: 1
@@ -155,6 +156,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
     - _StencilRef: 0
     - _StencilRefDepth: 0
     - _StencilRefDistortionVec: 4

Assets/ResWork/VFX/VFX_Klaus/Materials/Mat_fx_HCFX_Twinkle_01.mat

@@ -138,6 +138,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 10
+    - _DstBlendAlpha: 10
     - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
     - _EnvironmentReflections: 1
@@ -155,6 +156,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
     - _StencilRef: 0
     - _StencilRefDepth: 0
     - _StencilRefDistortionVec: 4

Assets/ResWork/VFX/VFX_Klaus/Textures/Tex_fx_HCFX_Glow_Long_01_add.mat

@@ -138,6 +138,7 @@ Material:
     - _DoubleSidedGIMode: 0
     - _DoubleSidedNormalMode: 2
     - _DstBlend: 1
+    - _DstBlendAlpha: 1
     - _EnableBlendModePreserveSpecularLighting: 0
     - _EnableFogOnTransparent: 1
     - _EnvironmentReflections: 1
@@ -155,6 +156,7 @@ Material:
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SrcBlend: 5
+    - _SrcBlendAlpha: 1
     - _StencilRef: 0
     - _StencilRefDepth: 0
     - _StencilRefDistortionVec: 4

Assets/Resources/Prefabs/HorseRush/Script/HorseRushPanel.cs

@@ -555,6 +555,7 @@ public class HorseRushPanel : AddrHandleBase
         if (soundLimit < _touchSoundCount++)
         {
             SoundInfo.Ins.Play_OneShot(targetList[UnityEngine.Random.Range(0, targetList.Count)]);
+
             Sequence loveSequence = DOTween.Sequence();
             loveSequence.Append(_loveEffectImage.DOFade(0.3f, 0.15f))
                        .Append(_loveEffectImage.DOFade(0.1f, 0.1f))

Assets/Scripts/AttachToGameObject/SaveMgr.cs

@@ -55,6 +55,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
         {
             case eOption.Sound: m_SaveData.bSound = !m_SaveData.bSound; break;
             case eOption.Bgm: m_SaveData.bBgm = !m_SaveData.bBgm; break;
+            case eOption.Voice: m_SaveData.bVoice = !m_SaveData.bVoice; break;
         }
         Save();
     }
@@ -64,6 +65,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
         {
             case eOption.Sound: return m_SaveData.bSound;
             case eOption.Bgm: return m_SaveData.bBgm;
+            case eOption.Voice: return m_SaveData.bVoice;
         }
         return false;
     }
@@ -460,7 +462,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
 
     public class SaveData
     {
-        public bool bSound, bBgm;
+        public bool bSound, bBgm, bVoice;
 
         ProtectedInt32 _LastDoY; public int LastDoY { get { return _LastDoY; } set { _LastDoY = value; _LastDoY.Obfuscate(); } }
         ProtectedInt32 _WeekOfYear; public int WeekOfYear { get { return _WeekOfYear; } set { _WeekOfYear = value; _WeekOfYear.Obfuscate(); } }
@@ -500,6 +502,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate<SaveMgr>
         {
             bSound = true;
             bBgm = true;
+            bVoice = true;
 
             LastDoY = 0;
             WeekOfYear = 0;

Assets/Scripts/AttachToGameObject/SoundInfo.cs

@@ -58,8 +58,26 @@ public class SoundInfo : MonoBehaviourSingletonTemplate<SoundInfo>
 
     public void Play_OneShot(eSound _sound, float vol = 1f)
     {
-        if (SaveMgr.Ins.Get_Option(eOption.Sound))
+        switch (_sound)
-            Play_OneShot(dic_clip[_sound], vol);
+        {
+            case eSound.s020_Noraml_Hit:
+            case eSound.s021_Noraml_Hit:
+            case eSound.s022_Noraml_Hit:
+            case eSound.s023_Noraml_Hit:
+            case eSound.s024_Noraml_Hit:
+            case eSound.s025_Noraml_Hit:
+            case eSound.s026_Impact_Hit:
+            case eSound.s027_Impact_Hit:
+            case eSound.s028_Impact_Hit:
+            case eSound.s029_Impact_Hit:
+                if (SaveMgr.Ins.Get_Option(eOption.Voice))
+                    Play_OneShot(dic_clip[_sound], vol);
+                break;
+            default:
+                if (SaveMgr.Ins.Get_Option(eOption.Sound))
+                    Play_OneShot(dic_clip[_sound], vol);
+                break;
+        }
     }
     AudioSource Play_OneShot(AudioClip _clip, float vol = 1f, bool _loop = false)
     {

Assets/Scripts/UI/OptionUI.cs

@@ -1,17 +1,18 @@
 using UnityEngine;
 
-public enum eOption { Sound, Bgm }
+public enum eOption { Sound, Bgm, Voice }
 public enum  eMoney { AlbumOpen, Chat, Gacha, Lucky, MiniGameHP, ItemBomb, ItemUmbrella, ItemDildo }
 
 public class OptionUI : MonoBehaviour
 {
-    [SerializeField] GameObject[] onoff_sound, onoff_bgm;
+    [SerializeField] GameObject[] onoff_sound, onoff_bgm, onoff_voice;
 
     public void Set()
     {
         gameObject.SetActive(true);
         DSUtil.InActivateGameObjects(onoff_sound, SaveMgr.Ins.Get_Option(eOption.Sound) ? 0 : 1);
         DSUtil.InActivateGameObjects(onoff_bgm, SaveMgr.Ins.Get_Option(eOption.Bgm) ? 0 : 1);
+        DSUtil.InActivateGameObjects(onoff_voice, SaveMgr.Ins.Get_Option(eOption.Voice) ? 0 : 1);
     }
 
     public void OnClick_Toggle(int index)