멍박

Assets/Memo.txt

@@ -28,8 +28,7 @@
 
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////
-아래는 게등위 버전 이후 작업 예정 목록입니다.
+멍박 구현 필요 (열끗 7장 이상, 상대는 열끗 없을 때 2배)
-멍박 구현 필요 (동물 7마리 이상, 상대는 동물 없을 때 2배)
 앨범 수집 목록
 미션
 엿보기

Assets/Resources/Prefabs/Popups/AlbumOpenPopup.prefab

@@ -152,6 +152,81 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3397474863873381579
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2963692334054593193}
+  - component: {fileID: 2841544627423568482}
+  - component: {fileID: 3725194415308331600}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2963692334054593193
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3397474863873381579}
+  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: []
+  m_Father: {fileID: 5349872405586130481}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2841544627423568482
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3397474863873381579}
+  m_CullTransparentMesh: 1
+--- !u!114 &3725194415308331600
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3397474863873381579}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 0.003921569}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &5349872405586130486
 GameObject:
   m_ObjectHideFlags: 0
@@ -184,6 +259,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
+  - {fileID: 2963692334054593193}
   - {fileID: 8643226523064314600}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Scripts/UI/GamePanel/GamePanel.cs

@@ -255,6 +255,7 @@ public partial class GamePanel : MonoBehaviour
             case EScoreMutiplyType.Shake:
             case EScoreMutiplyType.Nagari:
             case EScoreMutiplyType.ClickedFromResultPopup:
+            case EScoreMutiplyType.Meongbak:
                 _hashScoreMultiplyTypes.Add(type);
                 break;
             case EScoreMutiplyType.Max:

Assets/Scripts/UI/GamePanel/GamePanel_Extension.cs

@@ -437,10 +437,11 @@ public partial class GamePanel : MonoBehaviour
     {
         int player_pee = GetScoreBoardTypeNumber(true, ECardScoreType.Pee);
         int player_Ghwang = GetScoreBoardTypeNumber(true, ECardScoreType.Ghwang);
+        int player_Yul_ggeut = GetScoreBoardTypeNumber(true, ECardScoreType.Yul_ggeut);
 
         int ai_pee = GetScoreBoardTypeNumber(false, ECardScoreType.Pee);
         int ai_Ghwang = GetScoreBoardTypeNumber(false, ECardScoreType.Ghwang);
-
+        int ai_Yul_ggeut = GetScoreBoardTypeNumber(false, ECardScoreType.Yul_ggeut);
 
         if (isPlayerWon)
         {
@@ -464,6 +465,11 @@ public partial class GamePanel : MonoBehaviour
                 if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Shake) == false)
                     _hashScoreMultiplyTypes.Add(EScoreMutiplyType.Shake);
             }
+            if (player_Yul_ggeut >= 7)
+            {
+                if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Meongbak) == false)
+                    _hashScoreMultiplyTypes.Add(EScoreMutiplyType.Meongbak);
+            }
         }
         else
         {
@@ -487,6 +493,11 @@ public partial class GamePanel : MonoBehaviour
                 if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Shake) == false)
                     _hashScoreMultiplyTypes.Add(EScoreMutiplyType.Shake);
             }
+            if (ai_Yul_ggeut >= 7)
+            {
+                if (_hashScoreMultiplyTypes.Contains(EScoreMutiplyType.Meongbak) == false)
+                    _hashScoreMultiplyTypes.Add(EScoreMutiplyType.Meongbak);
+            }
         }
 
         if (_hashScoreMultiplyTypes.Count <= 0)

Assets/Scripts/Utilities/Utility.cs

@@ -122,6 +122,8 @@ namespace CodeJay
                         return 2;
                     case EScoreMutiplyType.ClickedFromResultPopup:
                         return 2;
+                    case EScoreMutiplyType.Meongbak:
+                        return 2;
                     default:
                         return 0;
                 }

Assets/TextMesh Pro/Resources/Fonts & Materials/NotoSansKR-Regular - BoldOutline Y.mat

@@ -70,10 +70,10 @@ Material:
     - _OutlineSoftness: 0
     - _OutlineUVSpeedX: 0
     - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.2
+    - _OutlineWidth: 1
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.8
+    - _ScaleRatioA: 0.53781515
     - _ScaleRatioB: 0.41
     - _ScaleRatioC: 0.41
     - _ScaleX: 1
@@ -102,7 +102,7 @@ Material:
     - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
     - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
     - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0.08235294, g: 0.050980393, b: 0.039215688, a: 1}
+    - _OutlineColor: {r: 1, g: 0.8352941, b: 0.26666668, a: 1}
     - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
     - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}