iwnc2020/CapersProject
2
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

0.3.4.19

Browse Source
This commit is contained in:
NTG_Lenovo 2024-11-26 17:22:26 +09:00
parent b8423eda5e
commit f82559342e
49 changed files with 562939 additions and 476473 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

220
Assets/01.Scenes/01.Tycoon.unity
View File

@ -177,8 +177,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uC131\uACF5!\n\uB9DD\uB839 \uB9E5\uC8FC"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -350,8 +350,8 @@ MonoBehaviour:
m_Calls: []
m_text: '- 50%'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -734,8 +734,8 @@ MonoBehaviour:
m_Calls: []
m_text: 17
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -970,6 +970,7 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 88262798}
- component: {fileID: 88262799}
m_Layer: 0
m_Name: ---------------Cameras---------------
m_TagString: Untagged
@ -992,6 +993,19 @@ Transform:
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &88262799
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 88262797}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: df2a0fc904f8dc642b84d1e12d28cdcf, type: 3}
m_Name:
m_EditorClassIdentifier:
FontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
--- !u!1 &88951137
GameObject:
m_ObjectHideFlags: 0
@ -1051,8 +1065,8 @@ MonoBehaviour:
m_Calls: []
m_text: 10
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -1310,8 +1324,8 @@ MonoBehaviour:
m_Calls: []
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -2357,8 +2371,8 @@ MonoBehaviour:
m_Calls: []
m_text: Good
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -2635,8 +2649,8 @@ MonoBehaviour:
m_Calls: []
m_text: 500
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -2959,8 +2973,8 @@ MonoBehaviour:
m_Calls: []
m_text: E
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -3095,8 +3109,8 @@ MonoBehaviour:
m_Calls: []
m_text: Tip
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -3408,8 +3422,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uB77C\uC6B4\uB4DC. 22"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -3676,8 +3690,8 @@ MonoBehaviour:
m_text: "\uC0AC\uC6A9\uD558\uC9C0 \uC54A\uC740 \uACE8\uB4DC\uB294 \uBAA8\uB450
\uC18C\uBA78\uD569\uB2C8\uB2E4."
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -4430,7 +4444,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 290, y: -30}
m_SizeDelta: {x: 74.82, y: 50}
m_SizeDelta: {x: 76.28, y: 50}
m_Pivot: {x: 0, y: 1}
--- !u!222 &437358693
CanvasRenderer:
@ -5249,8 +5263,8 @@ MonoBehaviour:
m_Calls: []
m_text: 1,000
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -5515,8 +5529,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uC11C\uBE44\uC2A4"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -6496,8 +6510,8 @@ MonoBehaviour:
m_Calls: []
m_text: 1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -6859,8 +6873,8 @@ MonoBehaviour:
m_Calls: []
m_text: Q
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -7271,8 +7285,8 @@ MonoBehaviour:
m_Calls: []
m_text: Liquid
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -7491,8 +7505,8 @@ MonoBehaviour:
m_Calls: []
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -8252,8 +8266,8 @@ MonoBehaviour:
m_Calls: []
m_text: Cocktail Name
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -8787,8 +8801,8 @@ MonoBehaviour:
m_Calls: []
m_text: 100%
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -9293,8 +9307,8 @@ MonoBehaviour:
m_Calls: []
m_text: Round. 22
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -9690,8 +9704,8 @@ MonoBehaviour:
m_Calls: []
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -10382,8 +10396,8 @@ MonoBehaviour:
m_Calls: []
m_text: 100%
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -10586,8 +10600,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uB2F9\uC2E0\uC740 \uC8FD\uC5C8\uC2B5\uB2C8\uB2E4"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -11344,8 +11358,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uCE74\uB4DC"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -12028,8 +12042,8 @@ MonoBehaviour:
m_Calls: []
m_text: Fail
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -13557,8 +13571,8 @@ MonoBehaviour:
m_Calls: []
m_text: Fail
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -13782,6 +13796,14 @@ PrefabInstance:
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: 622964464122899677, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
propertyPath: m_fontAsset
value:
objectReference: {fileID: 0}
- target: {fileID: 622964464122899677, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
propertyPath: m_sharedMaterial
value:
objectReference: {fileID: 0}
- target: {fileID: 662613168352054153, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0.30000305
@ -16051,8 +16073,8 @@ MonoBehaviour:
m_Calls: []
m_text: Liquid
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -16370,8 +16392,8 @@ MonoBehaviour:
m_Calls: []
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -16966,8 +16988,8 @@ MonoBehaviour:
m_Calls: []
m_text: Gold
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -17541,8 +17563,8 @@ MonoBehaviour:
m_Calls: []
m_text: 0
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -17733,8 +17755,8 @@ MonoBehaviour:
m_Calls: []
m_text: Spent
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -17869,8 +17891,8 @@ MonoBehaviour:
m_Calls: []
m_text: 100%
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -18407,8 +18429,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uAD6C\uB9E4 \uC644\uB8CC"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -18812,8 +18834,8 @@ MonoBehaviour:
m_Calls: []
m_text: 'RatioRange : 00 %'
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -18948,8 +18970,8 @@ MonoBehaviour:
m_Calls: []
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -19727,8 +19749,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uACE8\uB4DC"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -19903,8 +19925,8 @@ MonoBehaviour:
<CrewController>k__BackingField: {fileID: 1665075874}
<CustomerController>k__BackingField: {fileID: 1665075876}
<ServingTableController>k__BackingField: {fileID: 1665075875}
<TycoonCardController>k__BackingField: {fileID: 0}
_dailyBgm: TycoonBgm02
<TycoonCardController>k__BackingField: {fileID: 1665075877}
_dailyBgm: TycoonBgm01
<TycoonStatus>k__BackingField:
_maxLevel: 0
_currentLevel: 0
@ -20291,8 +20313,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uD50C\uB808\uC774 \uD0C0\uC784 : 08:35"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -20529,8 +20551,8 @@ MonoBehaviour:
m_Calls: []
m_text: 100%
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -20665,8 +20687,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uD14C\uC2A4\uD2B8"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -21876,8 +21898,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uBAA8\uB450 \uD68D\uB4DD"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -22164,8 +22186,8 @@ MonoBehaviour:
m_Calls: []
m_text: 2
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 0e5360dce269ccc42b822a424d66fbd4, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -22939,8 +22961,8 @@ MonoBehaviour:
m_Calls: []
m_text: 200
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -23075,8 +23097,8 @@ MonoBehaviour:
m_Calls: []
m_text: Liquid
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -24190,8 +24212,8 @@ MonoBehaviour:
m_Calls: []
m_text: Good
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -24428,8 +24450,8 @@ MonoBehaviour:
m_Calls: []
m_text: Miss
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -24718,8 +24740,8 @@ MonoBehaviour:
m_Calls: []
m_text: "\uCD5C\uC885 \uACE8\uB4DC : 650"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -24929,8 +24951,8 @@ MonoBehaviour:
m_Calls: []
m_text: "- \uC544\uBB34 \uD0A4\uB098 \uC785\uB825\uD574\uC8FC\uC138\uC694 -"
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
@ -25609,8 +25631,8 @@ MonoBehaviour:
m_Calls: []
m_text: Space
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 2060004501589314750, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []

3
Assets/02.Scripts/BehaviorTree/Npc/Customer/Conditional/CanVomit.cs
View File

@ -2,6 +2,7 @@ using System;
using BehaviorDesigner.Runtime.Tasks;
using BlueWater.Npcs.Customers;
using BlueWater.Tycoons;
using BlueWater.Utility;
using UnityEngine;
using Random = UnityEngine.Random;
@ -28,7 +29,7 @@ namespace BlueWater.BehaviorTrees.Actions
if (random <= TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingPercent)
{
_canVomit = true;
_vomitingPosition = _customer.AIMovement.SetRandomPoint();
_vomitingPosition = Utils.RandomPositionOnGraph();
_customer.AIMovement.Move(_vomitingPosition);
}
}

14
Assets/02.Scripts/Character/Npc/Customer/Customer.cs
View File

@ -210,7 +210,10 @@ namespace BlueWater.Npcs.Customers
[Button("컴포넌트 초기화")]
protected virtual void InitializeComponents()
{
CenterTransform = transform;
if (!CenterTransform)
{
CenterTransform = transform;
}
Rigidbody = GetComponent<Rigidbody>();
CharacterCollider = GetComponent<CapsuleCollider>();
BehaviorTree = GetComponent<BehaviorTree>();
@ -218,7 +221,6 @@ namespace BlueWater.Npcs.Customers
MeshRenderer = VisualLook.GetComponent<MeshRenderer>();
BarkTrigger = transform.Find("DialogueSystem").GetComponent<BarkTrigger>();
InteractionCanvas = transform.GetComponentInChildren<InteractionCanvas>();
// BalloonUi = InteractionCanvas.transform.GetComponentInChildren<BalloonUi>();
SpineController = GetComponent<SpineController>();
AIMovement = GetComponent<AiMovement>();
@ -333,7 +335,7 @@ namespace BlueWater.Npcs.Customers
case CustomerInteractionType.None:
break;
case CustomerInteractionType.ServedCocktail:
var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem;
var servedCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(currentPickupItem.Idx);
IsOrderedCorrected = currentPickupItem.Idx == OrderedCocktailData.Idx;
IsReceivedItem = true;
@ -355,7 +357,7 @@ namespace BlueWater.Npcs.Customers
case CustomerInteractionType.None:
return false;
case CustomerInteractionType.ServedCocktail:
var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
var currentPickupItem = GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem;
return currentPickupItem != null;
default:
throw new ArgumentOutOfRangeException();
@ -473,7 +475,7 @@ namespace BlueWater.Npcs.Customers
public void InstanceVomit()
{
var spawnPosition = transform.position + new Vector3(0f, 0f, 0.1f);
var spawnPosition = transform.position + new Vector3(0f, 0f, -0.4f);
Instantiate(_vomiting, spawnPosition, _vomiting.transform.rotation);
TycoonStageController.VomitCount++;
if (TycoonStageController.VomitCount >= 3)
@ -507,7 +509,7 @@ namespace BlueWater.Npcs.Customers
IsOrderedCorrected = false;
OrderedCocktailData = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData();
var hurryTime = CurrentLevelData.HurryTime + TycoonManager.Instance.TycoonStatus.CustomerHurryTimeIncrease;
CurrentTableSeat.MenuBalloonUi.OrderItem(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true);
CurrentTableSeat.OrderCocktail(OrderedCocktailData.Idx, CurrentLevelData.WaitTime, hurryTime, true);
_customerInteractionType = CustomerInteractionType.ServedCocktail;
RegisterPlayerInteraction();

3
Assets/02.Scripts/Character/Player/Tycoon/State/DashState.cs
View File

@ -18,8 +18,7 @@ namespace BlueWater.Players.Tycoons
{
character.StateMachineController.TransitionToState(character.WalkingState, character);
}
else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping ||
character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish)
else if (character.IsInteracting())
{
character.StateMachineController.TransitionToState(character.InteractionState, character);
}

3
Assets/02.Scripts/Character/Player/Tycoon/State/IdleState.cs
View File

@ -18,8 +18,7 @@ namespace BlueWater.Players.Tycoons
{
character.StateMachineController.TransitionToState(character.WalkingState, character);
}
else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping ||
character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish)
else if (character.IsInteracting())
{
character.StateMachineController.TransitionToState(character.InteractionState, character);
}

3
Assets/02.Scripts/Character/Player/Tycoon/State/InteractionState.cs
View File

@ -19,8 +19,7 @@ namespace BlueWater.Players.Tycoons
public void UpdateState(TycoonPlayer character)
{
if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping ||
character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish)
if (character.IsInteracting())
{
EnterState(character);
}

3
Assets/02.Scripts/Character/Player/Tycoon/State/WalkingState.cs
View File

@ -18,8 +18,7 @@ namespace BlueWater.Players.Tycoons
{
EnterState(character);
}
else if (character.IsMakingCocktail || character.IsCleaningFloor || character.IsCleaningTable || character.IsPumping ||
character.IsInteractedSlimeGarnish || character.IsInteractedLimeTreeGarnish)
else if (character.IsInteracting())
{
character.StateMachineController.TransitionToState(character.InteractionState, character);
}

26
Assets/02.Scripts/Character/Player/Tycoon/TycoonPickupHandler.cs
View File

@ -14,8 +14,8 @@ namespace BlueWater.Players.Tycoons
[field: SerializeField]
public bool IsPickedUpItem { get; private set; }
private IPickup _currentPickupItem;
public IPickup CurrentPickupItem { get; private set; }
private void Awake()
{
@ -25,13 +25,11 @@ namespace BlueWater.Players.Tycoons
private void Start()
{
EventManager.OnMakeCocktailStarted += PickupUnfinishedCocktail;
EventManager.OnMakeCocktailCompleted += PickupItem;
}
private void OnDestroy()
{
EventManager.OnMakeCocktailStarted -= PickupUnfinishedCocktail;
EventManager.OnMakeCocktailCompleted -= PickupItem;
}
[Button("컴포넌트 초기화")]
@ -56,7 +54,7 @@ namespace BlueWater.Players.Tycoons
}
IsUnfinishedCocktailPickedUp = false;
_currentPickupItem = item;
SetCurrentPickupItem(item);
_itemRenderer.enabled = false;
//_itemRenderer.sprite = item.Sprite;
IsPickedUpItem = true;
@ -64,13 +62,13 @@ namespace BlueWater.Players.Tycoons
public void ServedItem(IPickup item)
{
if (!IsPickedUpItem || _currentPickupItem == null)
if (!IsPickedUpItem || CurrentPickupItem == null)
{
Debug.Log("들고있는 아이템이 없거나, 현재 아이템 데이터가 비어있습니다.");
return;
}
_currentPickupItem = null;
SetCurrentPickupItem(null);
_itemRenderer.sprite = null;
IsPickedUpItem = false;
}
@ -84,7 +82,7 @@ namespace BlueWater.Players.Tycoons
}
IsUnfinishedCocktailPickedUp = false;
_currentPickupItem = null;
SetCurrentPickupItem(null);
_itemRenderer.sprite = null;
IsPickedUpItem = false;
}
@ -92,18 +90,22 @@ namespace BlueWater.Players.Tycoons
public void ChangeItem(IPickup item)
{
IsUnfinishedCocktailPickedUp = false;
_currentPickupItem = item;
SetCurrentPickupItem(item);
_itemRenderer.enabled = false;
IsPickedUpItem = true;
}
public IPickup GetCurrentPickupItem() => _currentPickupItem;
public bool IsServablePickupItem() => IsPickedUpItem && _currentPickupItem.Idx != "Cocktail000";
public bool IsServablePickupItem() => IsPickedUpItem && CurrentPickupItem.Idx != "Cocktail000";
/// <summary>
/// 제조중인 칵테일이 있거나, 아이템이 있는 경우
/// </summary>
public bool IsPickedUpAnything() => IsPickedUpItem || IsUnfinishedCocktailPickedUp;
public void SetCurrentPickupItem(IPickup item)
{
CurrentPickupItem = item;
EventManager.InvokeChangedPickupItem(CurrentPickupItem?.Idx);
}
}
}

23
Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs
View File

@ -107,6 +107,8 @@ namespace BlueWater.Players.Tycoons
EventManager.OnCocktailDiscarded += DiscardCocktail;
EventManager.OnCocktailServedToCustomer += ServedCocktail;
EventManager.OnChangedRandomCocktail += ChangeCocktail;
EventManager.OnPickupCocktail += PickupCocktail;
EventManager.OnPlaceOnServingTable += PlaceOnServingTable;
TycoonMovement.OnSucceedDash += DashSucceed;
@ -130,6 +132,8 @@ namespace BlueWater.Players.Tycoons
EventManager.OnCocktailDiscarded -= DiscardCocktail;
EventManager.OnCocktailServedToCustomer -= ServedCocktail;
EventManager.OnChangedRandomCocktail -= ChangeCocktail;
EventManager.OnPickupCocktail -= PickupCocktail;
EventManager.OnPlaceOnServingTable -= PlaceOnServingTable;
TycoonMovement.OnSucceedDash -= DashSucceed;
}
@ -176,6 +180,7 @@ namespace BlueWater.Players.Tycoons
if (!isMadePlayer) return;
InteractionCanvas.BalloonUi.SetItemImage(cocktailData);
TycoonPickupHandler.PickupItem(cocktailData, isMadePlayer);
if (TycoonManager.Instance.TycoonStatus.CurrentPassiveCard != PassiveCard.MakingBonus || cocktailData.Idx == "Cocktail000") return;
@ -188,6 +193,18 @@ namespace BlueWater.Players.Tycoons
}
}
public void PickupCocktail(CocktailData cocktailData)
{
TycoonPickupHandler.PickupItem(cocktailData, true);
InteractionCanvas.BalloonUi.SetItemImage(cocktailData);
}
public void PlaceOnServingTable()
{
TycoonPickupHandler.DiscardItem();
InteractionCanvas.BalloonUi.DiscardItem();
}
public void DiscardCocktail(CocktailData cocktailData, bool isDiscardedPlayer)
{
if (!isDiscardedPlayer) return;
@ -215,6 +232,12 @@ namespace BlueWater.Players.Tycoons
StateMachineController.TransitionToState(DashState, this);
}
public bool IsInteracting()
{
return IsMakingCocktail || IsCleaningFloor || IsCleaningTable || IsCleaningMold || IsPumping ||
IsInteractedSlimeGarnish || IsInteractedLimeTreeGarnish;
}
#endregion
}
}

15
Assets/02.Scripts/EventManager.cs
View File

@ -115,6 +115,7 @@ namespace BlueWater
}
// 플레이어
// 대쉬 쿨타임 이벤트
public static Action<float> OnDashCooldown;
public static void InvokeDashCooldown(float cooldown)
{
@ -162,6 +163,13 @@ namespace BlueWater
{
OnCocktailDiscarded?.Invoke(cocktailData, isDiscardedPlayer);
}
// 플레이어가 칵테일을 드는 이벤트
public static Action<CocktailData> OnPickupCocktail;
public static void InvokePickupCocktail(CocktailData cocktailData)
{
OnPickupCocktail?.Invoke(cocktailData);
}
// 플레이어가 들고있는 칵테일을 서빙테이블에 올려두는 이벤트
public static Action OnPlaceOnServingTable;
@ -169,6 +177,13 @@ namespace BlueWater
{
OnPlaceOnServingTable?.Invoke();
}
// 플레이어가 들고 있는 아이템 정보가 바뀌는 경우
public static Action<string> OnChangedPickupItem;
public static void InvokeChangedPickupItem(string idx)
{
OnChangedPickupItem?.Invoke(idx);
}
// Npc
// 손님 생성 이벤트

5
Assets/02.Scripts/Prop/Tycoon/BartenderTable.cs
View File

@ -1,5 +1,6 @@
using System;
using BlueWater.Interfaces;
using BlueWater.Items;
using BlueWater.Npcs.Crews;
using BlueWater.Npcs.Crews.Server;
using UnityEngine;
@ -31,8 +32,8 @@ namespace BlueWater.Tycoons
// 테이블의 칵테일을 가져가는 경우
if (CurrentPickupItem != null)
{
CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem, true);
CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem);
CocktailData currentCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(CurrentPickupItem.Idx);
EventManager.InvokePickupCocktail(currentCocktailData);
CocktailGlassImage.sprite = null;
CocktailGlassImage.enabled = false;
// InteractionCanvas.BalloonUi.DiscardItem();

2
Assets/02.Scripts/Prop/Tycoon/Cookware.cs
View File

@ -119,7 +119,7 @@ namespace BlueWater.Tycoons
{
if (CurrentTycoonPlayer.TycoonPickupHandler.IsPickedUpItem)
{
var carriedItemData = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
var carriedItemData = CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem;
if (carriedItemData.Idx == FireWoodIdx)
{
CurrentTycoonPlayer.TycoonPickupHandler.ServedItem(carriedItemData);

10
Assets/02.Scripts/Prop/Tycoon/CustomerTable.cs
View File

@ -17,8 +17,8 @@ namespace BlueWater.Tycoons
[SerializeField]
private SpriteRenderer _carpetRenderer;
[SerializeField]
private List<TableSeat> _tableSeats;
[field: SerializeField]
public List<TableSeat> TableSeats { get; private set; }
[SerializeField]
private int _tableNumber;
@ -43,7 +43,7 @@ namespace BlueWater.Tycoons
public TableSeat FindEmptySeat()
{
var seatCount = _tableSeats.Count;
var seatCount = TableSeats.Count;
var indices = new List<int>(Enumerable.Range(0, seatCount));
while (indices.Count > 0)
@ -52,7 +52,7 @@ namespace BlueWater.Tycoons
var seatIndex = indices[randomIndex];
indices.RemoveAt(randomIndex);
var tableSeat = _tableSeats[seatIndex];
var tableSeat = TableSeats[seatIndex];
if (!tableSeat.IsReserved && !tableSeat.IsOccupied && tableSeat.IsCleaned)
{
return tableSeat;
@ -67,7 +67,7 @@ namespace BlueWater.Tycoons
_carpetRenderer.sprite = _carpetOnSprite;
_visualLookObject.SetActive(true);
foreach (var element in _tableSeats)
foreach (var element in TableSeats)
{
element.SetTableNumber(_tableNumber);
}

5
Assets/02.Scripts/Prop/Tycoon/GarnishBarrel.cs
View File

@ -5,6 +5,7 @@ namespace BlueWater.Tycoons
{
public static class GarnishBarrelSpineAnimation
{
public const string InactiveIdle = "Idle";
public const string IdleLevel1 = "Idle0";
public const string IdleLevel2 = "Idle10";
public const string IdleLevel3 = "Idle50";
@ -25,7 +26,7 @@ namespace BlueWater.Tycoons
{
base.Start();
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.IdleLevel1, true);
SpineController.PlayAnimation(GarnishBarrelSpineAnimation.InactiveIdle, true);
}
private void Update()
@ -129,6 +130,8 @@ namespace BlueWater.Tycoons
public override void AddCurrentAmount(int addedValue)
{
if (!IsActivated) return;
base.AddCurrentAmount(addedValue);
var newLevel = GetCurrentLevel();

5
Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs
View File

@ -176,6 +176,11 @@ namespace BlueWater.Tycoons
public override void SetCurrentAmount(int amount)
{
if (CurrentAmount == int.MaxValue)
{
return;
}
base.SetCurrentAmount(amount);
var liquidAmount = CurrentAmount / VisualMaxFill;

14
Assets/02.Scripts/Prop/Tycoon/ServingTable.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections;
using BlueWater.Interfaces;
using BlueWater.Items;
using BlueWater.Npcs.Crews;
using BlueWater.Npcs.Crews.Server;
using BlueWater.Npcs.Customers;
@ -21,7 +22,7 @@ namespace BlueWater.Tycoons
public IPickup CurrentPickupItem
{
get => _currentPickupItem;
set
protected set
{
_currentPickupItem = value;
@ -66,8 +67,8 @@ namespace BlueWater.Tycoons
// 테이블의 칵테일을 가져가는 경우
if (CurrentPickupItem != null)
{
CurrentTycoonPlayer.TycoonPickupHandler.PickupItem(CurrentPickupItem, true);
CurrentTycoonPlayer.InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem);
CocktailData currentCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(CurrentPickupItem.Idx);
EventManager.InvokePickupCocktail(currentCocktailData);
CocktailGlassImage.sprite = null;
CocktailGlassImage.enabled = false;
// InteractionCanvas.BalloonUi.DiscardItem();
@ -77,14 +78,11 @@ namespace BlueWater.Tycoons
// 테이블에 칵테일을 놓는 경우
else
{
EventManager.InvokePlaceOnServingTable();
CurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem();
CurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem;
CocktailGlassImage.sprite = CurrentPickupItem.Sprite;
CocktailGlassImage.enabled = true;
// InteractionCanvas.BalloonUi.SetItemImage(CurrentPickupItem);
CurrentTycoonPlayer.TycoonPickupHandler.DiscardItem();
CurrentTycoonPlayer.InteractionCanvas.BalloonUi.DiscardItem();
CocktailGlassImage.enabled = true;
EventManager.InvokePlaceOnServingTable();
}
}

40
Assets/02.Scripts/Prop/Tycoon/TableSeat.cs
View File

@ -5,6 +5,7 @@ using BlueWater.Npcs.Crews;
using BlueWater.Npcs.Crews.Cleaner;
using BlueWater.Uis;
using BlueWater.Utility;
using Sirenix.OdinInspector;
using UnityEngine;
namespace BlueWater.Tycoons
@ -57,6 +58,13 @@ namespace BlueWater.Tycoons
[SerializeField]
private string _cleaningSfxName = "CleaningTable";
[Title("연출")]
[SerializeField]
private Color _originalColor = Color.white;
[SerializeField]
private Color _mismatchedColor = Color.gray;
private LevelData _currentLevelData;
private Coroutine _findCleanerCrewInstance;
private bool _isPlayerInteracting;
@ -76,6 +84,7 @@ namespace BlueWater.Tycoons
base.Start();
EventManager.OnCleaningAll += Cleaning;
EventManager.OnChangedPickupItem += ChangeMenuColor;
}
private void Update()
@ -147,6 +156,7 @@ namespace BlueWater.Tycoons
private void OnDestroy()
{
EventManager.OnCleaningAll -= Cleaning;
EventManager.OnChangedPickupItem -= ChangeMenuColor;
}
public void Initialize()
@ -197,8 +207,8 @@ namespace BlueWater.Tycoons
IsCleaned = true;
_isPlayerInteracting = false;
_isCrewInteracting = false;
InteractionCanvas.BalloonUi.HideUi();
InteractionCanvas.BalloonUi.ResetUi();
InteractionCanvas.BalloonUi.DiscardItem();
MenuBalloonUi.DiscardItem();
HoldingElapsedTime = 0f;
}
@ -249,5 +259,31 @@ namespace BlueWater.Tycoons
CleanTable();
}
public void OrderCocktail(string itemIdx, float waitTime, float hurryTime, bool isReverse = false)
{
MenuBalloonUi.OrderItem(itemIdx, waitTime, hurryTime, isReverse);
ChangeMenuColor(GameManager.Instance.CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem?.Idx);
}
public void ChangeMenuColor(string idx)
{
if (MenuBalloonUi.gameObject.activeInHierarchy)
{
if (idx == null || (MenuBalloonUi.IsWaitServing() && MenuBalloonUi.OrderCocktailData?.Idx == idx))
{
ChangeMenuOriginalColor();
}
else
{
MenuBalloonUi.SetColor(_mismatchedColor);
}
}
}
public void ChangeMenuOriginalColor()
{
MenuBalloonUi.SetColor(_originalColor);
}
}
}

2
Assets/02.Scripts/Prop/Tycoon/TrashCan.cs
View File

@ -183,7 +183,7 @@ namespace BlueWater.Tycoons
CocktailData discardCocktailData = null;
if (!CurrentTycoonPlayer.TycoonPickupHandler.IsUnfinishedCocktailPickedUp)
{
var discardCocktailDataIdx = CurrentTycoonPlayer.TycoonPickupHandler.GetCurrentPickupItem().Idx;
var discardCocktailDataIdx = CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem.Idx;
discardCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(discardCocktailDataIdx);
}

48
Assets/02.Scripts/TMP_FontChanger.cs Normal file
View File

@ -0,0 +1,48 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using TMPro;
#if UNITY_EDITOR
using UnityEditor;
#endif
/*
https://bonnate.tistory.com/
Insert the script into the game object
insert the TMP font in the inspector
and press the button to find and replace all components.
It may work abnormally, so make sure to back up your scene before using it!!
*/
public class TMP_FontChanger : MonoBehaviour
{
[SerializeField] public TMP_FontAsset FontAsset;
}
#if UNITY_EDITOR
[CustomEditor(typeof(TMP_FontChanger))]
public class TMP_FontChangerEditor : Editor
{
public override void OnInspectorGUI()
{
base.OnInspectorGUI();
if (GUILayout.Button("Change Font!"))
{
TMP_FontAsset fontAsset = ((TMP_FontChanger)target).FontAsset;
foreach(TextMeshPro textMeshPro3D in GameObject.FindObjectsOfType<TextMeshPro>(true))
{
textMeshPro3D.font = fontAsset;
}
foreach(TextMeshProUGUI textMeshProUi in GameObject.FindObjectsOfType<TextMeshProUGUI>(true))
{
textMeshProUi.font = fontAsset;
}
}
}
}
#endif

2
Assets/02.Scripts/TMP_FontChanger.cs.meta Normal file
View File

@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: df2a0fc904f8dc642b84d1e12d28cdcf

1
Assets/02.Scripts/Tycoon/CustomerTableController.cs
View File

@ -1,4 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using BlueWater.Utility;

1
Assets/02.Scripts/Tycoon/TycoonStageController.cs
View File

@ -132,6 +132,7 @@ namespace BlueWater.Tycoons
var mushroom = Instantiate(_mushroomObject, spawnPosition, _mushroomObject.transform.rotation);
}
[Button("노말 상자 생성")]
public void CreateChest(LevelData levelData)
{
if (levelData.Idx == "1") return;

27
Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs
View File

@ -10,6 +10,9 @@ namespace BlueWater.Uis
public class BalloonUi : MonoBehaviour
{
[Title("컴포넌트")]
[SerializeField]
private Image _background;
[SerializeField, Required]
private Image _fillImage;
@ -42,9 +45,10 @@ namespace BlueWater.Uis
[SerializeField, DisableIf("@true")]
private bool _isItemReceived;
public CocktailData OrderCocktailData { get; private set; }
private Tween _fillTween;
private Tween _colorTween;
private CocktailData _orderCocktailData;
private Color _previousColor;
private void Awake()
@ -63,7 +67,6 @@ namespace BlueWater.Uis
public void ShowUi() => _panel.SetActive(true);
public void HideUi() => _panel.SetActive(false);
public void SetItemImage(IPickup item)
{
if (!item.Sprite)
@ -75,16 +78,18 @@ namespace BlueWater.Uis
ShowUi();
}
public void ResetUi()
private void ResetUi()
{
_isOrdered = false;
_isWaitTimeOver = false;
_isItemReceived = false;
}
public void SetEmpty()
private void SetEmpty()
{
SetItemSprite(null);
OrderCocktailData = null;
_fillTween?.Kill();
}
public void SetItemSprite(Sprite sprite)
@ -96,15 +101,16 @@ namespace BlueWater.Uis
{
HideUi();
SetEmpty();
ResetUi();
}
public void OrderItem(string itemIdx, float waitTime, float hurryTime, bool isReverse = false)
{
_orderCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(itemIdx);
OrderCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(itemIdx);
_isOrdered = true;
_isWaitTimeOver = false;
_isItemReceived = false;
SetItemImage(_orderCocktailData);
SetItemImage(OrderCocktailData);
SetTween(waitTime, hurryTime, isReverse);
}
@ -159,12 +165,13 @@ namespace BlueWater.Uis
}
public bool IsWaitTimeOver() => _isOrdered && _isWaitTimeOver;
public bool IsWaitServing() => !_isItemReceived && _isOrdered && !_isWaitTimeOver;
public bool IsFoodReceive() => _isItemReceived;
public void ReceiveItem(IPickup pickupItem)
{
_fillTween.Kill();
HideUi();
SetEmpty();
_isItemReceived = true;
}
@ -195,6 +202,12 @@ namespace BlueWater.Uis
}
}
}
public void SetColor(Color color)
{
_background.color = color;
_itemImage.color = color;
}
public void PauseTween()
{

10
Assets/05.Prefabs/Props/Furniture/Interactions/CustomerTable.prefab
View File

@ -73,6 +73,8 @@ MonoBehaviour:
_playerHoldingTime: 3
_crewHoldingTime: 9
_cleaningSfxName: CleaningTable
_originalColor: {r: 1, g: 1, b: 1, a: 1}
_mismatchedColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
--- !u!114 &3964937737965122596
MonoBehaviour:
m_ObjectHideFlags: 0
@ -447,6 +449,8 @@ MonoBehaviour:
_playerHoldingTime: 3
_crewHoldingTime: 9
_cleaningSfxName: CleaningTable
_originalColor: {r: 1, g: 1, b: 1, a: 1}
_mismatchedColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
--- !u!114 &4593866383055317665
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1276,7 +1280,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Size.z
value: 0.4
value: 0.2
objectReference: {fileID: 0}
- target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Center.y
@ -1284,7 +1288,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 2234961990804426782, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_Center.z
value: 0.2
value: 0.1
objectReference: {fileID: 0}
- target: {fileID: 2301048832536013177, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3}
propertyPath: m_LocalScale.x
@ -1448,7 +1452,7 @@ MonoBehaviour:
_collider: {fileID: 8857736056138880520}
_visualLookObject: {fileID: 672328621937310823}
_carpetRenderer: {fileID: 7588633447038655794}
_tableSeats:
<TableSeats>k__BackingField:
- {fileID: 6383913593085221228}
- {fileID: 6277647266874368514}
_tableNumber: 0

4
Assets/05.Prefabs/Props/Furniture/Interactions/MoneyCounter.prefab
View File

@ -67,8 +67,8 @@ MonoBehaviour:
m_Calls: []
m_text: 1000
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_sharedMaterial: {fileID: 2100000, guid: 19a626476403a2f40b9d0512f80d61d9, type: 2}
m_fontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_sharedMaterial: {fileID: 1072195877514824051, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []

7
Assets/05.Prefabs/Uis/Tycoons/MenuBalloonUi.prefab
View File

@ -199,9 +199,14 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4132c767aaeea7f43b8b894bde7b7351, type: 3}
m_Name:
m_EditorClassIdentifier:
_background: {fileID: 1491349371811006708}
_fillImage: {fileID: 3836460704259562449}
_itemImage: {fileID: 6420120053108935114}
_panel: {fileID: 4609128235759643923}
_isChangedColor: 0
_startColor: {r: 0, g: 1, b: 0, a: 1}
_middleColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
_endColor: {r: 1, g: 0, b: 0, a: 1}
_isOrdered: 0
_isWaitTimeOver: 0
_isItemReceived: 0
@ -277,7 +282,7 @@ 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.0000000037252903, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0.000000007450581, y: 0.000000026077032}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8438734531649324286

16
Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.atlas.txt
View File

@ -1,20 +1,20 @@
LimeTree.png
size:1263,986
size:1273,998
filter:Linear,Linear
10
bounds:1008,12,304,236
bounds:1018,24,304,236
rotate:90
100
bounds:1008,652,332,253
bounds:1018,664,332,253
rotate:90
50
bounds:1008,318,332,246
bounds:1018,330,332,246
rotate:90
LimeTree0
bounds:2,2,501,490
bounds:2,2,506,496
LimeTree0-
bounds:2,494,501,490
bounds:2,500,506,496
LimeTree100
bounds:505,494,501,490
bounds:510,500,506,496
LimeTree50
bounds:505,2,501,490
bounds:510,2,506,496

BIN
Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 436 KiB

After

Width:  |  Height:  |  Size: 580 KiB

BIN
Assets/08.Spines/Props/LimeTreeGarnish/LimeTree.skel.bytes
View File

Binary file not shown.

15
Assets/08.Spines/Props/SlimeGarnish/Slime.atlas.txt
View File

@ -1,17 +1,14 @@
Slime.png
size:483,982
size:794,524
filter:Linear,Linear
Back
bounds:2,687,479,293
Bottom
bounds:295,180,505,180
rotate:90
bounds:2,144,506,378
Front
bounds:2,205,480,291
bounds:510,58,464,282
rotate:90
Slime1
bounds:2,2,71,55
bounds:456,3,69,53
Slime2
bounds:239,33,229,145
bounds:232,2,222,140
Slime3
bounds:2,59,235,144
bounds:2,2,228,140

BIN
Assets/08.Spines/Props/SlimeGarnish/Slime.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 204 KiB

After

Width:  |  Height:  |  Size: 233 KiB

BIN
Assets/08.Spines/Props/SlimeGarnish/Slime.skel.bytes
View File

Binary file not shown.

68907
Assets/10.Fonts/Hahmlet-Medium SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

2
Assets/10.Fonts/NotoSansKR-Medium SDF.asset.meta → Assets/10.Fonts/Hahmlet-Medium SDF.asset.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: dabfdeb80b25d44b4ace56414d0eb4ad
guid: ab4e9b009d1d8c9499121e92eff6464d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000

BIN
Assets/10.Fonts/Hahmlet-Medium.ttf Normal file
View File

Binary file not shown.

4
Assets/10.Fonts/NotoSansKR-Medium.ttf.meta → Assets/10.Fonts/Hahmlet-Medium.ttf.meta
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 9b4c9f279bc84402e80eedb70f9617ed
guid: 4ac0167ab60852b43ab65682da2bc6da
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
@ -9,7 +9,7 @@ TrueTypeFontImporter:
characterPadding: 1
includeFontData: 1
fontNames:
- Noto Sans KR
- Hahmlet
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0

5802
Assets/10.Fonts/Lora-Medium SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

4
Assets/10.Fonts/TmpOutline 1.mat.meta → Assets/10.Fonts/Lora-Medium SDF.asset.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 19a626476403a2f40b9d0512f80d61d9
guid: 939c036859b3e214997dea317096f06f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/10.Fonts/Lora-Medium.ttf Normal file
View File

Binary file not shown.

21
Assets/10.Fonts/Lora-Medium.ttf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: eb833e3c23922514fbe77959a5a267ad
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Lora
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

476220
Assets/10.Fonts/NotoSansKR-Medium SDF.asset
View File

File diff suppressed because one or more lines are too long

BIN
Assets/10.Fonts/NotoSansKR-Medium.ttf
View File

Binary file not shown.

487830
Assets/10.Fonts/NotoSansSC-Medium SDF.asset Normal file
View File

File diff suppressed because one or more lines are too long

4
Assets/10.Fonts/TmpOutline.mat.meta → Assets/10.Fonts/NotoSansSC-Medium SDF.asset.meta
View File

@ -1,8 +1,8 @@
fileFormatVersion: 2
guid: 0e5360dce269ccc42b822a424d66fbd4
guid: 68ddc9019bb87a24680fac0491286c56
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/10.Fonts/NotoSansSC-Medium.ttf Normal file
View File

Binary file not shown.

21
Assets/10.Fonts/NotoSansSC-Medium.ttf.meta Normal file
View File

@ -0,0 +1,21 @@
fileFormatVersion: 2
guid: c09ca2f9eec3ef24badf737287cb44f2
TrueTypeFontImporter:
externalObjects: {}
serializedVersion: 4
fontSize: 16
forceTextureCase: -2
characterSpacing: 0
characterPadding: 1
includeFontData: 1
fontNames:
- Noto Sans SC
fallbackFontReferences: []
customCharacters:
fontRenderingMode: 0
ascentCalculationMode: 1
useLegacyBoundsCalculation: 0
shouldRoundAdvanceValue: 1
userData:
assetBundleName:
assetBundleVariant:

36
Assets/10.Fonts/TmpOutline 1.mat
View File

@ -1,36 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TmpOutline 1
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_Parent: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _FaceDilate: 0.3
- _OutlineSoftness: 0
- _OutlineWidth: 0.4
- _ScaleRatioA: 0.8333333
- _ScaleRatioB: 0.42708334
- _ScaleRatioC: 0.42708334
m_Colors: []
m_BuildTextureStacks: []
m_AllowLocking: 1

32
Assets/10.Fonts/TmpOutline.mat
View File

@ -1,32 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: TmpOutline
m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
m_Parent: {fileID: 5657039867100983486, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _OutlineWidth: 0.15
- _ScaleRatioA: 0.8333333
m_Colors: []
m_BuildTextureStacks: []
m_AllowLocking: 1

2
Assets/TextMesh Pro/Resources/TMP Settings.asset
View File

@ -24,7 +24,7 @@ MonoBehaviour:
m_missingGlyphCharacter: 0
m_ClearDynamicDataOnBuild: 1
m_warningsDisabled: 0
m_defaultFontAsset: {fileID: 11400000, guid: dabfdeb80b25d44b4ace56414d0eb4ad, type: 2}
m_defaultFontAsset: {fileID: 11400000, guid: ab4e9b009d1d8c9499121e92eff6464d, type: 2}
m_defaultFontAssetPath: Fonts & Materials/
m_defaultFontSize: 36
m_defaultAutoSizeMinRatio: 0.5