diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index 8eb4143..049f4b1 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": "럭키 블록 최대 스피드"}, {"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": "상점 광고 시간 (초)"}, {"s_ID": "MiniGameHP", "n_Value": "10", "exception": "미니 게임 HP"}, {"s_ID": "MiniGameSpeedMin", "n_Value": "0.2", "exception": "미니 게임 방해물 최소 속도"}, {"s_ID": "MiniGameSpeedMax", "n_Value": "1", "exception": "미니 게임 방해물 최대 속도"}, {"s_ID": "MiniGameWeight_White", "n_Value": "100", "exception": "미니 게임 흰 액체 등장 확률"}, {"s_ID": "MiniGameWeight_Red", "n_Value": "50", "exception": "미니 게임 빨간 액체 등장 확률"}, {"s_ID": "MiniGameWeight_HpHeal", "n_Value": "5", "exception": "미니 게임 체력 회복 등장 확률"}, {"s_ID": "MiniGameWeight_AlbumOpen", "n_Value": "5", "exception": "미니 게임 앨범 오픈 재화 등장 확률"}, {"s_ID": "MiniGameWeight_ChatCoin", "n_Value": "5", "exception": "미니 게임 채팅 코인 등장 확률"}, {"s_ID": "MiniGameWeight_GachaCoin", "n_Value": "5", "exception": "미니 게임 가챠 코인 등장 확률"}, {"s_ID": "MiniGameWeight_ItemBomb", "n_Value": "1", "exception": "미니 게임 폭탄 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemUmbrella", "n_Value": "1", "exception": "미니 게임 우산 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemDildo", "n_Value": "1", "exception": "미니 게임 딜도 아이템 등장 확률"}, {"s_ID": "MiniGamePCSpeed", "n_Value": "500", "exception": "미니 게임 PC 스피드"}, {"s_ID": "MiniGame_White_DMG", "n_Value": "1", "exception": "미니 게임 흰 액체 데미지"}, {"s_ID": "MiniGame_Red_DMG", "n_Value": "2", "exception": "미니 게임 빨간 액체 데미지"}, {"s_ID": "MiniGame_Heal", "n_Value": "1", "exception": "미니 게임 체력 회복량"}, {"s_ID": "MiniGame_Heart_Amount", "n_Value": "1", "exception": "미니 게임 앨범 오픈 재화 획득량"}, {"s_ID": "MiniGame_ChatCoin_Amount", "n_Value": "1", "exception": "미니 게임 채팅 코인 획득량"}, {"s_ID": "MiniGame_GachaCoin_Amount", "n_Value": "1", "exception": "미니 게임 가챠 코인 획득량"}, {"s_ID": "MiniGame_Obtacle_Create_Gap", "n_Value": "1.5", "exception": "1. 최초 생성 시간 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Reduce", "n_Value": "0.1", "exception": "2. 생성시간 감소 값 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Time", "n_Value": "10", "exception": "3. 생성 시간 감소 주기 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_LimitTime", "n_Value": "0.5", "exception": "4. 최대 생성 제한 시간 (초)"}] \ 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": "상점 광고 시간 (초)"}, {"s_ID": "MiniGameHP", "n_Value": "10", "exception": "미니 게임 HP"}, {"s_ID": "MiniGameSpeedMin", "n_Value": "0.2", "exception": "미니 게임 방해물 최소 속도"}, {"s_ID": "MiniGameSpeedMax", "n_Value": "1", "exception": "미니 게임 방해물 최대 속도"}, {"s_ID": "MiniGameWeight_White", "n_Value": "100", "exception": "미니 게임 흰 액체 등장 확률"}, {"s_ID": "MiniGameWeight_Red", "n_Value": "50", "exception": "미니 게임 빨간 액체 등장 확률"}, {"s_ID": "MiniGameWeight_HpHeal", "n_Value": "5", "exception": "미니 게임 체력 회복 등장 확률"}, {"s_ID": "MiniGameWeight_AlbumOpen", "n_Value": "5", "exception": "미니 게임 앨범 오픈 재화 등장 확률"}, {"s_ID": "MiniGameWeight_ChatCoin", "n_Value": "5", "exception": "미니 게임 채팅 코인 등장 확률"}, {"s_ID": "MiniGameWeight_GachaCoin", "n_Value": "5", "exception": "미니 게임 가챠 코인 등장 확률"}, {"s_ID": "MiniGameWeight_ItemBomb", "n_Value": "1", "exception": "미니 게임 폭탄 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemUmbrella", "n_Value": "1", "exception": "미니 게임 우산 아이템 등장 확률"}, {"s_ID": "MiniGameWeight_ItemDildo", "n_Value": "1", "exception": "미니 게임 딜도 아이템 등장 확률"}, {"s_ID": "MiniGamePCSpeed", "n_Value": "500", "exception": "미니 게임 PC 스피드"}, {"s_ID": "MiniGame_White_DMG", "n_Value": "1", "exception": "미니 게임 흰 액체 데미지"}, {"s_ID": "MiniGame_Red_DMG", "n_Value": "2", "exception": "미니 게임 빨간 액체 데미지"}, {"s_ID": "MiniGame_Heal", "n_Value": "1", "exception": "미니 게임 체력 회복량"}, {"s_ID": "MiniGame_Heart_Amount", "n_Value": "1", "exception": "미니 게임 앨범 오픈 재화 획득량"}, {"s_ID": "MiniGame_ChatCoin_Amount", "n_Value": "1", "exception": "미니 게임 채팅 코인 획득량"}, {"s_ID": "MiniGame_GachaCoin_Amount", "n_Value": "1", "exception": "미니 게임 가챠 코인 획득량"}, {"s_ID": "MiniGame_Obtacle_Create_Gap", "n_Value": "1.5", "exception": "1. 최초 생성 시간 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Reduce", "n_Value": "0.1", "exception": "2. 생성시간 감소 값 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_Time", "n_Value": "10", "exception": "3. 생성 시간 감소 주기 (초)"}, {"s_ID": "MiniGame_Obtacle_Gap_LimitTime", "n_Value": "0.5", "exception": "4. 최대 생성 제한 시간 (초)"}, {"s_ID": "MiniGame_TotalEnterMoney", "n_Value": "5", "exception": "미니게임 체력 총 개수"}, {"s_ID": "MiniGame_EnterMoney_Time", "n_Value": "1200", "exception": "미니게임 체력 재충전 시간 (초)"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index 14ee19c..d261bc7 100644 Binary files a/Assets/ResWork/Table/SheGotWet.xlsm and b/Assets/ResWork/Table/SheGotWet.xlsm differ diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index d858254..08065d7 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -3844,6 +3844,7 @@ RectTransform: m_Children: - {fileID: 673671246} - {fileID: 325580663} + - {fileID: 1793160175} m_Father: {fileID: 240605636} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} @@ -10196,7 +10197,7 @@ BoxCollider2D: drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 - m_Size: {x: 2048, y: 50} + m_Size: {x: 1080, y: 50} m_EdgeRadius: 0 --- !u!114 &420248623 MonoBehaviour: @@ -11892,6 +11893,7 @@ GameObject: - component: {fileID: 500962024} - component: {fileID: 500962030} - component: {fileID: 500962029} + - component: {fileID: 500962031} m_Layer: 0 m_Name: Infos m_TagString: Untagged @@ -12003,6 +12005,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9dba3ba9990545b4e9ee979eec53371b, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &500962031 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 500962021} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4177bc10460c0264eb933d4c43a6f313, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &511387423 GameObject: m_ObjectHideFlags: 0 @@ -33446,7 +33460,7 @@ RectTransform: 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: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 100} m_SizeDelta: {x: 800, y: 1200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1483615885 @@ -35401,6 +35415,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1539835409} m_CullTransparentMesh: 1 +--- !u!1 &1556120089 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1556120090} + - component: {fileID: 1556120092} + - component: {fileID: 1556120091} + m_Layer: 5 + m_Name: New Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1556120090 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556120089} + 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: 1793160175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 50, y: 0} + m_SizeDelta: {x: 80, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1556120091 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556120089} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 44d63f15ed7924f44872cde22da94342, 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 &1556120092 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556120089} + m_CullTransparentMesh: 1 --- !u!1 &1569724566 GameObject: m_ObjectHideFlags: 0 @@ -40486,6 +40575,83 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1792843447} m_CullTransparentMesh: 1 +--- !u!1 &1793160174 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1793160175} + - component: {fileID: 1793160177} + - component: {fileID: 1793160176} + m_Layer: 5 + m_Name: minigameHP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1793160175 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793160174} + 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: 2057533034} + - {fileID: 1556120090} + m_Father: {fileID: 168358558} + 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: 10, y: 79} + m_SizeDelta: {x: 250, y: 80} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1793160176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793160174} + 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: 0.21960786, g: 0.21960786, b: 0.21960786, 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: b0a7567624709ee45872c0e655845f2d, 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 &1793160177 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1793160174} + m_CullTransparentMesh: 1 --- !u!1 &1794393860 GameObject: m_ObjectHideFlags: 0 @@ -46417,6 +46583,142 @@ MonoBehaviour: m_EditorClassIdentifier: m_HorizontalFit: 0 m_VerticalFit: 2 +--- !u!1 &2057533033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057533034} + - component: {fileID: 2057533036} + - component: {fileID: 2057533035} + m_Layer: 5 + m_Name: t_hp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2057533034 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057533033} + 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: 1793160175} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -19, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2057533035 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057533033} + 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: 5 + 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: 4 + 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 &2057533036 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057533033} + m_CullTransparentMesh: 1 --- !u!1 &2062026437 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/AttachToGameObject/ADInfo.cs b/Assets/Scripts/AttachToGameObject/ADInfo.cs index 235f096..290a0ce 100644 --- a/Assets/Scripts/AttachToGameObject/ADInfo.cs +++ b/Assets/Scripts/AttachToGameObject/ADInfo.cs @@ -2,12 +2,12 @@ using GoogleMobileAds.Api; using System; using UnityEngine; -public class ADInfo : MonoBehaviour +public class ADInfo : MonoBehaviourSingletonTemplate { - [RuntimeInitializeOnLoadMethod] - static void OnRuntimeMethodLoad() { new GameObject("ADInfo").AddComponent(); } + //[RuntimeInitializeOnLoadMethod] + //static void OnRuntimeMethodLoad() { new GameObject("ADInfo").AddComponent(); } - public static ADInfo Ins; + //public static ADInfo Ins; private RewardedInterstitialAd short_rewardedInterstitialAd; string rewardedInterstitialAd_ID = "ca-app-pub-6390804219581974/3468554834"; @@ -26,11 +26,11 @@ public class ADInfo : MonoBehaviour Action Action_success, Action_fail; bool isLoading_InterstitialAd, isLoading_RewardedAd; - private void Awake() - { - Ins = this; - DontDestroyOnLoad(gameObject); - } + //private void Awake() + //{ + // Ins = this; + // DontDestroyOnLoad(gameObject); + //} public void Start() { @@ -192,8 +192,9 @@ public class ADInfo : MonoBehaviour } } - private void Update() + protected override void Update() { + base.Update(); switch (GetReward) { case 1: diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 50bba39..c10cf74 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -49,7 +49,8 @@ public class SaveMgr : MonoBehaviourSingletonTemplate SelectGirlID = 1, LastDoY = 0, AttendanceDoY = 0, - GirlUnLockIndex = 1 + GirlUnLockIndex = 1, + MiniGameHP = table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney") }; } } @@ -94,6 +95,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate 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.MiniGameHP: m_SaveData.MiniGameHP += add; break; //case eMoney.ItemBomb: m_SaveData.ItemBomb += add; break; //case eMoney.ItemUmbrella: m_SaveData.ItemUmbrella += add; break; //case eMoney.ItemDildo: m_SaveData.ItemDildo += add; break; @@ -109,6 +111,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate case eMoney.Chat: m_SaveData.MoneyChatCoin = val; break; case eMoney.Gacha: m_SaveData.MoneyGacha = val; break; case eMoney.Lucky: m_SaveData.MoneyLucky = val; break; + case eMoney.MiniGameHP: m_SaveData.MiniGameHP = val; break; //case eMoney.ItemBomb: m_SaveData.ItemBomb = val; break; //case eMoney.ItemUmbrella: m_SaveData.ItemUmbrella = val; break; //case eMoney.ItemDildo: m_SaveData.ItemDildo = val; break; @@ -124,6 +127,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate case eMoney.Chat: return m_SaveData.MoneyChatCoin; case eMoney.Gacha: return m_SaveData.MoneyGacha; case eMoney.Lucky: return m_SaveData.MoneyLucky; + case eMoney.MiniGameHP: return m_SaveData.MiniGameHP; //case eMoney.ItemBomb: return m_SaveData.ItemBomb; //case eMoney.ItemUmbrella: return m_SaveData.ItemUmbrella; //case eMoney.ItemDildo: return m_SaveData.ItemDildo; @@ -137,6 +141,13 @@ public class SaveMgr : MonoBehaviourSingletonTemplate return enough; } + public DateTime Get_MiniGameTime() { return m_SaveData.MiniGameHPTime; } + public void Set_MiniGameTime() + { + m_SaveData.MiniGameHPTime = InternetTime.Ins.Time.AddSeconds(table_GlobalValue.Ins.Get_Int("MiniGame_EnterMoney_Time")); + Save(); + } + public void DailyCheck() { m_SaveData.LastDoY = InternetTime.Ins.Time.DayOfYear; @@ -241,10 +252,12 @@ public class SaveMgr : MonoBehaviourSingletonTemplate 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 _MiniGameHP; public int MiniGameHP { get { return _MiniGameHP; } set { _MiniGameHP = value; _MiniGameHP.Obfuscate(); } } //ProtectedInt32 _ItemBomb; public int ItemBomb { get { return _ItemBomb; } set { _ItemBomb = value; _ItemBomb.Obfuscate(); } } //ProtectedInt32 _ItemUmbrella; public int ItemUmbrella { get { return _ItemUmbrella; } set { _ItemUmbrella = value; _ItemUmbrella.Obfuscate(); } } //ProtectedInt32 _ItemDildo; public int ItemDildo { get { return _ItemDildo; } set { _ItemDildo = value; _ItemDildo.Obfuscate(); } } + ProtectedDateTime _MiniGameHPTime; public DateTime MiniGameHPTime { get { return _MiniGameHPTime; } set { _MiniGameHPTime = value; _MiniGameHPTime.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(); } } diff --git a/Assets/Scripts/Game/Game_Mini_Result.cs b/Assets/Scripts/Game/Game_Mini_Result.cs index c9095b4..4a303fe 100644 --- a/Assets/Scripts/Game/Game_Mini_Result.cs +++ b/Assets/Scripts/Game/Game_Mini_Result.cs @@ -22,10 +22,10 @@ public class Game_Mini_Result : MonoBehaviour public void OnClick_AD() { - // TODO 광고 보고 한 번 더 지급 + ADInfo.Ins.Show_AD(true, () => { LobbyUI.Ins.m_Game_Mini.Save_GameResult(); LobbyUI.Ins.m_Game_Mini.OnClick_Exit(); - } + }); } } \ No newline at end of file diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index a2f553d..5f83bf8 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -44,10 +44,12 @@ public class GachaUI : uScrollViewMgr { 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")}개를 획득했습니다."); + ADInfo.Ins.Show_AD(false, () => + { + 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")}개를 획득했습니다."); + }); } } diff --git a/Assets/Scripts/UI/LobbyUI.cs b/Assets/Scripts/UI/LobbyUI.cs index b7d49fe..ebfeb2b 100644 --- a/Assets/Scripts/UI/LobbyUI.cs +++ b/Assets/Scripts/UI/LobbyUI.cs @@ -4,7 +4,7 @@ using UnityEngine; public class LobbyUI : MonoBehaviourSingletonTemplate { - [SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화 + [SerializeField] TextMeshProUGUI[] texts_money; // 0 앨범 개방 재화, 1 채팅 재화, 2 뽑기 재화, 3 미니게임 체력 [Header("Popup UI")] [SerializeField] AttandanceUI m_AttandanceUI; @@ -29,6 +29,13 @@ public class LobbyUI : MonoBehaviourSingletonTemplate yield return null; if (SaveMgr.Ins.CanGet_Attandance()) m_AttandanceUI.Set(); + //Act_Repeat_for1sec = () => + //{ + // if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) <= 0) + // { + // var cal = + // } + //}; } public void OnClick_Button(GameObject btn) @@ -48,7 +55,27 @@ public class LobbyUI : MonoBehaviourSingletonTemplate break; case "btn_minigame": - m_Game_Mini.Set(); + if (SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) + { + SaveMgr.Ins.Add_Money(eMoney.MiniGameHP, -1); + m_Game_Mini.Set(); + if (!SaveMgr.Ins.Check_Money(eMoney.MiniGameHP, 1, false)) + SaveMgr.Ins.Set_MiniGameTime(); + else + SaveMgr.Ins.Save(); + } + else + { + var cal = SaveMgr.Ins.Get_MiniGameTime() - InternetTime.Ins.Time; + if (cal.TotalSeconds > 0) + m_ToastUI.Set($"미니게임 체력 모두 충전까지 남은 시간\n{cal}"); + else + { + SaveMgr.Ins.Set_Money(eMoney.MiniGameHP, table_GlobalValue.Ins.Get_Int("MiniGame_TotalEnterMoney")); + SaveMgr.Ins.Save(); + m_ToastUI.Set($"미니게임 체력이 모두 충전되었습니다."); + } + } break; } } @@ -65,6 +92,8 @@ public class LobbyUI : MonoBehaviourSingletonTemplate texts_money[0].text = SaveMgr.Ins.Get_Money(eMoney.AlbumOpen).ToString(); texts_money[1].text = SaveMgr.Ins.Get_Money(eMoney.Chat).ToString(); texts_money[2].text = SaveMgr.Ins.Get_Money(eMoney.Gacha).ToString(); + //if (SaveMgr.Ins.Get_Money(eMoney.MiniGameHP) > 0) + texts_money[3].text = SaveMgr.Ins.Get_Money(eMoney.MiniGameHP).ToString(); } public void Show_Profile(int girlid) diff --git a/Assets/Scripts/UI/OptionUI.cs b/Assets/Scripts/UI/OptionUI.cs index a7d2c57..3694c7f 100644 --- a/Assets/Scripts/UI/OptionUI.cs +++ b/Assets/Scripts/UI/OptionUI.cs @@ -1,7 +1,7 @@ using UnityEngine; public enum eOption { Sound, Bgm } -public enum eMoney { AlbumOpen, Chat, Gacha, Lucky, ItemBomb, ItemUmbrella, ItemDildo } +public enum eMoney { AlbumOpen, Chat, Gacha, Lucky, MiniGameHP, ItemBomb, ItemUmbrella, ItemDildo } public class OptionUI : MonoBehaviour { diff --git a/Assets/Scripts/UI/ShopCard.cs b/Assets/Scripts/UI/ShopCard.cs index 8ca7dcd..054b9e5 100644 --- a/Assets/Scripts/UI/ShopCard.cs +++ b/Assets/Scripts/UI/ShopCard.cs @@ -69,10 +69,12 @@ public class ShopCard : MonoBehaviour case eShopBuyType.AD: if (SaveMgr.Ins.CanShowShopAD()) { - // TODO : 광고 보기 - SaveMgr.Ins.Add_Money(eMoney.Chat, m_Data.n_RewardChatCoin); - SaveMgr.Ins.Add_ShopADTime(table_GlobalValue.Ins.Get_Int("ADSec_Shop")); - LobbyUI.Ins.m_ToastUI.Set($"채팅 코인 {m_Data.n_RewardChatCoin}개를 획득했습니다."); + ADInfo.Ins.Show_AD(false, () => + { + SaveMgr.Ins.Add_Money(eMoney.Chat, m_Data.n_RewardChatCoin); + SaveMgr.Ins.Add_ShopADTime(table_GlobalValue.Ins.Get_Int("ADSec_Shop")); + LobbyUI.Ins.m_ToastUI.Set($"채팅 코인 {m_Data.n_RewardChatCoin}개를 획득했습니다."); + }); } break; case eShopBuyType.Coin: diff --git a/Assets/Scripts/Util/MyCoroutine.cs b/Assets/Scripts/Util/MyCoroutine.cs index d7bc946..603cf69 100644 --- a/Assets/Scripts/Util/MyCoroutine.cs +++ b/Assets/Scripts/Util/MyCoroutine.cs @@ -1,8 +1,6 @@ using System; using System.Collections; -using System.Collections.Generic; using UnityEngine; -using UnityEngine.AI; public class MyCoroutine : MonoBehaviour { diff --git a/Assets/SheGotWet_Memo.txt b/Assets/SheGotWet_Memo.txt index 290e118..e0c0828 100644 --- a/Assets/SheGotWet_Memo.txt +++ b/Assets/SheGotWet_Memo.txt @@ -1,6 +1,7 @@ 사운드 및 BGM 요청 미니게임 만들기 + - 미니게임을 진행하기 위해서는 체력이 필요하며, 체력은 완전 소진 후 매 20분마다 완전 회복된다. - 광고 적용 - 아이템 기능 구현 - + - 광고 제거권