diff --git a/Assets/Bundles/Prefabs/ScoreNumber.prefab b/Assets/Bundles/Prefabs/ScoreNumber.prefab
index 3bafdaf..9268b5d 100644
--- a/Assets/Bundles/Prefabs/ScoreNumber.prefab
+++ b/Assets/Bundles/Prefabs/ScoreNumber.prefab
@@ -34,7 +34,6 @@ RectTransform:
m_Children:
- {fileID: 4802875636195431128}
m_Father: {fileID: 0}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0}
@@ -69,8 +68,8 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
- m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
- m_Type: 1
+ m_Sprite: {fileID: 21300000, guid: 8388c990b53b08c41b9911ee6e007e62, type: 3}
+ m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
@@ -137,7 +136,6 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4802875636158537155}
- m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -174,15 +172,15 @@ MonoBehaviour:
m_Calls: []
m_text: 1
m_isRightToLeft: 0
- m_fontAsset: {fileID: 11400000, guid: 322dbc2d7f49b3547a8251c46ba13010, type: 2}
- m_sharedMaterial: {fileID: 2100000, guid: 9319c11b1aabce64c8cb7b30a4622de7, type: 2}
+ m_fontAsset: {fileID: 11400000, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
+ m_sharedMaterial: {fileID: -6508382273668546854, guid: cf1ae75e65a967946b23286a5ffbb812, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4278190080
+ m_fontColor: {r: 0, g: 0, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -215,15 +213,17 @@ MonoBehaviour:
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
- m_enableWordWrapping: 0
+ m_TextWrappingMode: 0
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 0
+ m_ActiveFontFeatures:
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 0
+ m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 0
m_isOrthographic: 1
m_isCullingEnabled: 0
diff --git a/Assets/Memo.txt b/Assets/Memo.txt
index 2ec1697..d9be31d 100644
--- a/Assets/Memo.txt
+++ b/Assets/Memo.txt
@@ -28,6 +28,7 @@
메인 화면 - 일부 이미지 변경
+게임 시작 시 튜토리얼 비활성화
////////////////////////////////////////////////////////////////////////////////////////////////////
아래는 게등위 버전 이후 작업 예정 목록입니다.
멍박 구현 필요 (동물 7마리 이상, 상대는 동물 없을 때 2배)
diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index 50730a3..40faddb 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -25057,10 +25057,10 @@ RectTransform:
m_Children: []
m_Father: {fileID: 1080531574}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
- m_AnchorMin: {x: 0, y: 0}
- m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -437.76306, y: 0}
- m_SizeDelta: {x: 0, y: 0}
+ m_AnchorMin: {x: 0, y: 0.5}
+ m_AnchorMax: {x: 0, y: 0.5}
+ m_AnchoredPosition: {x: 28, y: 0}
+ m_SizeDelta: {x: 0, y: 122}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &339524943
MonoBehaviour:
@@ -38626,8 +38626,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
- m_AnchoredPosition: {x: 116.6, y: -138.6}
- m_SizeDelta: {x: 169.3, y: 253}
+ m_AnchoredPosition: {x: 117.08, y: -136.86}
+ m_SizeDelta: {x: 164.53, y: 249.52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &584493146
MonoBehaviour:
@@ -55523,8 +55523,8 @@ GameObject:
m_Component:
- component: {fileID: 748618262}
- component: {fileID: 748618266}
- - component: {fileID: 748618265}
- component: {fileID: 748618264}
+ - component: {fileID: 748618267}
- component: {fileID: 748618263}
m_Layer: 5
m_Name: PeePanel
@@ -55583,32 +55583,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_HorizontalFit: 2
m_VerticalFit: 0
---- !u!114 &748618265
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 748618261}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- m_Padding:
- m_Left: 0
- m_Right: 0
- m_Top: 0
- m_Bottom: 0
- m_ChildAlignment: 3
- m_Spacing: -40
- m_ChildForceExpandWidth: 1
- m_ChildForceExpandHeight: 1
- m_ChildControlWidth: 0
- m_ChildControlHeight: 1
- m_ChildScaleWidth: 0
- m_ChildScaleHeight: 0
- m_ReverseArrangement: 0
--- !u!222 &748618266
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -55617,6 +55591,30 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 748618261}
m_CullTransparentMesh: 1
+--- !u!114 &748618267
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 748618261}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_Padding:
+ m_Left: 0
+ m_Right: 0
+ m_Top: 0
+ m_Bottom: 0
+ m_ChildAlignment: 0
+ m_StartCorner: 0
+ m_StartAxis: 0
+ m_CellSize: {x: 73, y: 123}
+ m_Spacing: {x: -40, y: -50}
+ m_Constraint: 1
+ m_ConstraintCount: 9
--- !u!1 &752034540
GameObject:
m_ObjectHideFlags: 0
@@ -56203,8 +56201,8 @@ RectTransform:
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: -75}
- m_SizeDelta: {x: 0, y: -150}
+ m_AnchoredPosition: {x: 0, y: 0}
+ m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &771770702
CanvasRenderer:
@@ -71579,8 +71577,8 @@ RectTransform:
m_GameObject: {fileID: 1080531573}
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_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
+ m_ConstrainProportionsScale: 1
m_Children:
- {fileID: 339524942}
- {fileID: 1458972174}
@@ -71590,8 +71588,8 @@ RectTransform:
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: -35}
- m_SizeDelta: {x: 0, y: -230}
+ m_AnchoredPosition: {x: 99.672, y: -20.799988}
+ m_SizeDelta: {x: -199.34, y: -228.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1087037061
GameObject:
diff --git a/Assets/Scripts/UI/ScoreSynchronizer.cs b/Assets/Scripts/UI/ScoreSynchronizer.cs
index d0e82a6..cec8200 100644
--- a/Assets/Scripts/UI/ScoreSynchronizer.cs
+++ b/Assets/Scripts/UI/ScoreSynchronizer.cs
@@ -28,7 +28,7 @@ public class ScoreSynchronizer : MonoBehaviour
private void OnInitializeGame()
{
- tmp.text = "00점";
+ tmp.text = "0점";
}
private void OnSynchronizeScore()