diff --git a/Assets/01.Scenes/01.Tycoon.unity b/Assets/01.Scenes/01.Tycoon.unity index 610f44627..2802bd232 100644 --- a/Assets/01.Scenes/01.Tycoon.unity +++ b/Assets/01.Scenes/01.Tycoon.unity @@ -460,7 +460,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -468,23 +468,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -508,11 +508,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -3247,6 +3247,7 @@ MonoBehaviour: m_EditorClassIdentifier: _panel: {fileID: 1621314685} _contents: {fileID: 1747127497} + _openSfxName: OpenNormalRewardBox --- !u!1001 &189372135 PrefabInstance: m_ObjectHideFlags: 0 @@ -3269,7 +3270,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -3277,23 +3278,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -3317,11 +3318,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -4491,7 +4492,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 716, y: -950} - m_SizeDelta: {x: 0, y: 30} + m_SizeDelta: {x: 155.45, y: 30} m_Pivot: {x: 1, y: 1} --- !u!114 &342757073 MonoBehaviour: @@ -7052,7 +7053,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -7060,23 +7061,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -7100,11 +7101,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 255 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8011,7 +8012,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -8019,23 +8020,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 105 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -8059,11 +8060,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 355 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8455,7 +8456,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 30, y: 20} - m_SizeDelta: {x: 0, y: 30} + m_SizeDelta: {x: 107.83, y: 30} m_Pivot: {x: 0, y: 0} --- !u!114 &587565436 MonoBehaviour: @@ -9090,10 +9091,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 587565435} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 53.915, y: -15} + m_SizeDelta: {x: 107.83, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &669977907 MonoBehaviour: @@ -9542,6 +9543,10 @@ PrefabInstance: propertyPath: m_Name value: CraftingIngredient (1) objectReference: {fileID: 0} + - target: {fileID: 1797891188367852391, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -299706786, guid: fd7c7a3fb4faf594787e004138691965, type: 3} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9556,7 +9561,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.x @@ -9564,15 +9569,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -9604,11 +9609,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 360 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -9628,15 +9633,15 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -9648,23 +9653,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 40.975 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 123.05 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -9676,11 +9681,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 75.975 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 6864126811145481680, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_text @@ -9688,7 +9693,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 150 objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y @@ -10085,7 +10090,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -10093,23 +10098,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -10133,11 +10138,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -11149,7 +11154,7 @@ MonoBehaviour: _panel: {fileID: 1737381006} _contents: {fileID: 1960067529} _cardLocalScale_2: {x: 0.9, y: 0.9, z: 1} - _openSfxName: RareRewardBox + _openSfxName: OpenRareRewardBox allOpenCardButton: {fileID: 1036857378} closeButton: {fileID: 2052924048} --- !u!114 &857091177 @@ -11954,7 +11959,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -11962,23 +11967,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -12002,11 +12007,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 255 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -12827,7 +12832,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -12835,23 +12840,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 205 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -12875,11 +12880,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 455 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13891,7 +13896,7 @@ MonoBehaviour: m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 - m_Bits: 2147614719 + m_Bits: 2148532223 --- !u!114 &1049919590 MonoBehaviour: m_ObjectHideFlags: 0 @@ -13974,6 +13979,9 @@ MonoBehaviour: k__BackingField: {fileID: 1049919591} k__BackingField: {fileID: 410235869} _fadeImage: {fileID: 2055805162} + _isUiClickTest: 0 + _raycaster: {fileID: 1049919589} + _eventSystem: {fileID: 1619849089} --- !u!1 &1054626872 GameObject: m_ObjectHideFlags: 0 @@ -15019,7 +15027,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -15027,23 +15035,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -15067,11 +15075,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 255 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -16691,7 +16699,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -16699,23 +16707,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -16739,11 +16747,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19732,7 +19740,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 30 + value: 40.975 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y @@ -19760,7 +19768,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 70 + value: 75.975 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y @@ -19772,7 +19780,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 133.05 + value: 150 objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y @@ -22269,10 +22277,10 @@ RectTransform: - {fileID: 1919216643} m_Father: {fileID: 1941054577} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1556084547 MonoBehaviour: @@ -22308,7 +22316,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -22652,7 +22660,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -22660,23 +22668,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 205 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -22700,11 +22708,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 455 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -23661,10 +23669,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1941054577} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 40} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 50, y: -30} + m_SizeDelta: {x: 38.94, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1645076293 MonoBehaviour: @@ -23680,7 +23688,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -25054,7 +25062,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -25062,23 +25070,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: 105 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -25102,11 +25110,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 355 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -26776,7 +26784,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -26784,23 +26792,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -26824,11 +26832,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -27071,6 +27079,7 @@ MonoBehaviour: m_EditorClassIdentifier: _billPrefab: {fileID: 3359733629073227380, guid: 8e1b25c375bfe2748993aba6d9af3fb5, type: 3} _chain: {fileID: 1434161268} + playChainSfxName: PlayChain _spawnPosition: {x: 400, y: -65, z: 0} _spawnLocation: {fileID: 128638924} _billInfos: @@ -27900,7 +27909,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -28158,6 +28167,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1941054577} + - component: {fileID: 1941054582} + - component: {fileID: 1941054581} - component: {fileID: 1941054580} - component: {fileID: 1941054579} - component: {fileID: 1941054578} @@ -28187,7 +28198,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: -650, y: -980} - m_SizeDelta: {x: 0, y: 60} + m_SizeDelta: {x: 88.94, y: 60} m_Pivot: {x: 0, y: 1} --- !u!114 &1941054578 MonoBehaviour: @@ -28269,7 +28280,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 0} + m_TargetGraphic: {fileID: 1941054581} m_OnClick: m_PersistentCalls: m_Calls: @@ -28285,6 +28296,44 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &1941054581 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941054576} + 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} + 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!222 &1941054582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1941054576} + m_CullTransparentMesh: 1 --- !u!1 &1947402518 GameObject: m_ObjectHideFlags: 0 @@ -29224,7 +29273,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -29232,23 +29281,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -95 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -29272,11 +29321,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 155 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -29614,7 +29663,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -29622,23 +29671,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -29662,11 +29711,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -30389,7 +30438,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2097912644 RectTransform: m_ObjectHideFlags: 0 @@ -30878,7 +30927,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.x @@ -30886,23 +30935,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.x - value: -195 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.y - value: 50 + value: 0 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalPosition.z @@ -30926,11 +30975,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 55 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -50 objectReference: {fileID: 0} - target: {fileID: 352852137782453654, guid: 4a913a50ec8eef748a69d8cc48698372, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -31076,7 +31125,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.x @@ -31084,15 +31133,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 90 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.y - value: 0 + value: 180 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -31124,11 +31173,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 140 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -100 objectReference: {fileID: 0} - target: {fileID: 2789412733048151169, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -31148,15 +31197,15 @@ PrefabInstance: objectReference: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 30 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -31168,23 +31217,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 59.54 objectReference: {fileID: 0} - target: {fileID: 3575025775468627079, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 85.92 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.x @@ -31196,11 +31245,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 94.54 objectReference: {fileID: 0} - target: {fileID: 3999276612447141282, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -20 objectReference: {fileID: 0} - target: {fileID: 6864126811145481680, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_text @@ -31208,7 +31257,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_SizeDelta.x - value: 0 + value: 150 objectReference: {fileID: 0} - target: {fileID: 7479254977802555519, guid: 0fd754c609fd1cd4e989911a0f13c391, type: 3} propertyPath: m_LocalPosition.y diff --git a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs index 0ffee9b5a..7916f29ab 100644 --- a/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs +++ b/Assets/02.Scripts/Character/Npc/Customer/State/VomitState.cs @@ -1,9 +1,11 @@ +using BlueWater.Audios; using BlueWater.Interfaces; namespace BlueWater.Npcs.Customers { public class VomitState : IStateMachine { + private string _vomitSfxName = "Vomit"; private bool _isVomiting; public void EnterState(Customer character) @@ -13,8 +15,9 @@ namespace BlueWater.Npcs.Customers public void UpdateState(Customer character) { - if (character.SpineController.IsAnimationComplete()) + if (!_isVomiting && character.SpineController.IsAnimationComplete()) { + AudioManager.Instance.PlaySfx(_vomitSfxName); character.SpineController.PlayAnimation(CustomerSpineAnimation.Vomiting, false); _isVomiting = true; } diff --git a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs index 5d152c284..da5c8298d 100644 --- a/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs +++ b/Assets/02.Scripts/Character/Player/PlayerHealthPoint.cs @@ -10,9 +10,6 @@ namespace BlueWater.Players public class PlayerHealthPoint : MonoBehaviour, IDamageable { // Components - [SerializeField] - private SpriteRenderer _spriteRenderer; - private IDashable _dashable; private ISkillHandler _skillHandler; @@ -29,9 +26,22 @@ namespace BlueWater.Players [field: SerializeField] public bool IsInvincible { get; private set; } + [SerializeField] + private bool _isShaking; + + [SerializeField, ShowIf("@_isShaking")] + private float _shakingPower = 0.5f; + + [SerializeField, ShowIf("@_isShaking")] + private float _shakingDuration = 0.1f; + + [SerializeField] + private string attackedSfxName = "CombatPlayerAttacked"; + [SerializeField] private string heartRecoverySfxName; + private Material _materialInstance; private WaitForSeconds _flashWhiteWaitTime; private Coroutine _flashWhiteCoroutine; private Coroutine _damageIntervalCoroutine; @@ -55,8 +65,6 @@ namespace BlueWater.Players [Button("컴포넌트 초기화")] private void InitializeComponents() { - _spriteRenderer = GetComponentInChildren(); - _dashable = GetComponent(); _skillHandler = GetComponent(); } @@ -106,12 +114,17 @@ namespace BlueWater.Players return !isDashing && !isActivatingSkill; } + [Button("데미지 테스트")] public void TakeDamage(int damageAmount) { + AudioManager.Instance.PlaySfx(attackedSfxName); IsInvincible = true; var changeHp = Mathf.Max(CurrentHealthPoint - damageAmount, 0); SetCurrentHealthPoint(changeHp); - AudioManager.Instance.PlaySfx("CombatPlayerAttacked"); + if (_isShaking) + { + VisualFeedbackManager.Instance.CameraShake(TycoonCameraManager.Instance.BaseCamera, _shakingPower, _shakingDuration); + } // 죽었는지 체크 if (changeHp == 0f) @@ -120,7 +133,7 @@ namespace BlueWater.Players return; } - if (_spriteRenderer.material.HasInt(IsHitHash)) + if (_materialInstance.HasInt(IsHitHash)) { Utils.StartUniqueCoroutine(this, ref _flashWhiteCoroutine, FlashWhiteCoroutine()); } @@ -143,9 +156,9 @@ namespace BlueWater.Players { for (var i = 0; i < 5; i++) { - _spriteRenderer.material.SetInt(IsHitHash, 1); + _materialInstance.SetInt(IsHitHash, 1); yield return _flashWhiteWaitTime; - _spriteRenderer.material.SetInt(IsHitHash, 0); + _materialInstance.SetInt(IsHitHash, 0); yield return _flashWhiteWaitTime; } @@ -160,5 +173,6 @@ namespace BlueWater.Players public void ActivateInvincibility() => IsInvincible = true; public void DeactivateInvincibility() => IsInvincible = false; + public void SetMaterialInstance(Material materialInstance) => _materialInstance = materialInstance; } } \ No newline at end of file diff --git a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs index 5cdd553ca..caeafdbe8 100644 --- a/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs +++ b/Assets/02.Scripts/Character/Player/Tycoon/TycoonPlayer.cs @@ -5,7 +5,6 @@ using BlueWater.Uis; using Sirenix.OdinInspector; using Spine.Unity; using UnityEngine; -using UnityEngine.InputSystem; namespace BlueWater.Players.Tycoons { @@ -67,6 +66,8 @@ namespace BlueWater.Players.Tycoons [SerializeField] private Vector3 _offset = new(0f, 1.5f, 0f); + public Material MaterialInstance { get; protected set; } + public bool IsCleaningFloor { get; set; } public bool IsCleaningTable { get; set; } public bool IsCleaningMold { get; set; } @@ -108,6 +109,12 @@ namespace BlueWater.Players.Tycoons EventManager.OnPlaceOnServingTable += PlaceOnServingTable; TycoonMovement.OnSucceedDash += DashSucceed; + + var originalMaterial = SpineController.SkeletonAnimation.SkeletonDataAsset.atlasAssets[0].PrimaryMaterial; + var newMaterial = SpineController.SkeletonAnimation.CustomMaterialOverride[originalMaterial]; + MaterialInstance = Instantiate(newMaterial); + SpineController.SkeletonAnimation.CustomMaterialOverride[originalMaterial] = MaterialInstance; + PlayerHealthPoint.SetMaterialInstance(MaterialInstance); IdleState = new IdleState(); WalkingState = new WalkingState(); @@ -167,7 +174,10 @@ namespace BlueWater.Players.Tycoons private void Die() { - int saveGold = Mathf.RoundToInt(TycoonManager.Instance.TycoonStatus.CurrentGold * TycoonManager.Instance.TycoonStatus.EndGoldMultiplier); + int currentGold = TycoonManager.Instance.TycoonStatus.CurrentGold; + float endGoldMultiplier = -0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; + int addedGold = Mathf.RoundToInt(currentGold * endGoldMultiplier); + int saveGold = currentGold + addedGold; ES3.Save(SaveData.EndGold, saveGold); ES3.Save(SaveData.CompleteFirstGame, true); } diff --git a/Assets/02.Scripts/Editor/JsonHelperEditor.cs b/Assets/02.Scripts/Editor/JsonHelperEditor.cs index 8db86a66e..0daf65e4b 100644 --- a/Assets/02.Scripts/Editor/JsonHelperEditor.cs +++ b/Assets/02.Scripts/Editor/JsonHelperEditor.cs @@ -6,6 +6,7 @@ using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Npcs.Customers; using BlueWater.Utility; +using Newtonsoft.Json; using UnityEditor; using UnityEngine; @@ -202,23 +203,28 @@ namespace BlueWater.Editors } } - // 새로운 데이터를 기존 데이터에 덮어쓰거나 추가 + // 새로운 데이터를 처리 foreach (var newDataItem in newData) { if (newDataItem == null || newDataItem.Value == null) continue; if (existingDataDict.TryGetValue(newDataItem.Key, out var existingItem)) { + // 기존 데이터가 있으면 업데이트 var properties = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance); foreach (var property in properties) { - var newValue = property.GetValue(newDataItem.Value); - var existingValue = property.GetValue(existingItem.Value); - - // 덮어쓰기 조건 (참조 타입이거나, 값 타입이 기본값이 아닌 경우에만 덮어씀) - if (ShouldOverwriteProperty(newValue, existingValue, property)) + // JSON 데이터에서 덮어쓸 프로퍼티만 처리 + if (property.GetCustomAttribute() != null) { - property.SetValue(existingItem.Value, newValue); + var newValue = property.GetValue(newDataItem.Value); + var existingValue = property.GetValue(existingItem.Value); + + // 덮어쓰기 조건 확인 + if (ShouldOverwriteProperty(newValue, existingValue, property)) + { + property.SetValue(existingItem.Value, newValue); + } } } } @@ -229,7 +235,7 @@ namespace BlueWater.Editors } } - // 기존 데이터 리스트를 다시 갱신 + // 기존 데이터를 유지하고 새로운 데이터를 덮어쓰거나 추가한 결과로 갱신 existingData.Clear(); existingData.AddRange(existingDataDict.Values); } diff --git a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs index c8611b792..747390f61 100644 --- a/Assets/02.Scripts/Item/Cocktail/CocktailData.cs +++ b/Assets/02.Scripts/Item/Cocktail/CocktailData.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using Sirenix.Utilities; using UnityEngine; @@ -11,42 +12,55 @@ namespace BlueWater.Items public class CocktailData : IPickup { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("오차 범위"), BoxGroup("Json 데이터 영역")] public int RatioRange { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("1번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx1 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("1번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientRatio1 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("2번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx2 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("2번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientRatio2 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("3번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx3 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("3번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientRatio3 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("4번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx4 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("4번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientRatio4 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("5번 재료 식별 Idx"), BoxGroup("Json 데이터 영역")] public string IngredientIdx5 { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("5번 재료 수량 Idx"), BoxGroup("Json 데이터 영역")] public int IngredientRatio5 { get; set; } diff --git a/Assets/02.Scripts/Item/Cocktail/LiquidData.cs b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs index de25848e0..b9c8d35ec 100644 --- a/Assets/02.Scripts/Item/Cocktail/LiquidData.cs +++ b/Assets/02.Scripts/Item/Cocktail/LiquidData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -16,15 +17,19 @@ namespace BlueWater.Items public class LiquidData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("종류"), BoxGroup("Json 데이터 영역")] public LiquidType Type { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("총량"), BoxGroup("Json 데이터 영역")] public int Amount { get; set; } diff --git a/Assets/02.Scripts/Item/ItemData.cs b/Assets/02.Scripts/Item/ItemData.cs index a554633c0..944104dde 100644 --- a/Assets/02.Scripts/Item/ItemData.cs +++ b/Assets/02.Scripts/Item/ItemData.cs @@ -38,27 +38,35 @@ namespace BlueWater.Items public class ItemData : IPickup { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("고유 식별 ID"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("이름"), BoxGroup("Json 데이터 영역")] public string Name { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("아이템 종류"), BoxGroup("Json 데이터 영역")] public ItemType Type { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("재료 종류"), BoxGroup("Json 데이터 영역")] public IngredientType IngredientType { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("아이템 품질"), BoxGroup("Json 데이터 영역")] public ItemQuality Quality { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("가격"), BoxGroup("Json 데이터 영역")] public int Price { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("무게"), BoxGroup("Json 데이터 영역")] public int Weight { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("설명"), TextArea(3, 10), BoxGroup("Json 데이터 영역")] public string Description { get; set; } diff --git a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs index 506e9e518..0d4566463 100644 --- a/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs +++ b/Assets/02.Scripts/Prop/Tycoon/LiquidBarrel.cs @@ -1,4 +1,5 @@ using System; +using BlueWater.Audios; using BlueWater.Utility; using Sirenix.OdinInspector; using UnityEngine; @@ -54,6 +55,9 @@ namespace BlueWater.Tycoons [SerializeField] private float _playerHoldingTime = 3f; + + [SerializeField] + private string _attackMoldSfxName = "AttackMold"; private bool _isPlayerInteracting; private int _currentLevel; @@ -121,6 +125,7 @@ namespace BlueWater.Tycoons } else { + AudioManager.Instance.PlaySfx(_attackMoldSfxName, true); GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = true; _isPlayerInteracting = true; } @@ -135,6 +140,7 @@ namespace BlueWater.Tycoons } else { + AudioManager.Instance.StopSfx(_attackMoldSfxName); GameManager.Instance.CurrentTycoonPlayer.IsCleaningMold = false; _isPlayerInteracting = false; HoldingElapsedTime = 0f; @@ -373,21 +379,27 @@ namespace BlueWater.Tycoons { case 0: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel0, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel0, false); break; case 1: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel1, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel1, false); break; case 2: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel2, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel2, false); break; case 3: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel3, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel3, false); break; case 4: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel4, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel4, false); break; case 5: SpineController.PlayAnimation(LiquidBarrelSpineAnimation.ChangeCleanLevel5, false); + SpineController.AddAnimation(LiquidBarrelSpineAnimation.IdleLevel5, false); break; default: throw new Exception("_currentLevel 존재하지 않는 값"); diff --git a/Assets/02.Scripts/Prop/Tycoon/Pump.cs b/Assets/02.Scripts/Prop/Tycoon/Pump.cs index 9b3e681a1..66c9e2bee 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Pump.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Pump.cs @@ -1,10 +1,17 @@ using System; +using BlueWater.Audios; using BlueWater.Players; using BlueWater.Uis; using UnityEngine; namespace BlueWater.Tycoons { + public static class PumpSpineAnimation + { + public const string Idle = "Idle"; + public const string Run = "Run"; + } + [Serializable] public class Pump : InteractionFurniture { @@ -23,6 +30,12 @@ namespace BlueWater.Tycoons [SerializeField, Range(0, 1000)] private int addedLiquid = 400; + [SerializeField] + private string _attackSfxName = "AttackWhip"; + + [SerializeField] + private string _playPumpSfxName = "PlayPump"; + private bool _isPlayerInteracting; protected override void Awake() @@ -36,7 +49,7 @@ namespace BlueWater.Tycoons { base.Start(); - _spineController.PlayAnimation("Idle", true); + _spineController.PlayAnimation(PumpSpineAnimation.Idle, true); } private void Update() @@ -72,16 +85,20 @@ namespace BlueWater.Tycoons public override void Interaction() { + AudioManager.Instance.PlaySfx(_attackSfxName, true); + AudioManager.Instance.PlaySfx(_playPumpSfxName, true); GameManager.Instance.CurrentTycoonPlayer.IsPumping = true; _isPlayerInteracting = true; - _spineController.PlayAnimation("Run", true); + _spineController.PlayAnimation(PumpSpineAnimation.Run, true); } public override void CancelInteraction() { + AudioManager.Instance.StopSfx(_attackSfxName); + AudioManager.Instance.StopSfx(_playPumpSfxName); GameManager.Instance.CurrentTycoonPlayer.IsPumping = false; _isPlayerInteracting = false; - _spineController.PlayAnimation("Idle", true); + _spineController.PlayAnimation(PumpSpineAnimation.Idle, true); } public override bool CanInteraction() diff --git a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs index f465b5806..8ba16205e 100644 --- a/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs +++ b/Assets/02.Scripts/Prop/Tycoon/RewardBox.cs @@ -9,6 +9,7 @@ namespace BlueWater.Tycoons [Serializable] public class RewardBox : InteractionFurniture { + [Title("참조")] [SerializeField] private AnimationController _animationController; diff --git a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs index 82f7633c2..74cb9576e 100644 --- a/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs +++ b/Assets/02.Scripts/Prop/Tycoon/ServingTable.cs @@ -1,5 +1,6 @@ using System; using System.Collections; +using BlueWater.Audios; using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Npcs.Crews; @@ -16,6 +17,9 @@ namespace BlueWater.Tycoons [FormerlySerializedAs("_cocktailGlassImage")] [SerializeField] protected SpriteRenderer CocktailGlassImage; + + [SerializeField] + private string _putDownSfxName = "PutDownCocktail"; // 서빙 테이블 기준 아이템이 있는지 없는지 private IPickup _currentPickupItem; @@ -78,6 +82,7 @@ namespace BlueWater.Tycoons // 테이블에 칵테일을 놓는 경우 else { + AudioManager.Instance.PlaySfx(_putDownSfxName); CurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem; CocktailGlassImage.sprite = CurrentPickupItem.Sprite; CocktailGlassImage.enabled = true; diff --git a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs index b419296d2..68d67de3d 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TableSeat.cs @@ -122,11 +122,8 @@ namespace BlueWater.Tycoons } } - if (_isCrewInteracting) - { - OnInteractionCompleted?.Invoke(); - OnInteractionCompleted = null; - } + OnInteractionCompleted?.Invoke(); + OnInteractionCompleted = null; EventManager.InvokeCleaningResult(true); CleanTable(); @@ -222,7 +219,7 @@ namespace BlueWater.Tycoons _currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); Food.sprite = _emptyBeerGlass; Food.enabled = true; - InteractionCanvas.BalloonUi.OrderItem(DataManager.Instance.SpriteDataSo.Cleaning, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); + InteractionCanvas.BalloonUi.OrderItem(0, TycoonManager.Instance.TycoonStageController.StageDataSo.DirtyTableWaitTime); IsCleaned = false; var crewController = TycoonManager.Instance.CrewController; diff --git a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs index 4f74e19c1..e856f5ad1 100644 --- a/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs +++ b/Assets/02.Scripts/Prop/Tycoon/TrashCan.cs @@ -1,4 +1,5 @@ using BlueWater.Audios; +using BlueWater.Interfaces; using BlueWater.Items; using BlueWater.Players; using UnityEngine; @@ -199,10 +200,17 @@ namespace BlueWater.Tycoons private void ChangeRandomCocktail() { - var randomCocktail = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); + IPickup playerCurrentPickupItem = CurrentTycoonPlayer.TycoonPickupHandler.CurrentPickupItem; + if (playerCurrentPickupItem != null) + { + CocktailData discardCocktailData = ItemManager.Instance.CocktailDataSo.GetDataByIdx(playerCurrentPickupItem.Idx); + EventManager.InvokeCocktailServedToCustomer(discardCocktailData, false); + } + + CocktailData randomCocktail = TycoonManager.Instance.TycoonIngredientController.GetRandomCocktailData(); EventManager.InvokeChangedRandomCocktail(randomCocktail); - InteractionCanvas.BalloonUi.OrderItem(DataManager.Instance.SpriteDataSo.Waiting, 0, - TycoonManager.Instance.TycoonStageController.StageDataSo.RandomChangeWaitTime); + EventManager.InvokeCocktailCompleted(randomCocktail, false); + InteractionCanvas.BalloonUi.OrderItem(0, TycoonManager.Instance.TycoonStageController.StageDataSo.RandomChangeWaitTime); HoldingElapsedTime = 0f; _canInteraction = false; diff --git a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs index c8e8edd5c..3098f4f86 100644 --- a/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs +++ b/Assets/02.Scripts/Prop/Tycoon/Vomiting.cs @@ -102,7 +102,7 @@ namespace BlueWater.Tycoons public void Initialize() { - InteractionCanvas.BalloonUi.OrderItem(DataManager.Instance.SpriteDataSo.Cleaning, 0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); + InteractionCanvas.BalloonUi.OrderItem(0, TycoonManager.Instance.TycoonStageController.StageDataSo.VomitingWaitTime); var crewController = TycoonManager.Instance.CrewController; Utils.StartUniqueCoroutine(this, ref _findCleanerCrewInstance, crewController.FindClosestCrewCoroutine(CenterTransform.position, crewController.CleanerCrews, crew => crew.OnMission(this))); @@ -134,11 +134,9 @@ namespace BlueWater.Tycoons { GameManager.Instance.CurrentTycoonPlayer.IsCleaningFloor = false; } - if (_isCrewInteracting) - { - OnInteractionCompleted?.Invoke(); - OnInteractionCompleted = null; - } + + OnInteractionCompleted?.Invoke(); + OnInteractionCompleted = null; Destroy(gameObject); } diff --git a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset index b330f70b7..ff3c00efb 100644 --- a/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset +++ b/Assets/02.Scripts/ScriptableObject/Audio/SfxData.asset @@ -91,7 +91,21 @@ MonoBehaviour: k__BackingField: {fileID: 8300000, guid: 9778d97789d1ea245a9d31c2ff915bb7, type: 3} - k__BackingField: GainGold k__BackingField: {fileID: 8300000, guid: f556df27b6add5a49979cc7a158f6110, type: 3} - - k__BackingField: RareRewardBox + - k__BackingField: OpenNormalRewardBox + k__BackingField: {fileID: 8300000, guid: 92cf41edb5694a04eb27847dae1b337f, type: 3} + - k__BackingField: OpenRareRewardBox k__BackingField: {fileID: 8300000, guid: 3f98ecaf35492e744bb4dc943e1a39b1, type: 3} - k__BackingField: SelectedButton01 k__BackingField: {fileID: 8300000, guid: 80adc41542bc901439938907231717a8, type: 3} + - k__BackingField: PlayChain + k__BackingField: {fileID: 8300000, guid: 2374925c2e5dd7e47bc214461e4b329d, type: 3} + - k__BackingField: Vomit + k__BackingField: {fileID: 8300000, guid: a2bebee4126e87746b5fc1a514ceb4a0, type: 3} + - k__BackingField: PlayPump + k__BackingField: {fileID: 8300000, guid: b532d80acad8e6e4e85dbca6096b071e, type: 3} + - k__BackingField: AttackWhip + k__BackingField: {fileID: 8300000, guid: d4b4534edc51fb141860a1b599eb6e53, type: 3} + - k__BackingField: PutDownCocktail + k__BackingField: {fileID: 8300000, guid: 0320fecde5b376f46a0ff9904e17fbc3, type: 3} + - k__BackingField: AttackMold + k__BackingField: {fileID: 8300000, guid: 603fde43ec110ee42bf61c41ca21a1fb, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset index cd6c68fe0..4f46598bb 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/LiquidDataTable.asset @@ -20,7 +20,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 99999 k__BackingField: {fileID: 21300000, guid: a8c45767f0a3ec245a47087c7ada2b50, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0.8018868, g: 0, b: 0.024826864, a: 1} - k__BackingField: LiquidB k__BackingField: k__BackingField: LiquidB @@ -28,7 +28,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 216cb30d7010e95499c22161ccfde634, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0.12156863, g: 1, b: 0, a: 1} - k__BackingField: LiquidC k__BackingField: k__BackingField: LiquidC @@ -36,7 +36,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 404e93e2e77f60b49bbcbf1df18904d3, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0, g: 0.23921569, b: 1, a: 1} - k__BackingField: LiquidD k__BackingField: k__BackingField: LiquidD @@ -44,7 +44,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: a575a803ef0529e43bcbbe8ccdbb34b2, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 1, g: 0, b: 0.6666667, a: 1} - k__BackingField: LiquidE k__BackingField: k__BackingField: LiquidE @@ -52,7 +52,7 @@ MonoBehaviour: k__BackingField: 1 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 2fc24dca6ce6ac94da0187dfce24fa3a, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0.9843137, g: 1, b: 0, a: 1} - k__BackingField: Garnish1 k__BackingField: k__BackingField: Garnish1 @@ -60,7 +60,7 @@ MonoBehaviour: k__BackingField: 2 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: ddde5976023f9be4e83dc3d867c2dc30, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0, g: 1, b: 1, a: 1} - k__BackingField: Garnish2 k__BackingField: k__BackingField: Garnish2 @@ -68,4 +68,4 @@ MonoBehaviour: k__BackingField: 2 k__BackingField: 2000 k__BackingField: {fileID: 21300000, guid: 1506abfb2ff26fa4aacdeb4b0efc9663, type: 3} - k__BackingField: {r: 0, g: 0, b: 0, a: 0} + k__BackingField: {r: 0.5019608, g: 0, b: 1, a: 1} diff --git a/Assets/02.Scripts/SpriteDataSo.cs b/Assets/02.Scripts/SpriteDataSo.cs index ad5243012..7fb109d41 100644 --- a/Assets/02.Scripts/SpriteDataSo.cs +++ b/Assets/02.Scripts/SpriteDataSo.cs @@ -24,6 +24,6 @@ namespace BlueWater public Sprite Waiting { get; private set; } [field: SerializeField] - public Sprite Cleaning { get; private set; } + public Sprite Dirty { get; private set; } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Tycoon/CardData.cs b/Assets/02.Scripts/Tycoon/CardData.cs index 9648bbbac..4df323c6c 100644 --- a/Assets/02.Scripts/Tycoon/CardData.cs +++ b/Assets/02.Scripts/Tycoon/CardData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -9,12 +10,15 @@ namespace BlueWater public class CardData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("Idx"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("Text"), BoxGroup("Json 데이터 영역")] public string ScriptText { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("최대 값"), BoxGroup("Json 데이터 영역")] public int Max { get; set; } diff --git a/Assets/02.Scripts/Tycoon/CardNormalData.cs b/Assets/02.Scripts/Tycoon/CardNormalData.cs index 837290335..b90f11490 100644 --- a/Assets/02.Scripts/Tycoon/CardNormalData.cs +++ b/Assets/02.Scripts/Tycoon/CardNormalData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -9,9 +10,11 @@ namespace BlueWater public class CardNormalData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("Idx"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("확률"), BoxGroup("Json 데이터 영역")] public int Ratio { get; set; } } diff --git a/Assets/02.Scripts/Tycoon/CardRareData.cs b/Assets/02.Scripts/Tycoon/CardRareData.cs index f2eda7ea8..8c12f2b07 100644 --- a/Assets/02.Scripts/Tycoon/CardRareData.cs +++ b/Assets/02.Scripts/Tycoon/CardRareData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -9,9 +10,11 @@ namespace BlueWater public class CardRareData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("Idx"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("확률"), BoxGroup("Json 데이터 영역")] public int Ratio { get; set; } } diff --git a/Assets/02.Scripts/Tycoon/CardShopData.cs b/Assets/02.Scripts/Tycoon/CardShopData.cs index 4c36a5fa1..e9a377a96 100644 --- a/Assets/02.Scripts/Tycoon/CardShopData.cs +++ b/Assets/02.Scripts/Tycoon/CardShopData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -9,12 +10,15 @@ namespace BlueWater public class CardShopData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("Idx"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("확률"), BoxGroup("Json 데이터 영역")] public int Ratio { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("가격"), BoxGroup("Json 데이터 영역")] public int Price { get; set; } } diff --git a/Assets/02.Scripts/Tycoon/LevelData.cs b/Assets/02.Scripts/Tycoon/LevelData.cs index 0e9525fbc..7e89af113 100644 --- a/Assets/02.Scripts/Tycoon/LevelData.cs +++ b/Assets/02.Scripts/Tycoon/LevelData.cs @@ -1,5 +1,6 @@ using System; using BlueWater.Interfaces; +using Newtonsoft.Json; using Sirenix.OdinInspector; using UnityEngine; @@ -15,36 +16,47 @@ namespace BlueWater public class LevelData : IIdx { [BoxGroup("Json 데이터 영역")] + [JsonProperty] [field: SerializeField, Tooltip("레벨"), BoxGroup("Json 데이터 영역")] public string Idx { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("손님 재입장 시간"), BoxGroup("Json 데이터 영역")] public int CustomerRespawn { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("기본 골드량"), BoxGroup("Json 데이터 영역")] public int Gold { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("기본 경험치량"), BoxGroup("Json 데이터 영역")] public int Exp { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("레벨업 요구 경험치량"), BoxGroup("Json 데이터 영역")] public int RequiredExp { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("얌전히 기다리는 시간"), BoxGroup("Json 데이터 영역")] public int WaitTime { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("재촉하는 시간 (게이지 활성화)"), BoxGroup("Json 데이터 영역")] public int HurryTime { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("먹는 시간"), BoxGroup("Json 데이터 영역")] public int EatingTime { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("업그레이드 목록"), BoxGroup("Json 데이터 영역")] public string OpenUpgrade { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("보물상자 종류"), BoxGroup("Json 데이터 영역")] public RewardBoxType RewardBoxType { get; set; } + [JsonProperty] [field: SerializeField, Tooltip("보물상자 가격"), BoxGroup("Json 데이터 영역")] public int RewardBoxPrice { get; set; } } diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index 56764509f..e5b2c3541 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using BlueWater.Uis; using Sirenix.OdinInspector; @@ -28,12 +29,15 @@ namespace BlueWater.Tycoons [ShowInInspector] public Dictionary SelectedCard { get; private set; } + private void Awake() + { + SelectedCard = new Dictionary(CardDataSo.GetDataCount()); + } + private void Start() { _tycoonManager = TycoonManager.Instance; _tycoonStatus = _tycoonManager.TycoonStatus; - - SelectedCard = new Dictionary(CardDataSo.GetDataCount()); } public TycoonCard CreateTycoonCard(Transform instantiateLocation = null) diff --git a/Assets/02.Scripts/Tycoon/TycoonStageController.cs b/Assets/02.Scripts/Tycoon/TycoonStageController.cs index 3ce83ec5a..6563f8008 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStageController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStageController.cs @@ -26,6 +26,7 @@ namespace BlueWater.Tycoons [SerializeField] private RewardBox _rareRewardBoxObject; + [ShowInInspector] public Dictionary InstanceCocktailDatas { get; private set; } = new(); private int _playerServingCount; diff --git a/Assets/02.Scripts/Tycoon/TycoonStatus.cs b/Assets/02.Scripts/Tycoon/TycoonStatus.cs index 3b673374d..2ff4c1bda 100644 --- a/Assets/02.Scripts/Tycoon/TycoonStatus.cs +++ b/Assets/02.Scripts/Tycoon/TycoonStatus.cs @@ -323,7 +323,7 @@ namespace BlueWater.Tycoons PlayerMoveSpeedMultiplier = GameManager.Instance.CurrentTycoonPlayer.TycoonMovement.MoveSpeedMultiplier; PlayerDashCooldownReduction = 0; TipMultiplier = 0f; - EndGoldMultiplier = 0.5f; + EndGoldMultiplier = 0f; _customerHurryTimeIncrease = 0; BarrelAutoIncrease = 0; ServerTipMultiplier = 0f; diff --git a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs index 66aeac769..e1f7ac1a2 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BalloonUi.cs @@ -92,7 +92,6 @@ namespace BlueWater.Uis private void SetEmpty() { - SetItemSprite(null); OrderCocktailData = null; _fillTween?.Kill(); } @@ -130,6 +129,16 @@ namespace BlueWater.Uis SetTween(waitTime, hurryTime, isReverse); } + + public void OrderItem(float waitTime, float hurryTime, bool isReverse = false) + { + _isOrdered = true; + _isWaitTimeOver = false; + _isItemReceived = false; + ShowUi(); + + SetTween(waitTime, hurryTime, isReverse); + } public void SetTween(float waitTime, float hurryTime, bool isReverse = false) { diff --git a/Assets/02.Scripts/Ui/Tycoon/BillUi.cs b/Assets/02.Scripts/Ui/Tycoon/BillUi.cs index dc195d1a7..3962e95d8 100644 --- a/Assets/02.Scripts/Ui/Tycoon/BillUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/BillUi.cs @@ -2,6 +2,7 @@ using System; using System.Collections; using System.Collections.Generic; using System.Linq; +using BlueWater.Audios; using BlueWater.Npcs.Customers; using BlueWater.Utility; using Sirenix.OdinInspector; @@ -19,6 +20,9 @@ namespace BlueWater.Uis [SerializeField] private SkeletonGraphic _chain; + [SerializeField] + private string playChainSfxName = "PlayChain"; + [Title("계산서")] [SerializeField] private Vector3 _spawnPosition; @@ -100,6 +104,7 @@ namespace BlueWater.Uis private void PlayChainAnimation() { + AudioManager.Instance.PlaySfx(playChainSfxName); _chain.AnimationState.SetAnimation(0, Move, true); _isMovedChain = true; } @@ -132,6 +137,7 @@ namespace BlueWater.Uis yield return null; } + AudioManager.Instance.StopSfx(playChainSfxName); _chain.AnimationState.ClearTrack(0); _isMovedChain = false; _isActivating = false; diff --git a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs index 3d6865366..ca96de926 100644 --- a/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs +++ b/Assets/02.Scripts/Ui/Tycoon/ManualBook.cs @@ -70,6 +70,16 @@ namespace BlueWater.Uis private void Awake() { + _cocktailRecipeButtons = transform.GetComponentsInChildren(true).ToList(); + + foreach (var element in _cocktailRecipeButtons) + { + element.Initialize(); + element.AddSelectedAction(SelectItem); + } + + _craftingIngredients = _craftingContents.GetComponentsInChildren(true).ToList(); + EventManager.OnLevelUp += UpdateManualBook; LocalizationSettings.SelectedLocaleChanged += OnChangedLocale; } @@ -85,16 +95,6 @@ namespace BlueWater.Uis _openManualBookAction.performed += OnOpen; - _cocktailRecipeButtons = transform.GetComponentsInChildren(true).ToList(); - - foreach (var element in _cocktailRecipeButtons) - { - element.Initialize(); - element.AddSelectedAction(SelectItem); - } - - _craftingIngredients = _craftingContents.GetComponentsInChildren(true).ToList(); - uiEventsController.SetSelectObject(_cocktailRecipeButtons[0].gameObject); EventSystem.current.SetSelectedGameObject(uiEventsController.SelectObject); } @@ -124,7 +124,7 @@ namespace BlueWater.Uis if (_selectedCocktailRecipeButton != null) { _selectedCocktailName.text = Utils.GetLocalizedString(_selectedCocktailRecipeButton.CocktailData.Idx); - _ratioRange.text = $"{Utils.GetLocalizedString("MarginOfError")} : {_selectedCocktailRecipeButton.CocktailData.RatioRange}"; + _ratioRange.text = $"{Utils.GetLocalizedString("MarginOfError")} : {_selectedCocktailRecipeButton.CocktailData.RatioRange}%"; StringBuilder stringBuilder = new StringBuilder(); stringBuilder.Append($"{_selectedCocktailRecipeButton.CocktailData.Idx}Description"); _selectedCocktailDescription.text = Utils.GetLocalizedString(stringBuilder.ToString()); @@ -229,7 +229,7 @@ namespace BlueWater.Uis _selectedCocktailName.text = Utils.GetLocalizedString(_selectedCocktailRecipeButton.CocktailData.Idx); _selectedCocktailImage.sprite = _selectedCocktailRecipeButton.CocktailData.Sprite; - _ratioRange.text = $"{Utils.GetLocalizedString("MarginOfError")} : {_selectedCocktailRecipeButton.CocktailData.RatioRange}"; + _ratioRange.text = $"{Utils.GetLocalizedString("MarginOfError")} : {_selectedCocktailRecipeButton.CocktailData.RatioRange}%"; StringBuilder stringBuilder = new StringBuilder(); stringBuilder.Append($"{_selectedCocktailRecipeButton.CocktailData.Idx}Description"); _selectedCocktailDescription.text = Utils.GetLocalizedString(stringBuilder.ToString()); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index 9e90bf2da..1e74b6193 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -25,7 +25,7 @@ namespace BlueWater.Uis private Vector3 _cardLocalScale_5 = new(0.65f, 0.65f, 1f); [SerializeField] - private string _openSfxName = "RareRewardBox"; + private string _openSfxName = "OpenRareRewardBox"; [SerializeField] private Button allOpenCardButton; @@ -61,8 +61,8 @@ namespace BlueWater.Uis public override void Open() { - VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); AudioManager.Instance.PlaySfx(_openSfxName, ignoreTimeScale: true); + VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); _panel.SetActive(true); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs index 18d712640..49102d929 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonResultUi.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using BlueWater.Npcs.Customers; using BlueWater.Tycoons; using BlueWater.Utility; using UnityEngine; @@ -417,7 +416,12 @@ namespace BlueWater.Uis _tipGainedText.text = _tipGained.ToString("N0"); _goldSpentText.text = _goldSpent.ToString("N0"); _totalGoldText.text = $"{Utils.GetLocalizedString("TotalGold")} : {ES3.Load(SaveData.EndGold, 0):N0}"; - _minusPercentText.text = $"- {Mathf.RoundToInt((1f - TycoonManager.Instance.TycoonStatus.EndGoldMultiplier) * 100)}%"; + + float endGoldMultiplier = -0.5f + TycoonManager.Instance.TycoonStatus.EndGoldMultiplier; + int percent = Mathf.RoundToInt(endGoldMultiplier * 100); + char sign = percent >= 0 ? '+' : '-'; + _minusPercentText.color = percent >= 0 ? Color.blue : Color.red; + _minusPercentText.text = $"{sign} {percent}%"; } [Button("결과 즉시 테스트")] diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index b5ddff423..fe5cb264d 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using BlueWater.Audios; using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; @@ -15,6 +16,9 @@ namespace BlueWater.Uis [SerializeField] private Transform _contents; + + [SerializeField] + private string _openSfxName = "OpenNormalRewardBox"; private List _tycoonCards = new(3); @@ -39,6 +43,7 @@ namespace BlueWater.Uis public override void Open() { + AudioManager.Instance.PlaySfx(_openSfxName, ignoreTimeScale: true); VisualFeedbackManager.Instance.SetBaseTimeScale(0.0f); PlayerInputKeyManager.Instance.SwitchCurrentActionMap(InputActionMaps.TycoonUi); PopupUiController.RegisterPopup(this); diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs index 4761fe698..a2891596e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonStageUi.cs @@ -80,7 +80,7 @@ namespace BlueWater.Uis // Methods #region Methods - public async void TycoonOpenUi() + public void TycoonOpenUi() { _openUiStartTween = _openUiImage.transform.DOScale(1f, 0.3f) .From(0f) diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs index ec24929dd..7f0e98cbf 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonUiManager.cs @@ -1,6 +1,8 @@ +using System.Collections.Generic; using DG.Tweening; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.EventSystems; using UnityEngine.UI; namespace BlueWater.Uis @@ -18,6 +20,16 @@ namespace BlueWater.Uis [SerializeField] private Image _fadeImage; + + [Title("테스트")] + [SerializeField] + private bool _isUiClickTest; + + [SerializeField] + private GraphicRaycaster _raycaster; + + [SerializeField] + private EventSystem _eventSystem; #endregion @@ -33,6 +45,46 @@ namespace BlueWater.Uis { EventManager.OnFadeInOut += FadeInOut; } + + private void Update() + { + if (!_isUiClickTest) return; + + if (Input.GetMouseButtonDown(0)) + { + // 1. UI Raycast + PointerEventData pointerData = new PointerEventData(_eventSystem) + { + position = Input.mousePosition + }; + + List uiResults = new List(); + _raycaster.Raycast(pointerData, uiResults); + + if (uiResults.Count > 0) + { + Debug.Log($"Clicked on UI: {uiResults[0].gameObject.name}"); + return; + } + + // 2. 3D Raycast + Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); + if (Physics.Raycast(ray, out RaycastHit hit)) + { + Debug.Log($"Clicked on 3D Object: {hit.collider.gameObject.name}"); + return; + } + + // 3. 2D Raycast + Vector2 mousePosition = Camera.main.ScreenToWorldPoint(Input.mousePosition); + RaycastHit2D hit2D = Physics2D.Raycast(mousePosition, Vector2.zero); + + if (hit2D.collider != null) + { + Debug.Log($"Clicked on 2D Object: {hit2D.collider.gameObject.name}"); + } + } + } private void OnDestroy() { diff --git a/Assets/03.Images/Ui/Tycoon/ManualBook/CocktailRecipeType4.png b/Assets/03.Images/Ui/Tycoon/ManualBook/CocktailRecipeType4.png index 50007a64f..ae971c562 100644 Binary files a/Assets/03.Images/Ui/Tycoon/ManualBook/CocktailRecipeType4.png and b/Assets/03.Images/Ui/Tycoon/ManualBook/CocktailRecipeType4.png differ diff --git a/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png b/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png new file mode 100644 index 000000000..384972336 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png differ diff --git a/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png.meta b/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png.meta new file mode 100644 index 000000000..65a9cc91b --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/ManualBook/GarnishIcon.png.meta @@ -0,0 +1,166 @@ +fileFormatVersion: 2 +guid: fd7c7a3fb4faf594787e004138691965 +TextureImporter: + internalIDToNameTable: [] + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: GarnishIcon_0 + rect: + serializedVersion: 2 + x: 42 + y: 44 + width: 42 + height: 41 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 46a548f72023b904099f754086ee7d9b + internalID: -299706786 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: + GarnishIcon_0: -299706786 + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png b/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png new file mode 100644 index 000000000..a30271aa8 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png differ diff --git a/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png.meta b/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png.meta new file mode 100644 index 000000000..076b89822 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/TrashCanWhite.png.meta @@ -0,0 +1,143 @@ +fileFormatVersion: 2 +guid: 48d6fc4ad3142af4cb4e687ea5c9fb73 +TextureImporter: + internalIDToNameTable: [] + 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: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 256 + 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 + - serializedVersion: 4 + buildTarget: WindowsStoreApps + 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: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Characters/TycoonPlayer.mat b/Assets/04.Materials/Characters/TycoonPlayer.mat new file mode 100644 index 000000000..7fee0011b --- /dev/null +++ b/Assets/04.Materials/Characters/TycoonPlayer.mat @@ -0,0 +1,149 @@ +%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: TycoonPlayer + m_Shader: {fileID: -6465566751694194690, guid: 8f16ff0e59234ef45b2fe65b282f6ff7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 3000 + stringTagMap: {} + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: _IsHit + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 204779ef72f790b418c77b89042f080b, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaClipThreshold: 0.2 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _CastShadows: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DissolveValue: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _GlowSize: 0 + - _IsHit: 0 + - _IsSeeThrough: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Opacity: 0.7 + - _Parallax: 0.005 + - _QueueControl: 0 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Size: 0 + - _Smoothness: 0.8 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZTest: 4 + - _ZWrite: 1 + - _ZWriteControl: 0 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FlashColor: {r: 1, g: 1, b: 1, a: 1} + - _GlowColor: {r: 5.3403134, g: 5.3403134, b: 0, a: 0} + - _PlayerPosition: {r: 0.5, g: 0.55, b: 0, a: 0} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &3929801182760292753 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/04.Materials/Characters/TycoonPlayer.mat.meta b/Assets/04.Materials/Characters/TycoonPlayer.mat.meta new file mode 100644 index 000000000..6ba7469bc --- /dev/null +++ b/Assets/04.Materials/Characters/TycoonPlayer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 438948b549694ad49b234849e64d1e9e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat index c0eaa457b..242ab804c 100644 --- a/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/BarrelOutlineUnlit.mat @@ -104,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat index 63ea58fe1..a3aa7d6ef 100644 --- a/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/CustomerOutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -103,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat index 9b6a7235a..1efa8630e 100644 --- a/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/LimeTreeGarnishOutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -103,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/04.Materials/Outline/PumpOutlineUnlit.mat b/Assets/04.Materials/Outline/PumpOutlineUnlit.mat index 9ba3e98d3..2883736e2 100644 --- a/Assets/04.Materials/Outline/PumpOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/PumpOutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -103,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat index f2cd5c66c..c8a6bd379 100644 --- a/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/SlimeGarnishOutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -103,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/04.Materials/Outline/TrashCanOutlineUnlit.mat b/Assets/04.Materials/Outline/TrashCanOutlineUnlit.mat index 58e5b0afc..5821dd73b 100644 --- a/Assets/04.Materials/Outline/TrashCanOutlineUnlit.mat +++ b/Assets/04.Materials/Outline/TrashCanOutlineUnlit.mat @@ -84,6 +84,7 @@ Material: m_Floats: - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 + - _AlphaThreshold: 0.5 - _AlphaToMask: 0 - _Blend: 0 - _BlendModePreserveSpecular: 1 @@ -103,7 +104,7 @@ Material: - _Glossiness: 0 - _GlossyReflections: 0 - _ISCORNER: 0 - - _IsCorner: 0 + - _IsCorner: 1 - _Metallic: 0 - _OcclusionStrength: 1 - _OutlineMipLevel: 0 diff --git a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab index 706d1c177..5cd265e55 100644 --- a/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab +++ b/Assets/05.Prefabs/Characters/Players/TycoonPlayer.prefab @@ -12,6 +12,7 @@ GameObject: - component: {fileID: 6379312009059766371} - component: {fileID: 5910700114136101566} - component: {fileID: 7125556968546628472} + - component: {fileID: 8088939600092576343} - component: {fileID: 4764720756731101052} m_Layer: 9 m_Name: VisualLook @@ -67,7 +68,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} + - {fileID: 2100000, guid: 438948b549694ad49b234849e64d1e9e, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -132,6 +133,24 @@ MonoBehaviour: _animationName: Idle loop: 1 timeScale: 1 +--- !u!114 &8088939600092576343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 569530817952539991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 26947ae098a8447408d80c0c86e35b48, type: 3} + m_Name: + m_EditorClassIdentifier: + skeletonRenderer: {fileID: 7125556968546628472} + customSlotMaterials: [] + customMaterialOverrides: + - overrideDisabled: 0 + originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} + replacementMaterial: {fileID: 2100000, guid: 438948b549694ad49b234849e64d1e9e, type: 2} --- !u!210 &4764720756731101052 SortingGroup: m_ObjectHideFlags: 0 @@ -337,7 +356,6 @@ MonoBehaviour: m_EditorClassIdentifier: k__BackingField: {fileID: 6925146187533612706} k__BackingField: {fileID: 2935942385829016914} - k__BackingField: {fileID: 0} k__BackingField: {fileID: 6509241874729291456} k__BackingField: {fileID: 7125556968546628472} k__BackingField: {fileID: 56698895639349130} @@ -361,7 +379,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: k__BackingField: {fileID: 7125556968546628472} - _originalMaterial: {fileID: 0} + _originalMaterial: {fileID: 2100000, guid: 288333d9c9df2d84cadf3b48d918ebdb, type: 2} _replacementMaterial: {fileID: 0} _initialSkinName: Basic _isRandomSkin: 0 @@ -380,11 +398,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ff2dc3fa7a6be445bf8e71043f86d2e, type: 3} m_Name: m_EditorClassIdentifier: - _spriteRenderer: {fileID: 5527707380059080408} k__BackingField: 4 k__BackingField: 4 k__BackingField: 0 k__BackingField: 0 + _isShaking: 1 + _shakingPower: 1 + _shakingDuration: 0.25 + attackedSfxName: CombatPlayerAttacked heartRecoverySfxName: HeartRecovery --- !u!114 &1674052485383758547 MonoBehaviour: diff --git a/Assets/05.Prefabs/Managers/LocalizationManager.prefab b/Assets/05.Prefabs/Managers/LocalizationManager.prefab index 3d3bf1f78..7168b5132 100644 --- a/Assets/05.Prefabs/Managers/LocalizationManager.prefab +++ b/Assets/05.Prefabs/Managers/LocalizationManager.prefab @@ -49,5 +49,5 @@ MonoBehaviour: _usedFontMaterials: - {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2} - {fileID: 2100000, guid: 12575fbfb1a20814aae86a588932b912, type: 2} - _defaultOutlineSize: 0.4 + _defaultOutlineSize: 0.2 _chineseOutlineSize: 0.05 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab index b80265fd0..c90909f4f 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Mushroom.prefab @@ -199,7 +199,7 @@ PrefabInstance: - target: {fileID: 8780093359852370517, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: dab2a247be6173643860ce5c7632e734, type: 3} + objectReference: {fileID: 21300000, guid: 66f1c43fd7b6b494c9c2ccb5b437122d, type: 3} - target: {fileID: 9047629830516719732, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab index 161f84ec0..7d4541178 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/TrashCan.prefab @@ -175,7 +175,7 @@ PrefabInstance: - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: bef7d0464ba595c48b2d3269a15e331a, type: 3} + objectReference: {fileID: 21300000, guid: 48d6fc4ad3142af4cb4e687ea5c9fb73, type: 3} - target: {fileID: 5953080908505751474, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 0 diff --git a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab index 0296c9445..b51912a77 100644 --- a/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab +++ b/Assets/05.Prefabs/Props/Furniture/Interactions/Vomiting.prefab @@ -79,7 +79,7 @@ PrefabInstance: - target: {fileID: 3779548209033231211, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: e2da613ab7d3fe94c801ea12e08ee54d, type: 3} + objectReference: {fileID: 21300000, guid: d2e854d9e991e8e44a308e02390cf441, type: 3} - target: {fileID: 5024482427928425524, guid: 3f9f846a7f237924e97c9acf370d991d, type: 3} propertyPath: m_IsActive value: 1 diff --git a/Assets/05.Prefabs/Uis/Tycoons/CraftingIngredient.prefab b/Assets/05.Prefabs/Uis/Tycoons/CraftingIngredient.prefab index 75fa5fad1..e38940991 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/CraftingIngredient.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/CraftingIngredient.prefab @@ -194,7 +194,7 @@ MonoBehaviour: _liquidText: {fileID: 6864126811145481680} _ratioText: {fileID: 373231903261848343} _liquidTypeSprite: {fileID: -2003835345, guid: ee35006156d5e234c9769b6b6c2f5b1f, type: 3} - _garnishTypeSprite: {fileID: 0} + _garnishTypeSprite: {fileID: -299706786, guid: fd7c7a3fb4faf594787e004138691965, type: 3} --- !u!1 &2225133626707228621 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3 new file mode 100644 index 000000000..a98347a60 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3.meta new file mode 100644 index 000000000..cfd17391d --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Box_Open.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 92cf41edb5694a04eb27847dae1b337f +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3 new file mode 100644 index 000000000..0abb91a24 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3.meta new file mode 100644 index 000000000..766327c00 --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Chain_1.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2374925c2e5dd7e47bc214461e4b329d +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3 new file mode 100644 index 000000000..0cddd9ba0 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3.meta new file mode 100644 index 000000000..f67086f03 --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Glass_Table.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 0320fecde5b376f46a0ff9904e17fbc3 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3 new file mode 100644 index 000000000..809c5b612 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3.meta new file mode 100644 index 000000000..dcee8feb9 --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Vomiting.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: a2bebee4126e87746b5fc1a514ceb4a0 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3 new file mode 100644 index 000000000..dbaedac8d Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3.meta new file mode 100644 index 000000000..71933042b --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wheel.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: b532d80acad8e6e4e85dbca6096b071e +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3 new file mode 100644 index 000000000..0534edf26 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3.meta new file mode 100644 index 000000000..bcd155714 --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Whip.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: d4b4534edc51fb141860a1b599eb6e53 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3 b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3 new file mode 100644 index 000000000..184c6bef6 Binary files /dev/null and b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3 differ diff --git a/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3.meta b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3.meta new file mode 100644 index 000000000..c1ab761e2 --- /dev/null +++ b/Assets/06.Sounds/Sfx/Tycoon/SFX_Wood_Attack.mp3.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 603fde43ec110ee42bf61c41ca21a1fb +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/09.Shaders/SpineCharacterLit.shadergraph b/Assets/09.Shaders/SpineCharacterLit.shadergraph index 385795521..d1e7d512f 100644 --- a/Assets/09.Shaders/SpineCharacterLit.shadergraph +++ b/Assets/09.Shaders/SpineCharacterLit.shadergraph @@ -2151,8 +2151,8 @@ "y": 1.0 }, "m_DefaultValue": { - "x": 0.0, - "y": 0.0 + "x": -1.0, + "y": 1.0 }, "m_Labels": [] } @@ -2924,8 +2924,8 @@ "y": 1.0 }, "m_DefaultValue": { - "x": 0.0, - "y": 0.0 + "x": 1.0, + "y": 1.0 }, "m_Labels": [] } @@ -5091,7 +5091,7 @@ }, "m_DefaultValue": { "x": 0.0, - "y": 0.0 + "y": 1.0 }, "m_Labels": [] } diff --git a/Assets/09.Shaders/TycoonPlayer.shadergraph b/Assets/09.Shaders/TycoonPlayer.shadergraph new file mode 100644 index 000000000..6d915e72d --- /dev/null +++ b/Assets/09.Shaders/TycoonPlayer.shadergraph @@ -0,0 +1,2059 @@ +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.GraphData", + "m_ObjectId": "1ace22089b8f4d4694170df3f4254de7", + "m_Properties": [ + { + "m_Id": "6d80d18840704f5099845b51dea9249f" + }, + { + "m_Id": "d045f0768c1549afa79ddfb40ea2703f" + }, + { + "m_Id": "ed5247b3b3a942648a9680bd4f86d3ab" + }, + { + "m_Id": "f5ca84220f074269a1fa5d448414668c" + }, + { + "m_Id": "3191f2dfb37b4e618ccc086923089dc3" + } + ], + "m_Keywords": [], + "m_Dropdowns": [], + "m_CategoryData": [ + { + "m_Id": "cdac0120fe0a470f8baa138f6389776d" + } + ], + "m_Nodes": [ + { + "m_Id": "c990c883a9fe4b739f070876ce792c41" + }, + { + "m_Id": "1b5cd0d45acc48a38f02e1c49a04869d" + }, + { + "m_Id": "a29da171b3934a5db9671039f6c9684e" + }, + { + "m_Id": "ab7878bc7d4f42b6b293f214decbca41" + }, + { + "m_Id": "1cc9d40d2a1f44d7977540fa0a76b104" + }, + { + "m_Id": "1f988718310d4e98a7017217b58b9623" + }, + { + "m_Id": "fa0aa14897a649d98c23c2eb134bd9a3" + }, + { + "m_Id": "84b1e58a432941288ebbccd6ebd53f37" + }, + { + "m_Id": "10bd751fec864975a072b248a8e60517" + }, + { + "m_Id": "463a74a931a84108b6e27fa1d62ebb56" + }, + { + "m_Id": "2806c6dba0b04739a91a6b76407792f1" + }, + { + "m_Id": "2119d8a30f29450da57e88a0b4254f60" + }, + { + "m_Id": "9a7abb4b4ea848628506d3fc5a48f14d" + }, + { + "m_Id": "07080edc078641fab474c8eacc0bce06" + }, + { + "m_Id": "c81c0a9ba40543edac482d30e5801ea5" + }, + { + "m_Id": "d58621f15478478f9803e150fd2e9b19" + }, + { + "m_Id": "a73c81c1c69b4301a2a3d40079d7d0a3" + }, + { + "m_Id": "f27f1b1956d24c2cad488e39195b5d30" + }, + { + "m_Id": "9041b46e52b841f5b6b165cca092a6b0" + }, + { + "m_Id": "4b64f48914c84f8ebfb83d63460ded04" + } + ], + "m_GroupDatas": [ + { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + } + ], + "m_StickyNoteDatas": [], + "m_Edges": [ + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "07080edc078641fab474c8eacc0bce06" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "9a7abb4b4ea848628506d3fc5a48f14d" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "10bd751fec864975a072b248a8e60517" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "84b1e58a432941288ebbccd6ebd53f37" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2119d8a30f29450da57e88a0b4254f60" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "463a74a931a84108b6e27fa1d62ebb56" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "2806c6dba0b04739a91a6b76407792f1" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "463a74a931a84108b6e27fa1d62ebb56" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "463a74a931a84108b6e27fa1d62ebb56" + }, + "m_SlotId": 3 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "1f988718310d4e98a7017217b58b9623" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "4b64f48914c84f8ebfb83d63460ded04" + }, + "m_SlotId": 4 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "fa0aa14897a649d98c23c2eb134bd9a3" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "84b1e58a432941288ebbccd6ebd53f37" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d58621f15478478f9803e150fd2e9b19" + }, + "m_SlotId": 1 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "c81c0a9ba40543edac482d30e5801ea5" + }, + "m_SlotId": 0 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "d58621f15478478f9803e150fd2e9b19" + }, + "m_SlotId": 0 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d58621f15478478f9803e150fd2e9b19" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "463a74a931a84108b6e27fa1d62ebb56" + }, + "m_SlotId": 2 + } + }, + { + "m_OutputSlot": { + "m_Node": { + "m_Id": "d58621f15478478f9803e150fd2e9b19" + }, + "m_SlotId": 2 + }, + "m_InputSlot": { + "m_Node": { + "m_Id": "4b64f48914c84f8ebfb83d63460ded04" + }, + "m_SlotId": 0 + } + } + ], + "m_VertexContext": { + "m_Position": { + "x": 0.0, + "y": 0.0 + }, + "m_Blocks": [ + { + "m_Id": "c990c883a9fe4b739f070876ce792c41" + }, + { + "m_Id": "1b5cd0d45acc48a38f02e1c49a04869d" + }, + { + "m_Id": "a29da171b3934a5db9671039f6c9684e" + } + ] + }, + "m_FragmentContext": { + "m_Position": { + "x": 0.0, + "y": 200.0 + }, + "m_Blocks": [ + { + "m_Id": "ab7878bc7d4f42b6b293f214decbca41" + }, + { + "m_Id": "1cc9d40d2a1f44d7977540fa0a76b104" + }, + { + "m_Id": "1f988718310d4e98a7017217b58b9623" + }, + { + "m_Id": "fa0aa14897a649d98c23c2eb134bd9a3" + }, + { + "m_Id": "9a7abb4b4ea848628506d3fc5a48f14d" + }, + { + "m_Id": "a73c81c1c69b4301a2a3d40079d7d0a3" + }, + { + "m_Id": "f27f1b1956d24c2cad488e39195b5d30" + }, + { + "m_Id": "9041b46e52b841f5b6b165cca092a6b0" + } + ] + }, + "m_PreviewData": { + "serializedMesh": { + "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "preventRotation": false + }, + "m_Path": "Shader Graphs", + "m_GraphPrecision": 1, + "m_PreviewMode": 2, + "m_OutputNode": { + "m_Id": "" + }, + "m_SubDatas": [], + "m_ActiveTargets": [ + { + "m_Id": "0275f79acc9f44edbf7b330370366bd5" + } + ] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "01e859d6d67e4996bc5bbce4959d9594", + "m_Id": 0, + "m_DisplayName": "AlphaClipThreshold", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget", + "m_ObjectId": "0275f79acc9f44edbf7b330370366bd5", + "m_Datas": [], + "m_ActiveSubTarget": { + "m_Id": "9628f46d0c894a39b1c0f9df5ef6750d" + }, + "m_AllowMaterialOverride": false, + "m_SurfaceType": 1, + "m_ZTestMode": 4, + "m_ZWriteControl": 0, + "m_AlphaMode": 0, + "m_RenderFace": 0, + "m_AlphaClip": true, + "m_CastShadows": true, + "m_ReceiveShadows": true, + "m_DisableTint": false, + "m_AdditionalMotionVectorMode": 0, + "m_AlembicMotionVectors": false, + "m_SupportsLODCrossFade": false, + "m_CustomEditorGUI": "", + "m_SupportVFX": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "07080edc078641fab474c8eacc0bce06", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -207.0, + "y": 525.0, + "width": 177.0000457763672, + "height": 34.00006103515625 + } + }, + "m_Slots": [ + { + "m_Id": "01e859d6d67e4996bc5bbce4959d9594" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "f5ca84220f074269a1fa5d448414668c" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "0e1bd4f375df4e1395539fba88538959", + "m_Id": 3, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "0fd1923a01954f08a59306c5f612b0eb", + "m_Id": 1, + "m_DisplayName": "B", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 3, + "m_Value": { + "e00": 2.0, + "e01": 2.0, + "e02": 2.0, + "e03": 2.0, + "e10": 2.0, + "e11": 2.0, + "e12": 2.0, + "e13": 2.0, + "e20": 2.0, + "e21": 2.0, + "e22": 2.0, + "e23": 2.0, + "e30": 2.0, + "e31": 2.0, + "e32": 2.0, + "e33": 2.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "10bd751fec864975a072b248a8e60517", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1757.0, + "y": 257.0000305175781, + "width": 126.9998779296875, + "height": 34.000030517578128 + } + }, + "m_Slots": [ + { + "m_Id": "bdc4e60a8bd74d56b544a8e46bc3bccb" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "6d80d18840704f5099845b51dea9249f" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "157dcbd9674e493498633210818234cf", + "m_Id": 2, + "m_DisplayName": "False", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "False", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "185e7cb44bee45bf8bd9a1a543d737a5", + "m_Id": 0, + "m_DisplayName": "FlashColor", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1b5cd0d45acc48a38f02e1c49a04869d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Normal", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "e81d1f4612fc4ba6b11b6909a9825ab6" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Normal" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1cc9d40d2a1f44d7977540fa0a76b104", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Smoothness", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b14b317853014c05a4a7b422da8f5d25" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Smoothness" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "1f988718310d4e98a7017217b58b9623", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Emission", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "2116a680a42442aaaaadc609b26298a0" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Emission" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "20a8735902ce4877a140abddfd3c25a2", + "m_Id": 0, + "m_DisplayName": "Predicate", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Predicate", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "2116a680a42442aaaaadc609b26298a0", + "m_Id": 0, + "m_DisplayName": "Emission", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Emission", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 1, + "m_DefaultColor": { + "r": 0.0, + "g": 0.0, + "b": 0.0, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2119d8a30f29450da57e88a0b4254f60", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1089.0001220703125, + "y": 58.00000762939453, + "width": 133.00006103515626, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "185e7cb44bee45bf8bd9a1a543d737a5" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "d045f0768c1549afa79ddfb40ea2703f" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "220387ae6bab44bc8ed5420036461811", + "m_Id": 1, + "m_DisplayName": "True", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "True", + "m_StageCapability": 3, + "m_Value": { + "x": 1.0, + "y": 1.0, + "z": 1.0, + "w": 1.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "2806c6dba0b04739a91a6b76407792f1", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -936.0000610351563, + "y": 58.00000762939453, + "width": 101.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "a898a5507f7a42ceb6bebf295885aec7" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "ed5247b3b3a942648a9680bd4f86d3ab" + } +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "3191f2dfb37b4e618ccc086923089dc3", + "m_Guid": { + "m_GuidSerialized": "411197ef-57ad-429a-9eee-599ed31a542d" + }, + "m_Name": "Color", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "Color", + "m_DefaultReferenceName": "_Color", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "333b2e67831e4c998cf155043ae60e73", + "m_Id": 2, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "4593752c25244280be53b99a3912a258", + "m_Id": 7, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BranchNode", + "m_ObjectId": "463a74a931a84108b6e27fa1d62ebb56", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Branch", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -936.0000610351563, + "y": 92.00000762939453, + "width": 208.0, + "height": 326.0 + } + }, + "m_Slots": [ + { + "m_Id": "20a8735902ce4877a140abddfd3c25a2" + }, + { + "m_Id": "220387ae6bab44bc8ed5420036461811" + }, + { + "m_Id": "157dcbd9674e493498633210818234cf" + }, + { + "m_Id": "e0b570dad488444e925107ac313971ba" + } + ], + "synonyms": [ + "switch", + "if", + "else" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot", + "m_ObjectId": "495c27d21b304811ad4a11eaadec4aab", + "m_Id": 2, + "m_DisplayName": "UV", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "UV", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0 + }, + "m_Labels": [], + "m_Channel": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "49c94fccb3184fdbb7d18a40fb4847ed", + "m_Id": 1, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SplitNode", + "m_ObjectId": "4b64f48914c84f8ebfb83d63460ded04", + "m_Group": { + "m_Id": "" + }, + "m_Name": "Split", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -944.6207275390625, + "y": 585.3792724609375, + "width": 120.0, + "height": 149.0 + } + }, + "m_Slots": [ + { + "m_Id": "5991f3aa0b0547f9a22befe570b5d159" + }, + { + "m_Id": "49c94fccb3184fdbb7d18a40fb4847ed" + }, + { + "m_Id": "333b2e67831e4c998cf155043ae60e73" + }, + { + "m_Id": "0e1bd4f375df4e1395539fba88538959" + }, + { + "m_Id": "f1505348d740485e95defb5ec2b20b21" + } + ], + "synonyms": [ + "separate" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "5991f3aa0b0547f9a22befe570b5d159", + "m_Id": 0, + "m_DisplayName": "In", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "In", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "5f67f001bbab4a1ab81bd551a87a5ed4", + "m_Id": 4, + "m_DisplayName": "R", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "R", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "65e6fb42fd314028a4e30623a037ba8a", + "m_Id": 0, + "m_DisplayName": "Specular Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Specular", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty", + "m_ObjectId": "6d80d18840704f5099845b51dea9249f", + "m_Guid": { + "m_GuidSerialized": "841c516d-97db-4d91-a8eb-97c9ba5a4b93" + }, + "m_Name": "MainTex", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "MainTex", + "m_DefaultReferenceName": "_MainTex", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "isMainTexture": false, + "useTilingAndOffset": false, + "m_Modifiable": true, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot", + "m_ObjectId": "73e082254b95435daa160512ab58210a", + "m_Id": 0, + "m_DisplayName": "Position", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Position", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "76c58a6549c94e9aa6698f0b34a2b167", + "m_Id": 5, + "m_DisplayName": "G", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "G", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "7a111df59b8449e4a1d731a6b81c2c63", + "m_Id": 0, + "m_DisplayName": "RGBA", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "RGBA", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot", + "m_ObjectId": "7f4f7179425348739aedab3c5a5bd270", + "m_Id": 0, + "m_DisplayName": "Color", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode", + "m_ObjectId": "84b1e58a432941288ebbccd6ebd53f37", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Sample Texture 2D", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1757.0, + "y": 291.00006103515627, + "width": 207.9998779296875, + "height": 434.99993896484377 + } + }, + "m_Slots": [ + { + "m_Id": "7a111df59b8449e4a1d731a6b81c2c63" + }, + { + "m_Id": "5f67f001bbab4a1ab81bd551a87a5ed4" + }, + { + "m_Id": "76c58a6549c94e9aa6698f0b34a2b167" + }, + { + "m_Id": "a5683e72d08b475abac3dc8eaff02685" + }, + { + "m_Id": "4593752c25244280be53b99a3912a258" + }, + { + "m_Id": "a85ddf8f3f5c4c209a2a9bd1d7edddfe" + }, + { + "m_Id": "495c27d21b304811ad4a11eaadec4aab" + }, + { + "m_Id": "da7dacccfb914641bea3fabe8b9fb111" + } + ], + "synonyms": [ + "tex2d" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_TextureType": 0, + "m_NormalMapSpace": 0, + "m_EnableGlobalMipBias": true, + "m_MipSamplingMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "8d223b4891de46cfae8de794f99b81f0", + "m_Id": 2, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "8e580580540d466aacf41b5cd8224d93", + "m_Id": 0, + "m_DisplayName": "Alpha", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Alpha", + "m_StageCapability": 2, + "m_Value": 1.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9041b46e52b841f5b6b165cca092a6b0", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Specular", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "65e6fb42fd314028a4e30623a037ba8a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Specular" +} + +{ + "m_SGVersion": 2, + "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalLitSubTarget", + "m_ObjectId": "9628f46d0c894a39b1c0f9df5ef6750d", + "m_WorkflowMode": 0, + "m_NormalDropOffSpace": 0, + "m_ClearCoat": false, + "m_BlendModePreserveSpecular": true +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "9a7abb4b4ea848628506d3fc5a48f14d", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.AlphaClipThreshold", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ea17d9c70f814921ab3dffd5a831dc71" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "a29da171b3934a5db9671039f6c9684e", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Tangent", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "fc98ed250b994497a7120dd2704aa42b" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Tangent" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "a5683e72d08b475abac3dc8eaff02685", + "m_Id": 6, + "m_DisplayName": "B", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "B", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "a73c81c1c69b4301a2a3d40079d7d0a3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.NormalTS", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "b735276d1d634a27b824f5f66f6df41e" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.NormalTS" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot", + "m_ObjectId": "a85ddf8f3f5c4c209a2a9bd1d7edddfe", + "m_Id": 1, + "m_DisplayName": "Texture", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Texture", + "m_StageCapability": 3, + "m_BareResource": false, + "m_Texture": { + "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}", + "m_Guid": "" + }, + "m_DefaultType": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BooleanMaterialSlot", + "m_ObjectId": "a898a5507f7a42ceb6bebf295885aec7", + "m_Id": 0, + "m_DisplayName": "IsHit", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": false, + "m_DefaultValue": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "ab7878bc7d4f42b6b293f214decbca41", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.BaseColor", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "f4ccddab48984cfba0ec1d86e9df09fc" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.BaseColor" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "b14b317853014c05a4a7b422da8f5d25", + "m_Id": 0, + "m_DisplayName": "Smoothness", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Smoothness", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "b735276d1d634a27b824f5f66f6df41e", + "m_Id": 0, + "m_DisplayName": "Normal (Tangent Space)", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "NormalTS", + "m_StageCapability": 2, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 3 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot", + "m_ObjectId": "bdc4e60a8bd74d56b544a8e46bc3bccb", + "m_Id": 0, + "m_DisplayName": "MainTex", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot", + "m_ObjectId": "c0293c855c0545d2a5bf77abcba1af01", + "m_Id": 0, + "m_DisplayName": "A", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": { + "e00": 0.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 0.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 0.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 0.0 + }, + "m_DefaultValue": { + "e00": 1.0, + "e01": 0.0, + "e02": 0.0, + "e03": 0.0, + "e10": 0.0, + "e11": 1.0, + "e12": 0.0, + "e13": 0.0, + "e20": 0.0, + "e21": 0.0, + "e22": 1.0, + "e23": 0.0, + "e30": 0.0, + "e31": 0.0, + "e32": 0.0, + "e33": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.PropertyNode", + "m_ObjectId": "c81c0a9ba40543edac482d30e5801ea5", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Property", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1297.0001220703125, + "y": 204.00001525878907, + "width": 105.0, + "height": 34.0 + } + }, + "m_Slots": [ + { + "m_Id": "7f4f7179425348739aedab3c5a5bd270" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_Property": { + "m_Id": "3191f2dfb37b4e618ccc086923089dc3" + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "c990c883a9fe4b739f070876ce792c41", + "m_Group": { + "m_Id": "" + }, + "m_Name": "VertexDescription.Position", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "73e082254b95435daa160512ab58210a" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "VertexDescription.Position" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.CategoryData", + "m_ObjectId": "cdac0120fe0a470f8baa138f6389776d", + "m_Name": "", + "m_ChildObjectList": [ + { + "m_Id": "6d80d18840704f5099845b51dea9249f" + }, + { + "m_Id": "3191f2dfb37b4e618ccc086923089dc3" + }, + { + "m_Id": "d045f0768c1549afa79ddfb40ea2703f" + }, + { + "m_Id": "ed5247b3b3a942648a9680bd4f86d3ab" + }, + { + "m_Id": "f5ca84220f074269a1fa5d448414668c" + } + ] +} + +{ + "m_SGVersion": 3, + "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty", + "m_ObjectId": "d045f0768c1549afa79ddfb40ea2703f", + "m_Guid": { + "m_GuidSerialized": "29d4c13e-6fc3-4725-9768-14407c22ac16" + }, + "m_Name": "FlashColor", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "FlashColor", + "m_DefaultReferenceName": "_FlashColor", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": { + "r": 1.0, + "g": 1.0, + "b": 1.0, + "a": 1.0 + }, + "isMainColor": false, + "m_ColorMode": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.MultiplyNode", + "m_ObjectId": "d58621f15478478f9803e150fd2e9b19", + "m_Group": { + "m_Id": "fd5e8e60431f458daba39ff2b1e2387e" + }, + "m_Name": "Multiply", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": -1297.0001220703125, + "y": 238.00001525878907, + "width": 208.0, + "height": 302.00006103515627 + } + }, + "m_Slots": [ + { + "m_Id": "c0293c855c0545d2a5bf77abcba1af01" + }, + { + "m_Id": "0fd1923a01954f08a59306c5f612b0eb" + }, + { + "m_Id": "8d223b4891de46cfae8de794f99b81f0" + } + ], + "synonyms": [ + "multiplication", + "times", + "x" + ], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot", + "m_ObjectId": "da7dacccfb914641bea3fabe8b9fb111", + "m_Id": 3, + "m_DisplayName": "Sampler", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Sampler", + "m_StageCapability": 3, + "m_BareResource": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot", + "m_ObjectId": "e0b570dad488444e925107ac313971ba", + "m_Id": 3, + "m_DisplayName": "Out", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "Out", + "m_StageCapability": 3, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0, + "w": 0.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot", + "m_ObjectId": "e81d1f4612fc4ba6b11b6909a9825ab6", + "m_Id": 0, + "m_DisplayName": "Normal", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Normal", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ea17d9c70f814921ab3dffd5a831dc71", + "m_Id": 0, + "m_DisplayName": "Alpha Clip Threshold", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "AlphaClipThreshold", + "m_StageCapability": 2, + "m_Value": 0.10000000149011612, + "m_DefaultValue": 0.5, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "ea39c9ad3d85457a8c26706da3d4ba48", + "m_Id": 0, + "m_DisplayName": "Ambient Occlusion", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Occlusion", + "m_StageCapability": 2, + "m_Value": 0.0, + "m_DefaultValue": 1.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Internal.BooleanShaderProperty", + "m_ObjectId": "ed5247b3b3a942648a9680bd4f86d3ab", + "m_Guid": { + "m_GuidSerialized": "80ed13c7-700a-4795-a1fe-e4ed902971a2" + }, + "m_Name": "IsHit", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "IsHit", + "m_DefaultReferenceName": "_IsHit", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": false +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot", + "m_ObjectId": "f1505348d740485e95defb5ec2b20b21", + "m_Id": 4, + "m_DisplayName": "A", + "m_SlotType": 1, + "m_Hidden": false, + "m_ShaderOutputName": "A", + "m_StageCapability": 3, + "m_Value": 0.0, + "m_DefaultValue": 0.0, + "m_Labels": [] +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "f27f1b1956d24c2cad488e39195b5d30", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Occlusion", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "ea39c9ad3d85457a8c26706da3d4ba48" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Occlusion" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot", + "m_ObjectId": "f4ccddab48984cfba0ec1d86e9df09fc", + "m_Id": 0, + "m_DisplayName": "Base Color", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "BaseColor", + "m_StageCapability": 2, + "m_Value": { + "x": 0.5, + "y": 0.5, + "z": 0.5 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_ColorMode": 0, + "m_DefaultColor": { + "r": 0.5, + "g": 0.5, + "b": 0.5, + "a": 1.0 + } +} + +{ + "m_SGVersion": 1, + "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty", + "m_ObjectId": "f5ca84220f074269a1fa5d448414668c", + "m_Guid": { + "m_GuidSerialized": "613e6550-5d01-48d9-837a-2364f450000f" + }, + "m_Name": "AlphaClipThreshold", + "m_DefaultRefNameVersion": 1, + "m_RefNameGeneratedByDisplayName": "AlphaClipThreshold", + "m_DefaultReferenceName": "_AlphaClipThreshold", + "m_OverrideReferenceName": "", + "m_GeneratePropertyBlock": true, + "m_UseCustomSlotLabel": false, + "m_CustomSlotLabel": "", + "m_DismissedVersion": 0, + "m_Precision": 0, + "overrideHLSLDeclaration": false, + "hlslDeclarationOverride": 0, + "m_Hidden": false, + "m_Value": 0.5, + "m_FloatType": 1, + "m_RangeValues": { + "x": 0.0, + "y": 1.0 + } +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.BlockNode", + "m_ObjectId": "fa0aa14897a649d98c23c2eb134bd9a3", + "m_Group": { + "m_Id": "" + }, + "m_Name": "SurfaceDescription.Alpha", + "m_DrawState": { + "m_Expanded": true, + "m_Position": { + "serializedVersion": "2", + "x": 0.0, + "y": 0.0, + "width": 0.0, + "height": 0.0 + } + }, + "m_Slots": [ + { + "m_Id": "8e580580540d466aacf41b5cd8224d93" + } + ], + "synonyms": [], + "m_Precision": 0, + "m_PreviewExpanded": true, + "m_DismissedVersion": 0, + "m_PreviewMode": 0, + "m_CustomColors": { + "m_SerializableColors": [] + }, + "m_SerializedDescriptor": "SurfaceDescription.Alpha" +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot", + "m_ObjectId": "fc98ed250b994497a7120dd2704aa42b", + "m_Id": 0, + "m_DisplayName": "Tangent", + "m_SlotType": 0, + "m_Hidden": false, + "m_ShaderOutputName": "Tangent", + "m_StageCapability": 1, + "m_Value": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_DefaultValue": { + "x": 0.0, + "y": 0.0, + "z": 0.0 + }, + "m_Labels": [], + "m_Space": 0 +} + +{ + "m_SGVersion": 0, + "m_Type": "UnityEditor.ShaderGraph.GroupData", + "m_ObjectId": "fd5e8e60431f458daba39ff2b1e2387e", + "m_Title": "Flash", + "m_Position": { + "x": -1782.0001220703125, + "y": -0.9999923706054688 + } +} + diff --git a/Assets/09.Shaders/TycoonPlayer.shadergraph.meta b/Assets/09.Shaders/TycoonPlayer.shadergraph.meta new file mode 100644 index 000000000..a282e3bb8 --- /dev/null +++ b/Assets/09.Shaders/TycoonPlayer.shadergraph.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8f16ff0e59234ef45b2fe65b282f6ff7 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3} diff --git a/Assets/10.Fonts/GodoM SDF.asset b/Assets/10.Fonts/GodoM SDF.asset index f55d0e62c..e8bf1976c 100644 --- a/Assets/10.Fonts/GodoM SDF.asset +++ b/Assets/10.Fonts/GodoM SDF.asset @@ -238694,7 +238694,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.4 + - _OutlineWidth: 0.2 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8 diff --git a/Assets/10.Fonts/WhiteOutline.mat b/Assets/10.Fonts/WhiteOutline.mat index 3c15f03c9..5a7e2a788 100644 --- a/Assets/10.Fonts/WhiteOutline.mat +++ b/Assets/10.Fonts/WhiteOutline.mat @@ -70,7 +70,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.4 + - _OutlineWidth: 0.2 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8 diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml new file mode 100644 index 000000000..62ce7303c --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta new file mode 100644 index 000000000..ffc27f0aa --- /dev/null +++ b/Assets/AddressableAssetsData/link.xml.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: af05d21d433e1c446ab5e3f7e063df2f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 5a712aca5..8564c6c56 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -140,7 +140,7 @@ PlayerSettings: loadStoreDebugModeEnabled: 0 visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 - bundleVersion: 0.3.5.10 + bundleVersion: 0.3.5.11 preloadedAssets: - {fileID: -944628639613478452, guid: 4ed6540e2f7ce234888adf8deff1f241, type: 3} - {fileID: 11400000, guid: 112e4950c7d9b7a429feb9bb058a93a7, type: 2}