diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index be55ac7..0ea1458 100644 --- a/Assets/ResWork/Table/Export/GlobalValue.json +++ b/Assets/ResWork/Table/Export/GlobalValue.json @@ -1 +1 @@ -[{"s_ID": "LuckyPoint", "n_Value": "100", "exception": "럭키 포인트 100% 필요량"}, {"s_ID": "LuckyBlockWithdMin", "n_Value": "100", "exception": "럭키 블록 최소 크기 (가로)"}, {"s_ID": "LuckyBlockWithdMax", "n_Value": "251", "exception": "럭키 블록 최대 크기 (가로)"}, {"s_ID": "LuckyBlockHeightMin", "n_Value": "100", "exception": "럭키 블록 최소 크기 (세로)"}, {"s_ID": "LuckyBlockHeightMax", "n_Value": "100", "exception": "럭키 블록 최대 크기 (세로)"}, {"s_ID": "LuckyBlockSpeedMin", "n_Value": "150", "exception": "럭키 블록 최소 스피드"}, {"s_ID": "LuckyBlockSpeedMax", "n_Value": "250", "exception": "럭키 블록 최대 스피드"}] \ No newline at end of file +[{"s_ID": "LuckyPoint", "n_Value": "100", "exception": "럭키 포인트 100% 필요량"}, {"s_ID": "LuckyBlockWithdMin", "n_Value": "100", "exception": "럭키 블록 최소 크기 (가로)"}, {"s_ID": "LuckyBlockWithdMax", "n_Value": "251", "exception": "럭키 블록 최대 크기 (가로)"}, {"s_ID": "LuckyBlockHeightMin", "n_Value": "100", "exception": "럭키 블록 최소 크기 (세로)"}, {"s_ID": "LuckyBlockHeightMax", "n_Value": "100", "exception": "럭키 블록 최대 크기 (세로)"}, {"s_ID": "LuckyBlockSpeedMin", "n_Value": "150", "exception": "럭키 블록 최소 스피드"}, {"s_ID": "LuckyBlockSpeedMax", "n_Value": "250", "exception": "럭키 블록 최대 스피드"}, {"s_ID": "GachaAmount", "n_Value": "5", "exception": "가챠에 필요한 가챠 코인 개수"}, {"s_ID": "GachaAD_Reward", "n_Value": "5", "exception": "가챠 광고 가챠 코인 보상 개수"}, {"s_ID": "ADSec_Gacha", "n_Value": "600", "exception": "가챠 광고 시간 (초)"}, {"s_ID": "ADSec_Shop", "n_Value": "600", "exception": "상점 광고 시간 (초)"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/Shop.json b/Assets/ResWork/Table/Export/Shop.json index d47663e..760c586 100644 --- a/Assets/ResWork/Table/Export/Shop.json +++ b/Assets/ResWork/Table/Export/Shop.json @@ -1,9 +1,9 @@ [{"s_ID": "com.fgb.weeklypackage", "e_InAppInitType": "Week", "e_BuyType": "IAP", "n_Price": "1000", "s_PeakEffective": "최대 효율 111%", "s_Items": "코인 x00 -채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.minigamepacakge", "e_InAppInitType": "Mini_One", "e_BuyType": "IAP", "n_Price": "25000", "s_PeakEffective": "최대 효율 222%", "s_Items": "보너스 확률 +00% -코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.buyone1", "e_InAppInitType": "One1", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "123%", "s_Items": "코인 x000 -채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.buyone2", "e_InAppInitType": "One2", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "135%", "s_Items": "코인 x000 -가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatbot1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "105%", "s_Items": "코인 x00 -채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatbot2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "102%", "s_Items": "보너스 확률 +00% -코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatbot3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "22000", "s_PeakEffective": "100%", "s_Items": "코인 x000 -채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatbot4", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "99%", "s_Items": "코인 x000 -가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.gacha1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x20", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "20", "n_ADSec": "0"}, {"s_ID": "com.fgb.gacha2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x110", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "110", "n_ADSec": "0"}, {"s_ID": "com.fgb.gacha3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x600", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "600", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatcoin1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x10", "n_RewardHeart": "0", "n_RewardChatCoin": "10", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatcoin2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x55", "n_RewardHeart": "0", "n_RewardChatCoin": "55", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "com.fgb.chatcoin3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x300", "n_RewardHeart": "0", "n_RewardChatCoin": "300", "n_RewardGacha": "0", "n_ADSec": "0"}, {"s_ID": "ad.chatcoin", "e_InAppInitType": "None", "e_BuyType": "AD", "n_Price": "0", "s_PeakEffective": "", "s_Items": "x3", "n_RewardHeart": "0", "n_RewardChatCoin": "3", "n_RewardGacha": "0", "n_ADSec": "600"}, {"s_ID": "buy.chatcoin", "e_InAppInitType": "None", "e_BuyType": "Coin", "n_Price": "50", "s_PeakEffective": "", "s_Items": "x1", "n_RewardHeart": "0", "n_RewardChatCoin": "1", "n_RewardGacha": "0", "n_ADSec": "0"}] \ No newline at end of file +채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.minigamepacakge", "e_InAppInitType": "Mini_One", "e_BuyType": "IAP", "n_Price": "25000", "s_PeakEffective": "최대 효율 222%", "s_Items": "보너스 확률 +00% +코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.buyone1", "e_InAppInitType": "One1", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "123%", "s_Items": "코인 x000 +채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.buyone2", "e_InAppInitType": "One2", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "135%", "s_Items": "코인 x000 +가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "105%", "s_Items": "코인 x00 +채팅 코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "9900", "s_PeakEffective": "102%", "s_Items": "보너스 확률 +00% +코인 x00", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "22000", "s_PeakEffective": "100%", "s_Items": "코인 x000 +채팅 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatbot4", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "55000", "s_PeakEffective": "99%", "s_Items": "코인 x000 +가챠 코인 x000", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.gacha1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x20", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "20"}, {"s_ID": "com.fgb.gacha2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x110", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "110"}, {"s_ID": "com.fgb.gacha3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x600", "n_RewardHeart": "0", "n_RewardChatCoin": "0", "n_RewardGacha": "600"}, {"s_ID": "com.fgb.chatcoin1", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "1100", "s_PeakEffective": "", "s_Items": "x10", "n_RewardHeart": "0", "n_RewardChatCoin": "10", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatcoin2", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "5500", "s_PeakEffective": "", "s_Items": "x55", "n_RewardHeart": "0", "n_RewardChatCoin": "55", "n_RewardGacha": "0"}, {"s_ID": "com.fgb.chatcoin3", "e_InAppInitType": "None", "e_BuyType": "IAP", "n_Price": "27500", "s_PeakEffective": "", "s_Items": "x300", "n_RewardHeart": "0", "n_RewardChatCoin": "300", "n_RewardGacha": "0"}, {"s_ID": "ad.chatcoin", "e_InAppInitType": "None", "e_BuyType": "AD", "n_Price": "0", "s_PeakEffective": "", "s_Items": "x3", "n_RewardHeart": "0", "n_RewardChatCoin": "3", "n_RewardGacha": "0"}, {"s_ID": "buy.chatcoin", "e_InAppInitType": "None", "e_BuyType": "Coin", "n_Price": "50", "s_PeakEffective": "", "s_Items": "x1", "n_RewardHeart": "0", "n_RewardChatCoin": "1", "n_RewardGacha": "0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index 094d18c..3045e8c 100644 Binary files a/Assets/ResWork/Table/SheGotWet.xlsm and b/Assets/ResWork/Table/SheGotWet.xlsm differ diff --git a/Assets/ResWork/Table/table_shop.cs b/Assets/ResWork/Table/table_shop.cs index 8c70ae9..7a214ba 100644 --- a/Assets/ResWork/Table/table_shop.cs +++ b/Assets/ResWork/Table/table_shop.cs @@ -16,7 +16,6 @@ public class shoptabledata ProtectedInt32 _RewardHeart; public int n_RewardHeart { get { return _RewardHeart; } set { _RewardHeart = value; _RewardHeart.Obfuscate(); } } ProtectedInt32 _RewardChatCoin; public int n_RewardChatCoin { get { return _RewardChatCoin; } set { _RewardChatCoin = value; _RewardChatCoin.Obfuscate(); } } ProtectedInt32 _RewardGacha; public int n_RewardGacha { get { return _RewardGacha; } set { _RewardGacha = value; _RewardGacha.Obfuscate(); } } - ProtectedInt32 _ADSec; public int n_ADSec { get { return _ADSec; } set { _ADSec = value; _ADSec.Obfuscate(); } } } public class table_shop : table_base diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index ab08b12..024ec36 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -3461,7 +3461,6 @@ RectTransform: m_Children: - {fileID: 1630921641} - {fileID: 2004235292} - - {fileID: 915269246} - {fileID: 892977662} m_Father: {fileID: 240605636} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3488,7 +3487,7 @@ MonoBehaviour: m_Top: 0 m_Bottom: 0 m_ChildAlignment: 4 - m_Spacing: 165 + m_Spacing: 200 m_ChildForceExpandWidth: 0 m_ChildForceExpandHeight: 0 m_ChildControlWidth: 0 @@ -11896,7 +11895,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC218\uC9D1 \uAC8C\uC784" + m_text: "\uBBF8\uB2C8 \uAC8C\uC784" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} @@ -15950,152 +15949,6 @@ RectTransform: m_AnchoredPosition: {x: 540, y: -1675} m_SizeDelta: {x: 1080, y: 650} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &915269245 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 915269246} - - component: {fileID: 915269250} - - component: {fileID: 915269249} - - component: {fileID: 915269248} - - component: {fileID: 915269247} - m_Layer: 5 - m_Name: btn_gacha - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &915269246 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915269245} - 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: 1742836632} - m_Father: {fileID: 186440824} - 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: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &915269247 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915269245} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4848326f7db925d4fbcdb35f789b75f5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &915269248 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915269245} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 915269249} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1703079399} - m_TargetAssemblyTypeName: LobbyUI, Assembly-CSharp - m_MethodName: OnClick_Button - m_Mode: 2 - m_Arguments: - m_ObjectArgument: {fileID: 915269245} - m_ObjectArgumentAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &915269249 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915269245} - 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: 31910d2d85d5d0b4b965c0e5cca2d776, 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 &915269250 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 915269245} - m_CullTransparentMesh: 1 --- !u!1 &917721774 GameObject: m_ObjectHideFlags: 0 @@ -17463,7 +17316,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1005841926} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 2013608479} + m_TargetAssemblyTypeName: GachaUI, Assembly-CSharp + m_MethodName: OnClick_AD + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1005841926 MonoBehaviour: m_ObjectHideFlags: 0 @@ -30083,142 +29948,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733729085} m_CullTransparentMesh: 1 ---- !u!1 &1742836631 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1742836632} - - component: {fileID: 1742836634} - - component: {fileID: 1742836633} - m_Layer: 5 - m_Name: btnName - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1742836632 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836631} - 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: 915269246} - 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: -61} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1742836633 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836631} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: "\uBF51\uAE30" - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_sharedMaterial: {fileID: -3574565475228871172, guid: 3055b5c28f94e6c4ea6b9a379bb315a5, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 40 - m_fontSizeBase: 40 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 20 - m_fontSizeMax: 80 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 4096 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_TextWrappingMode: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 0 - m_ActiveFontFeatures: 6e72656b - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_EmojiFallbackSupport: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1742836634 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1742836631} - m_CullTransparentMesh: 1 --- !u!1 &1750115936 GameObject: m_ObjectHideFlags: 0 @@ -33264,7 +32993,7 @@ GameObject: - component: {fileID: 1918801482} - component: {fileID: 1918801485} m_Layer: 5 - m_Name: btn_chatcoingame + m_Name: btn_gacha m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 2d6deb4..bbcdf08 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -88,12 +88,12 @@ public class SaveMgr : MonoBehaviourSingletonTemplate { switch (money) { - case eMoney.AlbumOpen: m_SaveData.MoneyHeart+= add; break; - case eMoney.Chat: m_SaveData.MoneyChatCoin += add; break; - case eMoney.Gacha: m_SaveData.MoneyGacha += add; break; - case eMoney.Lucky: m_SaveData.MoneyLucky += add; break; + case eMoney.AlbumOpen: m_SaveData.MoneyHeart += add; break; + case eMoney.Chat: m_SaveData.MoneyChatCoin += add; break; + case eMoney.Gacha: m_SaveData.MoneyGacha += add; break; + case eMoney.Lucky: m_SaveData.MoneyLucky += add; break; } - + LobbyUI.Ins.Set_Money(); } public int Get_Money(eMoney money) @@ -101,9 +101,9 @@ public class SaveMgr : MonoBehaviourSingletonTemplate switch (money) { case eMoney.AlbumOpen: return m_SaveData.MoneyHeart; - case eMoney.Chat: return m_SaveData.MoneyChatCoin; - case eMoney.Gacha: return m_SaveData.MoneyGacha; - case eMoney.Lucky: return m_SaveData.MoneyLucky; + case eMoney.Chat: return m_SaveData.MoneyChatCoin; + case eMoney.Gacha: return m_SaveData.MoneyGacha; + case eMoney.Lucky: return m_SaveData.MoneyLucky; } return 0; } @@ -157,6 +157,18 @@ public class SaveMgr : MonoBehaviourSingletonTemplate public int Get_UnLockIndex() { return m_SaveData.GirlUnLockIndex; } public int Get_SelectGirlID() { return m_SaveData.SelectGirlID; } + public bool CanShowGachaAD(bool showtoast = true) + { + var cal = m_SaveData.GachaADTime - InternetTime.Ins.Time; + var canshow = cal.TotalSeconds <= 0; + if (!canshow && showtoast) LobbyUI.Ins.m_ToastUI.Set($"{cal} 남음"); + return canshow; + } + public void Add_GachaADTime(int sec) + { + m_SaveData.GachaADTime = InternetTime.Ins.Time.AddSeconds(sec); + Save(); + } public bool CanShowShopAD(bool showtoast = true) { var cal = m_SaveData.ShopADTime - InternetTime.Ins.Time; @@ -192,26 +204,27 @@ public class SaveMgr : MonoBehaviourSingletonTemplate } public class SaveData -{ - public bool bSound, bBgm; + { + public bool bSound, bBgm; - ProtectedInt32 _LastDoY; public int LastDoY { get { return _LastDoY; } set { _LastDoY = value; _LastDoY.Obfuscate(); } } - ProtectedInt32 _WeekOfYear; public int WeekOfYear { get { return _WeekOfYear; } set { _WeekOfYear = value; _WeekOfYear.Obfuscate(); } } - ProtectedInt32 _GirlSelectIndex; public int SelectGirlID { get { return _GirlSelectIndex; } set { _GirlSelectIndex = value; _GirlSelectIndex.Obfuscate(); } } - ProtectedInt32 _GirlUnLockIndex; public int GirlUnLockIndex { get { return _GirlUnLockIndex; } set { _GirlUnLockIndex = value; _GirlUnLockIndex.Obfuscate(); } } - ProtectedInt32 _AttendanceDoY; public int AttendanceDoY { get { return _AttendanceDoY; } set { _AttendanceDoY = value; _AttendanceDoY.Obfuscate(); } } - ProtectedInt32 _Attendance; public int Attendance { get { return _Attendance; } set { _Attendance = value; _Attendance.Obfuscate(); } } + ProtectedInt32 _LastDoY; public int LastDoY { get { return _LastDoY; } set { _LastDoY = value; _LastDoY.Obfuscate(); } } + ProtectedInt32 _WeekOfYear; public int WeekOfYear { get { return _WeekOfYear; } set { _WeekOfYear = value; _WeekOfYear.Obfuscate(); } } + ProtectedInt32 _GirlSelectIndex; public int SelectGirlID { get { return _GirlSelectIndex; } set { _GirlSelectIndex = value; _GirlSelectIndex.Obfuscate(); } } + ProtectedInt32 _GirlUnLockIndex; public int GirlUnLockIndex { get { return _GirlUnLockIndex; } set { _GirlUnLockIndex = value; _GirlUnLockIndex.Obfuscate(); } } + ProtectedInt32 _AttendanceDoY; public int AttendanceDoY { get { return _AttendanceDoY; } set { _AttendanceDoY = value; _AttendanceDoY.Obfuscate(); } } + ProtectedInt32 _Attendance; public int Attendance { get { return _Attendance; } set { _Attendance = value; _Attendance.Obfuscate(); } } - ProtectedInt32 _MoneyHeart; public int MoneyHeart { get { return _MoneyHeart; } set { _MoneyHeart = value; _MoneyHeart.Obfuscate(); } } - ProtectedInt32 _MoneyChatCoin; public int MoneyChatCoin { get { return _MoneyChatCoin; } set { _MoneyChatCoin = value; _MoneyChatCoin.Obfuscate(); } } - ProtectedInt32 _MoneyGacha; public int MoneyGacha { get { return _MoneyGacha; } set { _MoneyGacha = value; _MoneyGacha.Obfuscate(); } } - ProtectedInt32 _MoneyLucky; public int MoneyLucky { get { return _MoneyLucky; } set { _MoneyLucky = value; _MoneyLucky.Obfuscate(); } } + ProtectedInt32 _MoneyHeart; public int MoneyHeart { get { return _MoneyHeart; } set { _MoneyHeart = value; _MoneyHeart.Obfuscate(); } } + ProtectedInt32 _MoneyChatCoin; public int MoneyChatCoin { get { return _MoneyChatCoin; } set { _MoneyChatCoin = value; _MoneyChatCoin.Obfuscate(); } } + ProtectedInt32 _MoneyGacha; public int MoneyGacha { get { return _MoneyGacha; } set { _MoneyGacha = value; _MoneyGacha.Obfuscate(); } } + ProtectedInt32 _MoneyLucky; public int MoneyLucky { get { return _MoneyLucky; } set { _MoneyLucky = value; _MoneyLucky.Obfuscate(); } } - ProtectedDateTime _ShopADTime; public DateTime ShopADTime { get { return _ShopADTime; } set { _ShopADTime = value; _ShopADTime.Obfuscate(); } } + ProtectedDateTime _GachaADTime; public DateTime GachaADTime { get { return _GachaADTime; } set { _GachaADTime = value; _GachaADTime.Obfuscate(); } } + ProtectedDateTime _ShopADTime; public DateTime ShopADTime { get { return _ShopADTime; } set { _ShopADTime = value; _ShopADTime.Obfuscate(); } } - ProtectedBool _BuyShopWeekly; public bool BuyShopWeekly { get { return _BuyShopWeekly; } set { _BuyShopWeekly = value; _BuyShopWeekly.Obfuscate(); } } - ProtectedBool _BuyShopMiniGame; public bool BuyShopMiniGame { get { return _BuyShopMiniGame; } set { _BuyShopMiniGame = value; _BuyShopMiniGame.Obfuscate(); } } - ProtectedBool _BuyShopOne1; public bool BuyShopOne1 { get { return _BuyShopOne1; } set { _BuyShopOne1 = value; _BuyShopOne1.Obfuscate(); } } - ProtectedBool _BuyShopOne2; public bool BuyShopOne2 { get { return _BuyShopOne2; } set { _BuyShopOne2 = value; _BuyShopOne2.Obfuscate(); } } -} + ProtectedBool _BuyShopWeekly; public bool BuyShopWeekly { get { return _BuyShopWeekly; } set { _BuyShopWeekly = value; _BuyShopWeekly.Obfuscate(); } } + ProtectedBool _BuyShopMiniGame; public bool BuyShopMiniGame { get { return _BuyShopMiniGame; } set { _BuyShopMiniGame = value; _BuyShopMiniGame.Obfuscate(); } } + ProtectedBool _BuyShopOne1; public bool BuyShopOne1 { get { return _BuyShopOne1; } set { _BuyShopOne1 = value; _BuyShopOne1.Obfuscate(); } } + ProtectedBool _BuyShopOne2; public bool BuyShopOne2 { get { return _BuyShopOne2; } set { _BuyShopOne2 = value; _BuyShopOne2.Obfuscate(); } } + } } \ No newline at end of file diff --git a/Assets/Scripts/Title/TitleInfo.cs b/Assets/Scripts/Title/TitleInfo.cs index ba20d58..b5d8fae 100644 --- a/Assets/Scripts/Title/TitleInfo.cs +++ b/Assets/Scripts/Title/TitleInfo.cs @@ -28,8 +28,6 @@ public class TitleInfo : MonoBehaviour label_msg.text = "로비로 진입 중입니다."; yield return null; - // 인앱 결제 정보 받아오기 - //label_msg.text = table_localtext.Ins.Get_Text(3); yield return new WaitForSeconds(0.1f); gameObject.SetActive(false); go_LobbyUI.SetActive(true); diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 5cbce77..a2f553d 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -40,18 +40,33 @@ public class GachaUI : uScrollViewMgr } } + public void OnClick_AD() + { + if (SaveMgr.Ins.CanShowGachaAD()) + { + // TODO : 광고 보기 + SaveMgr.Ins.Add_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAD_Reward")); + SaveMgr.Ins.Add_GachaADTime(table_GlobalValue.Ins.Get_Int("ADSec_Gacha")); + LobbyUI.Ins.m_ToastUI.Set($"가챠 코인 {table_GlobalValue.Ins.Get_Int("GachaAD_Reward")}개를 획득했습니다."); + } + } + public void OnClick_Gacha() { - var gradedata = table_gacharateconfig.Ins.Get_RadomData(); - DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); - var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); - SaveMgr.Ins.Add_Money(reward.Item1, reward.Item2); - SaveMgr.Ins.Add_Money(eMoney.Lucky, reward.Item3); - SaveMgr.Ins.Save(); - list_log.Add((reward.Item1, reward.Item2)); - list_log.Add((eMoney.Lucky, reward.Item3)); - Set_ScrollView(list_log); - Set_Vertical_ScrollEnd(0); - Set_UI(); + if (SaveMgr.Ins.Check_Money(eMoney.Gacha, table_GlobalValue.Ins.Get_Int("GachaAmount"))) + { + SaveMgr.Ins.Add_Money(eMoney.Gacha, -table_GlobalValue.Ins.Get_Int("GachaAmount")); + var gradedata = table_gacharateconfig.Ins.Get_RadomData(); + DSUtil.InActivateGameObjects(gos_grade, gradedata.n_GachaGrade - 1); + var reward = table_gachareward.Ins.Get_Reward(gradedata.n_GachaGrade); + SaveMgr.Ins.Add_Money(reward.Item1, reward.Item2); + SaveMgr.Ins.Add_Money(eMoney.Lucky, reward.Item3); + SaveMgr.Ins.Save(); + list_log.Add((reward.Item1, reward.Item2)); + list_log.Add((eMoney.Lucky, reward.Item3)); + Set_ScrollView(list_log); + Set_Vertical_ScrollEnd(0); + Set_UI(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index 4a3e482..ad2bfc6 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -29,20 +29,23 @@ public class LobbyUI : MonoBehaviourSingletonTemplate case "btn_attendance": m_AttandanceUI.Set(); break; case "btn_option": m_OptionUI.Set(); break; - case "btn_album": m_AlbumUI.Set(); break; - case "btn_home": - m_AlbumUI.gameObject.SetActive(false); - m_GachaUI.gameObject.SetActive(false); - go_shop.SetActive(false); - DSUtil.ActivateGameObjects(gos_homeBot); - break; + case "btn_album": Go_Home(); m_AlbumUI.Set(); break; + case "btn_home": Go_Home(); break; case "btn_gacha": m_GachaUI.Set(); break; case "btn_shop": + Go_Home(); go_shop.SetActive(true); DSUtil.InActivateGameObjects(gos_homeBot); break; } } + void Go_Home() + { + m_AlbumUI.gameObject.SetActive(false); + m_GachaUI.gameObject.SetActive(false); + go_shop.SetActive(false); + DSUtil.ActivateGameObjects(gos_homeBot); + } public void Set_Money() { diff --git a/Assets/Scripts/UI/ShopCard.cs b/Assets/Scripts/UI/ShopCard.cs index 6a31fa2..8ca7dcd 100644 --- a/Assets/Scripts/UI/ShopCard.cs +++ b/Assets/Scripts/UI/ShopCard.cs @@ -71,7 +71,7 @@ public class ShopCard : MonoBehaviour { // TODO : 광고 보기 SaveMgr.Ins.Add_Money(eMoney.Chat, m_Data.n_RewardChatCoin); - SaveMgr.Ins.Add_ShopADTime(m_Data.n_ADSec); + SaveMgr.Ins.Add_ShopADTime(table_GlobalValue.Ins.Get_Int("ADSec_Shop")); LobbyUI.Ins.m_ToastUI.Set($"채팅 코인 {m_Data.n_RewardChatCoin}개를 획득했습니다."); } break; @@ -109,6 +109,7 @@ public class ShopCard : MonoBehaviour msg += $"가챠 코인 {m_Data.n_RewardGacha}개를 획득했습니다."; } + if (string.IsNullOrEmpty(msg)) msg = "보상이 없습니다.\n보상을 설정해 주세요!"; return msg; }