diff --git a/Assets/01.Scenes/00.TycoonTitle.unity b/Assets/01.Scenes/00.TycoonTitle.unity index 929edef47..3e0519f0f 100644 --- a/Assets/01.Scenes/00.TycoonTitle.unity +++ b/Assets/01.Scenes/00.TycoonTitle.unity @@ -267,7 +267,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.1 + near clip plane: 0.01 far clip plane: 300 field of view: 30 orthographic: 0 @@ -1335,30 +1335,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 212715195290438317, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -100 - objectReference: {fileID: 0} - target: {fileID: 414015556802972880, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1375,26 +1351,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 598518925776948513, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 598518925776948513, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 598518925776948513, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 598518925776948513, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 598518925776948513, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 619693787478732481, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1439,30 +1395,6 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 82.81 - objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2859917975373401251, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -80 - objectReference: {fileID: 0} - target: {fileID: 2905220476270864484, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_SizeDelta.x value: 0 @@ -1487,58 +1419,6 @@ PrefabInstance: propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3603563907442104666, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: -100 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3805576724038342704, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3809829019576091026, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 1 @@ -1571,22 +1451,6 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3973267797173742279, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3976132546625396958, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1595,6 +1459,30 @@ PrefabInstance: propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4377787824645787692, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 0} + - target: {fileID: 4377787824645787692, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 70c1574509f3bc04bb6f811623df1337, type: 2} + - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalRotation.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4635808483248703528, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} - target: {fileID: 4984930952009746258, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1871,6 +1759,14 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7328279461098451069, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_SizeDelta.x + value: -1150 + objectReference: {fileID: 0} + - target: {fileID: 7328279461098451069, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} + propertyPath: m_AnchoredPosition.x + value: 475 + objectReference: {fileID: 0} - target: {fileID: 7388583262446243055, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -1911,30 +1807,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8051186104253160293, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - target: {fileID: 8213377428064630546, guid: fbbace4abceeb19418e16840f571e2bd, type: 3} propertyPath: m_AnchorMax.y value: 0 @@ -2023,6 +1895,166 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 82.81 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: -80 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: -100 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/01.Scenes/99.Tycoon_LMG.unity b/Assets/01.Scenes/99.Tycoon_LMG.unity index 66f7fc2f2..86199a988 100644 --- a/Assets/01.Scenes/99.Tycoon_LMG.unity +++ b/Assets/01.Scenes/99.Tycoon_LMG.unity @@ -629,95 +629,6 @@ RectTransform: m_AnchoredPosition: {x: 160, y: 80} m_SizeDelta: {x: 120, y: 150} m_Pivot: {x: 0, y: 0.5} ---- !u!1 &39004918 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 39004919} - - component: {fileID: 39004921} - - component: {fileID: 39004920} - - component: {fileID: 39004922} - m_Layer: 5 - m_Name: Table - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &39004919 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 39004918} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 871879853} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: 2400, y: 500} - m_Pivot: {x: 0.5, y: 0} ---- !u!114 &39004920 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 39004918} - 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: 1} - 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: 21300000, guid: 542969911f9d133438e8db6b05d4ee15, type: 3} - 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 &39004921 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 39004918} - m_CullTransparentMesh: 1 ---- !u!114 &39004922 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 39004918} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a810d0a847a60841803b0aed975f42c, type: 3} - m_Name: - m_EditorClassIdentifier: - parentRectTransform: {fileID: 871879853} --- !u!1 &46350305 GameObject: m_ObjectHideFlags: 0 @@ -1333,7 +1244,7 @@ MonoBehaviour: m_EditorClassIdentifier: _panel: {fileID: 410251237} _contents: {fileID: 333713340} - _cardLocalScale: {x: 0.65, y: 0.65, z: 1} + _cardLocalScale_2: {x: 0.9, y: 0.9, z: 1} _openSfxName: RareRewardBox --- !u!4 &113068682 stripped Transform: @@ -3409,7 +3320,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 70} m_SizeDelta: {x: 0, y: 800} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &333713341 @@ -3430,7 +3341,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 50 + m_Spacing: 20 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -5618,7 +5529,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &524864263 RectTransform: m_ObjectHideFlags: 0 @@ -8835,44 +8746,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 858530993} m_CullTransparentMesh: 1 ---- !u!1 &871879852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 871879853} - m_Layer: 5 - m_Name: TitleEmpty - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &871879853 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 871879852} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1744181053} - - {fileID: 1867556215} - - {fileID: 39004919} - m_Father: {fileID: 1049919592} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &873223985 GameObject: m_ObjectHideFlags: 0 @@ -11005,7 +10878,6 @@ RectTransform: - {fileID: 487445514} - {fileID: 460981318} - {fileID: 2055805161} - - {fileID: 871879853} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -15994,7 +15866,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bf906d99280c73d45a290761969d7bc5, type: 3} m_Name: m_EditorClassIdentifier: - material: {fileID: 2100000, guid: 10f8236f36b04a54aaf175b5763f7ef6, type: 2} + _tycoonTitle: {fileID: 0} --- !u!1 &1377077532 GameObject: m_ObjectHideFlags: 0 @@ -20764,81 +20636,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1744181052 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1744181053} - - component: {fileID: 1744181055} - - component: {fileID: 1744181054} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1744181053 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744181052} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 871879853} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1744181054 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744181052} - 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: 1} - 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: 21300000, guid: db3faf3bbc689a045b900709a21b024d, type: 3} - 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 &1744181055 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1744181052} - m_CullTransparentMesh: 1 --- !u!1 &1746385716 GameObject: m_ObjectHideFlags: 0 @@ -22366,95 +22163,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e4a707caef9cf544a63781c28d1244d, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1867556214 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1867556215} - - component: {fileID: 1867556217} - - component: {fileID: 1867556216} - - component: {fileID: 1867556218} - m_Layer: 5 - m_Name: Character - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1867556215 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867556214} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 871879853} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 450, y: 0} - m_SizeDelta: {x: 1100, y: 1100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1867556216 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867556214} - 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: 1} - 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: 21300000, guid: caee1616acbdbb9488a107b0894e9d0d, type: 3} - 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 &1867556217 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867556214} - m_CullTransparentMesh: 1 ---- !u!114 &1867556218 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1867556214} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 101a55adb2ae5424a8c6d0efbc862503, type: 3} - m_Name: - m_EditorClassIdentifier: - parentRectTransform: {fileID: 871879853} --- !u!1 &1876905823 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/02.Scripts/Tycoon/CardDataSo.cs b/Assets/02.Scripts/Tycoon/CardDataSo.cs index 360dc40e8..5fa732466 100644 --- a/Assets/02.Scripts/Tycoon/CardDataSo.cs +++ b/Assets/02.Scripts/Tycoon/CardDataSo.cs @@ -88,6 +88,11 @@ namespace BlueWater { return _selectedCard; } + + public int GetSelectedCardCount(string idx) + { + return _selectedCard.GetValueOrDefault(idx, 0); + } // 카드가 처음 선택되었는지 확인할 때 - 0값이면 true를 리턴 public bool CardFirstCheck(string idx) diff --git a/Assets/02.Scripts/Tycoon/TycoonCardController.cs b/Assets/02.Scripts/Tycoon/TycoonCardController.cs index 9d33eeec5..5bac3d3d0 100644 --- a/Assets/02.Scripts/Tycoon/TycoonCardController.cs +++ b/Assets/02.Scripts/Tycoon/TycoonCardController.cs @@ -43,6 +43,8 @@ namespace BlueWater.Tycoons public void SelectedCard(TycoonCard currentTycoonCard) { + currentTycoonCard.CardCountUp(); + switch (currentTycoonCard.CardDataForIdx.Idx) //탐색 후 행동... { case "HeartSlotPlus": diff --git a/Assets/02.Scripts/Tycoon/TycoonGameOver.cs b/Assets/02.Scripts/Tycoon/TycoonGameOver.cs index d645fec36..cf9a5da24 100644 --- a/Assets/02.Scripts/Tycoon/TycoonGameOver.cs +++ b/Assets/02.Scripts/Tycoon/TycoonGameOver.cs @@ -1,8 +1,10 @@ +using System; using System.Collections; using BlueWater; using BlueWater.Audios; using UnityEngine; using Sirenix.OdinInspector; +using Unity.VisualScripting; using Color = UnityEngine.Color; using Image = UnityEngine.UI.Image; using Random = UnityEngine.Random; @@ -39,6 +41,8 @@ public class TycoonGameOver : MonoBehaviour private GameObject _ship; private Image _text; + + private bool _resultView = false; //결과창이 뜨면 true void Start() { @@ -65,11 +69,20 @@ public class TycoonGameOver : MonoBehaviour [Button("게임오버 시작")] public void GameOver_Start() { + _resultView = false; gameObject.SetActive(true); // 코루틴 시작 StartCoroutine(MoveObject()); } + public void Update() + { + if (_mainOBJ.activeSelf && Input.anyKeyDown) + { + Resultview(); + } + } + // 코루틴 정의 IEnumerator MoveObject() { @@ -119,8 +132,8 @@ public class TycoonGameOver : MonoBehaviour yield return null; // 다음 프레임까지 대기 } - - EventManager.InvokeShowResult(); + + Resultview(); // 최종적으로 알파값을 1로 설정 (완전히 불투명하게) imageColor.a = 1f; @@ -128,6 +141,15 @@ public class TycoonGameOver : MonoBehaviour } + void Resultview() + { + if (_resultView == false) + { + _resultView = true; + EventManager.InvokeShowResult(); + } + } + // 흔들림 구현 함수 void ShakeObject() { diff --git a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs index a84b7595f..67f78f02d 100644 --- a/Assets/02.Scripts/Ui/Title/TycoonTitle.cs +++ b/Assets/02.Scripts/Ui/Title/TycoonTitle.cs @@ -74,6 +74,8 @@ namespace BlueWater.Titles if (_isTitleScene) { + VisualFeedbackManager.Instance.ResetTimeScale(); + _sceneController = SceneController.Instance; _startGameButton.onClick.AddListener(_sceneController.FadeIn); //수정 diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs index 51342b367..33c815dc3 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonCard.cs @@ -37,6 +37,15 @@ namespace BlueWater.Uis [field: SerializeField] public TycoonCardArea CardArea { get; private set; } + [field: SerializeField] + public GameObject _countLayout; + + [field: SerializeField] + private Sprite _cardCountEnabled; + + [field: SerializeField] + private Sprite _cardCountDisabled; + [Title("카드 속성")] [SerializeField] private TMP_Text _informationText; @@ -113,8 +122,32 @@ namespace BlueWater.Uis public void SetCard(CardData cardData) { CardDataForIdx = cardData; + int count = TycoonManager.Instance.CardDataSo.GetSelectedCardCount(CardDataForIdx.Idx); + _informationText.text = Utils.GetLocalizedString(cardData.Idx); + CardImage.sprite = CardDataForIdx.Sprite; + for(int i = 0 ; i < CardDataForIdx.Max ; i ++) + { + GameObject childObject = new GameObject(i.ToString()); + Image image = childObject.AddComponent(); + + if (i < count) + { + image.sprite = _cardCountEnabled; + } + else + { + image.sprite = _cardCountDisabled; + } + + childObject.transform.SetParent(_countLayout.transform); + RectTransform rectTransform = childObject.GetComponent(); + rectTransform.sizeDelta = new Vector2(30, 30); + rectTransform.localScale = new Vector3(1.0f,1.0f,1.0f); + rectTransform.localRotation = new Quaternion(0.0f,0.0f,0.0f,0.0f); + rectTransform.localPosition = new Vector3(0.0f,0.0f,0.0f); + } } public void SetSelectAction(Action action) @@ -150,6 +183,7 @@ namespace BlueWater.Uis private IEnumerator RotateOverTime() { BackObject.SetActive(true); + _countLayout.SetActive(false); Quaternion startRotation = Panel.localRotation; Quaternion targetRotation = Quaternion.Euler(0, 0, 0); @@ -190,17 +224,29 @@ namespace BlueWater.Uis if (currentYRotation <= 90.0f && BackObject.activeSelf) { BackObject.SetActive(false); + _countLayout.SetActive(true); } if (elapsedTime > rotationDurationCard / 1.8) { CardArea.SetEnable(true); } - + yield return null; } Panel.localRotation = targetRotation; } + + public void CardCountUp() + { + if (CardDataForIdx.Max != 0) + { + int count = TycoonManager.Instance.CardDataSo.GetSelectedCardCount(CardDataForIdx.Idx); + + var image = _countLayout.transform.Find(count.ToString()); + image.GetComponent().sprite = _cardCountEnabled; + } + } } } \ No newline at end of file diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs index da02f0396..fa6e672ca 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonRareRewardBoxUi.cs @@ -3,6 +3,7 @@ using BlueWater.Audios; using BlueWater.Tycoons; using UnityEngine; using Sirenix.OdinInspector; +using UnityEngine.UI; namespace BlueWater.Uis { @@ -15,11 +16,14 @@ namespace BlueWater.Uis private Transform _contents; [SerializeField] - private Vector3 _cardLocalScale = new(0.65f, 0.65f, 1f); + private Vector3 _cardLocalScale_2 = new(0.9f, 0.9f, 1f); + private Vector3 _cardLocalScale_3 = new(0.8f, 0.8f, 1f); + private Vector3 _cardLocalScale_4 = new(0.7f, 0.7f, 1f); + private Vector3 _cardLocalScale_5 = new(0.65f, 0.65f, 1f); [SerializeField] private string _openSfxName = "RareRewardBox"; - + private List _tycoonCards = new(5); private LevelData _currentLevelData; @@ -68,14 +72,27 @@ namespace BlueWater.Uis _currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); _tycoonCardController.DestroyCardList(_tycoonCards); var randomCount = Random.Range(2, 6); + + _contents.GetComponent().spacing = randomCount * 10; + for (int i = 0; i < randomCount; i++) { var newCard = _tycoonCardController.CreateTycoonCard(_contents); newCard.SetName($"Card{i:00}"); - newCard.SetLocalScale(_cardLocalScale); + switch (randomCount) + { + case 2: newCard.SetLocalScale(_cardLocalScale_2); break; + case 3: newCard.SetLocalScale(_cardLocalScale_3); break; + case 4: newCard.SetLocalScale(_cardLocalScale_4); break; + case 5: newCard.SetLocalScale(_cardLocalScale_5); break; + default: newCard.SetLocalScale(_cardLocalScale_5); break; + } + _tycoonCards.Add(newCard); } + + Open(); //----카드 값 지정 및 초기화---- @@ -101,6 +118,7 @@ namespace BlueWater.Uis hashSet.Add(cardIdx); element.SetCard(cardData); element.Rotation_Start(); + _tycoonCardController.SelectedCard(element); } } diff --git a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs index c2679b544..94b8dd92e 100644 --- a/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs +++ b/Assets/02.Scripts/Ui/Tycoon/TycoonSelectCard.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using BlueWater.Tycoons; using Sirenix.OdinInspector; using UnityEngine; +using UnityEngine.UI; using Random = UnityEngine.Random; namespace BlueWater.Uis @@ -57,6 +58,10 @@ namespace BlueWater.Uis [Button("카드 생성하기(레벨업)")] private void CreateCard() { + var panelcolor = _panel.GetComponent().color; + panelcolor.a = 0; + _panel.GetComponent().color = panelcolor; + if (!Application.isPlaying) return; _currentLevelData = TycoonManager.Instance.GetCurrentLevelData(); @@ -94,9 +99,30 @@ namespace BlueWater.Uis element.SetCard(cardData); element.SetSelectAction(SelectedCard); element.Rotation_Start(); + + StartCoroutine(FadeInPanel()); + } } + private IEnumerator FadeInPanel() + { + float time = 0.0f; // 타이머 초기화 + + while (time < 1.0f) + { + time += Time.unscaledDeltaTime; // 시간 업데이트 + + float _FadeTime = time / 1.0f; + + var panelcolor = _panel.GetComponent().color; + panelcolor.a = Mathf.Lerp(0.0f, 0.9f, _FadeTime); + _panel.GetComponent().color = panelcolor; + + yield return null; + } + } + private void SelectedCard(TycoonCard currentTycoonCard) { _tycoonCardController.SelectedCard(currentTycoonCard); @@ -116,19 +142,19 @@ namespace BlueWater.Uis RectTransform rect03 = null; // 화면의 해상도를 가져옴 - if (currentTycoonCard == _tycoonCards[0]) //우우 + if (currentTycoonCard == _tycoonCards[0]) { rect01 = _tycoonCards[1].RectTransform; rect02 = _tycoonCards[2].RectTransform; rect03 = _tycoonCards[0].RectTransform; } - else if (currentTycoonCard == _tycoonCards[1]) //좌우 + else if (currentTycoonCard == _tycoonCards[1]) { rect01 = _tycoonCards[0].RectTransform; rect02 = _tycoonCards[2].RectTransform; rect03 = _tycoonCards[1].RectTransform; } - else if (currentTycoonCard == _tycoonCards[2]) //좌좌 + else if (currentTycoonCard == _tycoonCards[2]) { rect01 = _tycoonCards[0].RectTransform; rect02 = _tycoonCards[1].RectTransform; @@ -148,8 +174,6 @@ namespace BlueWater.Uis { time += Time.unscaledDeltaTime; // 시간 업데이트 - //캐릭터의 위치 반환 (실시간으로 움직이기 때문에... 계속 업데이트하면서 가져오기.) - float _Time = time / 0.5f; float easedTOut = EaseEffect.ExpoOut(_Time); @@ -157,6 +181,7 @@ namespace BlueWater.Uis rect02.localScale = Vector3.Lerp(startScale02, new Vector3(0.0f, 0.0f, 0.0f), easedTOut); rect03.localScale = Vector3.Lerp(startScale03, new Vector3(1.0f, 1.0f, 1.0f), easedTOut); + yield return null; } @@ -168,10 +193,14 @@ namespace BlueWater.Uis time += Time.unscaledDeltaTime; // 시간 업데이트 float _Time = time / 0.5f; + float _FadeTime = time / 1.0f; float easedTIn = EaseEffect.ExpoIn(_Time); rect03.localScale = Vector3.Lerp(startScale03, new Vector3(0.0f, 0.0f, 0.0f), easedTIn); + var panelcolor = _panel.GetComponent().color; + panelcolor.a = Mathf.Lerp(0.9f, 0.0f, _FadeTime); + _panel.GetComponent().color = panelcolor; yield return null; } diff --git a/Assets/03.Images/Noise.meta b/Assets/03.Images/Noise.meta new file mode 100644 index 000000000..1a95c7c94 --- /dev/null +++ b/Assets/03.Images/Noise.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f69eef26108277d42b987611c6367693 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/03.Images/Noise/GrayNoiseMedium.jpg b/Assets/03.Images/Noise/GrayNoiseMedium.jpg new file mode 100644 index 000000000..f0055884d Binary files /dev/null and b/Assets/03.Images/Noise/GrayNoiseMedium.jpg differ diff --git a/Assets/03.Images/Noise/GrayNoiseMedium.jpg.meta b/Assets/03.Images/Noise/GrayNoiseMedium.jpg.meta new file mode 100644 index 000000000..07f84afc3 --- /dev/null +++ b/Assets/03.Images/Noise/GrayNoiseMedium.jpg.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 5f6da361ba573ca45b306404b014c3ea +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: 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 + 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/03.Images/Ui/Title/TitleCharacter.png b/Assets/03.Images/Ui/Title/TitleCharacter.png index a52f24180..867abd08a 100644 Binary files a/Assets/03.Images/Ui/Title/TitleCharacter.png and b/Assets/03.Images/Ui/Title/TitleCharacter.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png new file mode 100644 index 000000000..f4339c67f Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png.meta new file mode 100644 index 000000000..9bd92795c --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountDisabled.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 8b8f55a041194344ca34601a444dec1f +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: 1024 + 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 + 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/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png new file mode 100644 index 000000000..5c3563f75 Binary files /dev/null and b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png differ diff --git a/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png.meta b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png.meta new file mode 100644 index 000000000..a5fd3e483 --- /dev/null +++ b/Assets/03.Images/Ui/Tycoon/Roguelike/Card_CountEnabled.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 2cc3e1f8f8c06bd4d9586eef62b3c173 +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: 1024 + 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 + 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/Flaring.mat b/Assets/04.Materials/Flaring.mat new file mode 100644 index 000000000..e85ea858c --- /dev/null +++ b/Assets/04.Materials/Flaring.mat @@ -0,0 +1,145 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5286601850860229218 +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 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Flaring + m_Shader: {fileID: 4800000, guid: d314dbba5f608914481527874657f6fa, 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: + 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: 5f6da361ba573ca45b306404b014c3ea, 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 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _Blue: 4.29 + - _Brightness: 9.65 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Curvature: 15.6 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _Gamma: 7.89 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Green: 1.93 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _RayBrightness: 6.35 + - _RayDensity: 7 + - _ReceiveShadows: 1 + - _Red: 1.72 + - _SinFreq: 6 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpotBrightness: -3.23 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + 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} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/04.Materials/Flaring.mat.meta b/Assets/04.Materials/Flaring.mat.meta new file mode 100644 index 000000000..edcaaa577 --- /dev/null +++ b/Assets/04.Materials/Flaring.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70c1574509f3bc04bb6f811623df1337 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/04.Materials/Ink.mat b/Assets/04.Materials/Ink.mat index 33cab203d..cb7d8b10d 100644 --- a/Assets/04.Materials/Ink.mat +++ b/Assets/04.Materials/Ink.mat @@ -16,7 +16,7 @@ Material: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3001 stringTagMap: {} disabledShaderPasses: - MOTIONVECTORS diff --git a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab index a21c082c1..d236c8b92 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/Card.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/Card.prefab @@ -243,6 +243,7 @@ RectTransform: - {fileID: 951644923240543435} - {fileID: 4701413917664573218} - {fileID: 7408726339065734494} + - {fileID: 8211206729076616305} m_Father: {fileID: 725714798138964366} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -461,6 +462,68 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3183193345237214945 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8211206729076616305} + - component: {fileID: 6566883109573234691} + m_Layer: 5 + m_Name: CountLayout + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &8211206729076616305 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3183193345237214945} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2842611899938369659} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -60, y: -60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &6566883109573234691 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3183193345237214945} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 8 + m_Spacing: 5 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &3272948643881793100 GameObject: m_ObjectHideFlags: 0 @@ -615,6 +678,9 @@ MonoBehaviour: k__BackingField: {fileID: 6591927570521581973} k__BackingField: {fileID: 6714720895858370018} k__BackingField: {fileID: 2953333486680660764} + _countLayout: {fileID: 3183193345237214945} + _cardCountEnabled: {fileID: 21300000, guid: 2cc3e1f8f8c06bd4d9586eef62b3c173, type: 3} + _cardCountDisabled: {fileID: 21300000, guid: 8b8f55a041194344ca34601a444dec1f, type: 3} _informationText: {fileID: 6023757579985556140} cardName: cardText: diff --git a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab index 60c2941e7..b8b6be3c4 100644 --- a/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab +++ b/Assets/05.Prefabs/Uis/Tycoons/TycoonTitleMenuCanvas.prefab @@ -11362,7 +11362,7 @@ MonoBehaviour: _quitGameButton: {fileID: 6783990415546059601} _isTitleScene: 1 _versionText: {fileID: 408792858244141541} - _dailyBgm: TycoonTitleBgm02 + _dailyBgm: TycoonTitleBgm01 _ink: {fileID: 8241840109796323035} --- !u!114 &9207272460605448926 MonoBehaviour: diff --git a/Assets/09.Shaders/Flaring.shader b/Assets/09.Shaders/Flaring.shader new file mode 100644 index 000000000..573b60819 --- /dev/null +++ b/Assets/09.Shaders/Flaring.shader @@ -0,0 +1,112 @@ +Shader "Unlit/Flaring" +{ + Properties + { + _MainTex("Noise Texture", 2D) = "white" {} + _Brightness("Brightness", Float) = 3.0 + _RayBrightness("Ray Brightness", Float) = 5.0 + _Gamma("Gamma", Float) = 6.0 + _SpotBrightness("Spot Brightness", Float) = 1.5 + _RayDensity("Ray Density", Float) = 6.0 + _Curvature("Curvature", Float) = 90.0 + _Red("Red", Float) = 1.8 + _Green("Green", Float) = 3.0 + _Blue("Blue", Float) = 0.5 + _SinFreq("Sin Frequency", Float) = 6.0 + } + SubShader + { + Tags { "Queue"="Transparent" "RenderType"="Transparent" } + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + sampler2D _MainTex; + float _Brightness; + float _RayBrightness; + float _Gamma; + float _SpotBrightness; + float _RayDensity; + float _Curvature; + float _Red, _Green, _Blue; + float _SinFreq; + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 pos : SV_POSITION; + }; + + float hash(float n) { return frac(sin(n) * 43758.5453); } + + float noise(float2 x) + { + return tex2D(_MainTex, x * 0.01).r; // Using texture-based noise + } + + float fbm(float2 p) + { + float z = 2.0; + float rz = 0.0; + p *= 0.25; + float2 m2 = float2(0.80, 0.60); + float2 m2n = float2(-0.60, 0.80); + for (int i = 0; i < 5; i++) + { + rz += abs((noise(p) - 0.5) * 2.0) / z; + z *= 2.0; + p = float2(p.x * m2.x + p.y * m2.y, p.x * m2n.x + p.y * m2n.y) * 2.0; + } + return rz; + } + + v2f vert(appdata v) + { + v2f o; + o.pos = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + return o; + } + + fixed4 frag(v2f i) : SV_Target + { + float2 uv = i.uv * _ScreenParams.xy / _ScreenParams.y - 0.5f; + uv.x *= _ScreenParams.x / _ScreenParams.y; + uv *= _Curvature * 0.05f + 0.0001f; + + float r = sqrt(dot(uv, uv)); + float t = -_Time.y * 0.03f; // 시간 변화 적용 + float x = dot(normalize(uv), float2(0.5f, 0.0f)) + t; + float y = dot(normalize(uv), float2(0.0f, 0.5f)) + t; + + x = fbm(float2(y * _RayDensity * 0.5f, r + x * _RayDensity * 0.2f)); + y = fbm(float2(r + y * _RayDensity * 0.1f, x * _RayDensity * 0.5f)); + + float val = fbm(float2(r + y * _RayDensity, r + x * _RayDensity - y)); + val = smoothstep(_Gamma * 0.02f - 0.1f, _RayBrightness + (_Gamma * 0.02f - 0.1f) + 0.001f, val); + val = sqrt(val); + + float3 col = val / float3(_Red, _Green, _Blue); + col = clamp(1.0f - col, 0.0f, 1.0f); + col = lerp(col, float3(1.0f, 1.0f, 1.0f), _SpotBrightness - r / 0.1f / _Curvature * 200.0f / _Brightness); + col = clamp(col, 0.0f, 1.0f); + col = pow(col, float3(1.7f, 1.7f, 1.7f)); + + //float debugColor = frac(_Time.y * 0.1f); // 시간 변화 확인용 + + return float4(col, 1.0f); + } + ENDCG + } + } +} \ No newline at end of file diff --git a/Assets/09.Shaders/Flaring.shader.meta b/Assets/09.Shaders/Flaring.shader.meta new file mode 100644 index 000000000..6f472410b --- /dev/null +++ b/Assets/09.Shaders/Flaring.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: d314dbba5f608914481527874657f6fa +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: