diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index cff1ec3..ede9f97 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_AlbumOpen", "n_Value": "5", "exception": "미니 게임 앨범 오픈 재화 등장 확률"}, {"s_ID": "MiniGameWeight_ChatCoin", "n_Value": "5", "exception": "미니 게임 채팅 코인 등장 확률"}, {"s_ID": "MiniGameWeight_GachaCoin", "n_Value": "5", "exception": "미니 게임 가챠 코인 등장 확률"}, {"s_ID": "MiniGameWeight_HpHeal", "n_Value": "5", "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_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_Heal", "n_Value": "1", "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": "상점 광고 시간 (초)"}, {"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": "미니 게임 가챠 코인 획득량"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index bce46d1..a0c6c6f 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 a7bc2eb..a46c677 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -19980,10 +19980,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2007599843} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 2007599845} + m_TargetAssemblyTypeName: Game_Mini, Assembly-CSharp + m_MethodName: OnClick_Exit + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine @@ -22898,30 +22898,6 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 225852841} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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 - - m_Target: {fileID: 2007599843} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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 - m_Target: {fileID: 225852843} m_TargetAssemblyTypeName: Game_Mini_Result, Assembly-CSharp m_MethodName: OnClick_AD @@ -27450,7 +27426,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7167a130bcab9b34cb03849255c06a7e, type: 3} + m_Sprite: {fileID: 21300000, guid: 034529a3123cae74591b400682709c01, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -28823,7 +28799,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7b7d8ffa6446e944aa91a3f22f3fa6f, type: 3} m_Name: m_EditorClassIdentifier: - m_Item: 0 + m_Item: 1 i_item: {fileID: 1402616029} t_amount: {fileID: 1736246358} go_btnPlus: {fileID: 2108716405} @@ -31632,7 +31608,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7167a130bcab9b34cb03849255c06a7e, type: 3} + m_Sprite: {fileID: 21300000, guid: f4d57aa29e495ec49bedde143bf86da1, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -32335,7 +32311,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f7b7d8ffa6446e944aa91a3f22f3fa6f, type: 3} m_Name: m_EditorClassIdentifier: - m_Item: 0 + m_Item: 2 i_item: {fileID: 1213874608} t_amount: {fileID: 1739194098} go_btnPlus: {fileID: 1452126057} @@ -39133,7 +39109,7 @@ GameObject: - component: {fileID: 1736246359} - component: {fileID: 1736246358} m_Layer: 5 - m_Name: t_amount + m_Name: t_amount_chat m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -39269,7 +39245,7 @@ GameObject: - component: {fileID: 1739194099} - component: {fileID: 1739194098} m_Layer: 5 - m_Name: t_amount + m_Name: t_amount_gacha m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -41768,7 +41744,7 @@ GameObject: - component: {fileID: 1852219948} - component: {fileID: 1852219947} m_Layer: 5 - m_Name: t_amount + m_Name: t_amount_bomb m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -45303,8 +45279,8 @@ RectTransform: - {fileID: 754949300} - {fileID: 1246693590} - {fileID: 1985894237} - - {fileID: 707889050} - {fileID: 33928729} + - {fileID: 707889050} - {fileID: 225852842} m_Father: {fileID: 48693080} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -45330,6 +45306,9 @@ MonoBehaviour: - {fileID: 248720772} - {fileID: 160604561} - {fileID: 975045578} + - {fileID: 1852219947} + - {fileID: 1736246358} + - {fileID: 1739194098} i_girl: {fileID: 78161989} i_girlsd: {fileID: 754949301} items: @@ -48213,22 +48192,10 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 225852841} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 - 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 - - m_Target: {fileID: 2007599843} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: SetActive - m_Mode: 6 + - m_Target: {fileID: 2007599845} + m_TargetAssemblyTypeName: Game_Mini, Assembly-CSharp + m_MethodName: OnClick_Exit + m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index c0bce6b..6acbc9b 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -101,6 +101,21 @@ public class SaveMgr : MonoBehaviourSingletonTemplate LobbyUI.Ins.Set_Money(); } + public void Set_Money(eMoney money, int val) + { + switch (money) + { + case eMoney.AlbumOpen: m_SaveData.MoneyHeart = val; break; + 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.ItemBomb: m_SaveData.ItemBomb = val; break; + case eMoney.ItemUmbrella: m_SaveData.ItemUmbrella = val; break; + case eMoney.ItemDildo: m_SaveData.ItemDildo = val; break; + } + + LobbyUI.Ins.Set_Money(); + } public int Get_Money(eMoney money) { switch (money) diff --git a/Assets/Scripts/Game/Game_Mini.cs b/Assets/Scripts/Game/Game_Mini.cs index 8d47800..e57cb97 100644 --- a/Assets/Scripts/Game/Game_Mini.cs +++ b/Assets/Scripts/Game/Game_Mini.cs @@ -4,13 +4,14 @@ using System.Collections.Generic; using System.Linq; using TMPro; using UnityEngine; +using UnityEngine.InputSystem; using UnityEngine.ResourceManagement.AsyncOperations; using UnityEngine.UI; public class Game_Mini : MonoBehaviour { public Game_Mini_Result m_Game_Mini_Result; - public TextMeshProUGUI[] texts_money; // 0 하트, 1 챗코인, 2 가챠 코인 + public TextMeshProUGUI[] texts_money; // 0 하트, 1 챗코인, 2 가챠 코인, 3 폭탄, 4 우산, 5 딜도 public Image i_girl, i_girlsd; public MiniGameItemCard[] items; public Slider slider_hp; @@ -34,43 +35,75 @@ public class Game_Mini : MonoBehaviour private void Awake() { PcPosLimit = (Screen.width >> 1) - 70f; - dic_MoneyText.Add(eMiniGameObtacleType.AlbumOpen, texts_money[0]); - dic_MoneyText.Add(eMiniGameObtacleType.ChatCoin, texts_money[1]); - dic_MoneyText.Add(eMiniGameObtacleType.GachaCoin, texts_money[2]); } - public void Set() + void Init() { if (dic_weight.Count == 0) { dic_weight.Add(eMiniGameObtacleType.White, table_GlobalValue.Ins.Get_Int("MiniGameWeight_White")); dic_weight.Add(eMiniGameObtacleType.Red, table_GlobalValue.Ins.Get_Int("MiniGameWeight_Red")); + dic_weight.Add(eMiniGameObtacleType.HpHeal, table_GlobalValue.Ins.Get_Int("MiniGameWeight_HpHeal")); dic_weight.Add(eMiniGameObtacleType.AlbumOpen, table_GlobalValue.Ins.Get_Int("MiniGameWeight_AlbumOpen")); dic_weight.Add(eMiniGameObtacleType.ChatCoin, table_GlobalValue.Ins.Get_Int("MiniGameWeight_ChatCoin")); dic_weight.Add(eMiniGameObtacleType.GachaCoin, table_GlobalValue.Ins.Get_Int("MiniGameWeight_GachaCoin")); - dic_weight.Add(eMiniGameObtacleType.HpHeal, table_GlobalValue.Ins.Get_Int("MiniGameWeight_HpHeal")); + dic_weight.Add(eMiniGameObtacleType.ItemBomb, table_GlobalValue.Ins.Get_Int("MiniGameWeight_ItemBomb")); + dic_weight.Add(eMiniGameObtacleType.ItemUmbrella, table_GlobalValue.Ins.Get_Int("MiniGameWeight_ItemUmbrella")); + dic_weight.Add(eMiniGameObtacleType.ItemDildo, table_GlobalValue.Ins.Get_Int("MiniGameWeight_ItemDildo")); + } + if (dic_Money.Count == 0) + { + for (eMiniGameObtacleType i = eMiniGameObtacleType.AlbumOpen; i <= eMiniGameObtacleType.ItemDildo; i++) + dic_Money.Add(i, 0); + } + if (dic_MoneyText.Count == 0) + { + dic_MoneyText.Add(eMiniGameObtacleType.AlbumOpen, texts_money[0]); + dic_MoneyText.Add(eMiniGameObtacleType.ChatCoin, texts_money[1]); + dic_MoneyText.Add(eMiniGameObtacleType.GachaCoin, texts_money[2]); + dic_MoneyText.Add(eMiniGameObtacleType.ItemBomb, texts_money[3]); + dic_MoneyText.Add(eMiniGameObtacleType.ItemUmbrella, texts_money[4]); + dic_MoneyText.Add(eMiniGameObtacleType.ItemDildo, texts_money[5]); } - - gameObject.SetActive(true); - m_Game_Mini_Result.gameObject.SetActive(false); - - list_MiniGameObtacle.ForEach(f=>f.gameObject.SetActive(false)); for (int i = 0; i < dic_Money.Keys.ToList().Count; i++) { var key = dic_Money.Keys.ToList()[i]; - dic_Money[key] = 0; + switch (key) + { + default: + dic_Money[key] = 0; + break; + case eMiniGameObtacleType.ItemBomb: + dic_Money[key] = SaveMgr.Ins.Get_Money(eMoney.ItemBomb); + break; + case eMiniGameObtacleType.ItemUmbrella: + dic_Money[key] = SaveMgr.Ins.Get_Money(eMoney.ItemUmbrella); + break; + case eMiniGameObtacleType.ItemDildo: + dic_Money[key] = SaveMgr.Ins.Get_Money(eMoney.ItemDildo); + break; + } dic_Money[key].Obfuscate(); + dic_MoneyText[key].text = dic_Money[key].ToString(); } - for (int i = 0; i < texts_money.Length; i++) - texts_money[i].text = "0"; + m_Game_Mini_Result.gameObject.SetActive(false); + + list_MiniGameObtacle.ForEach(f => f.gameObject.SetActive(false)); tf_pc.anchoredPosition = new Vector2(0f, 325f); DSUtil.InActivateGameObjects(gos_hiteffect); for (int i = 0; i < items.Length; i++) items[i].Set(); + } + + public void Set() + { + gameObject.SetActive(true); + + Init(); i_girl.enabled = false; AddrResourceMgr.Ins.LoadObject($"Girl_Game/{SaveMgr.Ins.Get_SelectGirlID()}-1.png", handle => @@ -182,6 +215,13 @@ public class Game_Mini : MonoBehaviour if (!dic_Money.ContainsKey(type)) dic_Money.Add(type, 0); dic_Money[type] += val; + + if (type == eMiniGameObtacleType.ItemBomb || type == eMiniGameObtacleType.ItemUmbrella || + type == eMiniGameObtacleType.ItemDildo) + { + if (dic_Money[type] > 5) dic_Money[type] = 5; + } + dic_Money[type].Obfuscate(); if (dic_MoneyText.ContainsKey(type)) dic_MoneyText[type].text = dic_Money[type].ToString(); @@ -199,12 +239,14 @@ public class Game_Mini : MonoBehaviour public void Save_GameResult() { - if (dic_Money.ContainsKey(eMiniGameObtacleType.AlbumOpen)) SaveMgr.Ins.Add_Money(eMoney.AlbumOpen, dic_Money[eMiniGameObtacleType.AlbumOpen]); - if (dic_Money.ContainsKey(eMiniGameObtacleType.ChatCoin)) - SaveMgr.Ins.Add_Money(eMoney.Chat, dic_Money[eMiniGameObtacleType.ChatCoin]); - if (dic_Money.ContainsKey(eMiniGameObtacleType.GachaCoin)) - SaveMgr.Ins.Add_Money(eMoney.Gacha, dic_Money[eMiniGameObtacleType.GachaCoin]); + SaveMgr.Ins.Add_Money(eMoney.Chat, dic_Money[eMiniGameObtacleType.ChatCoin]); + SaveMgr.Ins.Add_Money(eMoney.Gacha, dic_Money[eMiniGameObtacleType.GachaCoin]); + + SaveMgr.Ins.Set_Money(eMoney.ItemBomb, dic_Money[eMiniGameObtacleType.ItemBomb]); + SaveMgr.Ins.Set_Money(eMoney.ItemUmbrella, dic_Money[eMiniGameObtacleType.ItemUmbrella]); + SaveMgr.Ins.Set_Money(eMoney.ItemDildo, dic_Money[eMiniGameObtacleType.ItemDildo]); + SaveMgr.Ins.Save(); } @@ -229,4 +271,13 @@ public class Game_Mini : MonoBehaviour yield return new WaitForSeconds(1.5f); effect.SetActive(false); } + + public void OnClick_Exit() + { + gameObject.SetActive(false); + m_Game_Mini_Result.gameObject.SetActive(false); + AddrResourceMgr.Ins.Relese(m_Handle1); + AddrResourceMgr.Ins.Relese(m_Handle2); + AddrResourceMgr.Ins.Relese(m_HandleSD); + } } \ No newline at end of file diff --git a/Assets/Scripts/Game/Game_Mini_Result.cs b/Assets/Scripts/Game/Game_Mini_Result.cs index f8f9bfa..5cb3380 100644 --- a/Assets/Scripts/Game/Game_Mini_Result.cs +++ b/Assets/Scripts/Game/Game_Mini_Result.cs @@ -10,9 +10,9 @@ public class Game_Mini_Result : MonoBehaviour gameObject.SetActive(true); var dic = LobbyUI.Ins.m_Game_Mini.Get_ResultMoney(); - texts[1].text = dic.ContainsKey(eMiniGameObtacleType.AlbumOpen) ? dic[eMiniGameObtacleType.AlbumOpen].ToString() : "0"; - texts[2].text = dic.ContainsKey(eMiniGameObtacleType.ChatCoin) ? dic[eMiniGameObtacleType.ChatCoin].ToString() : "0"; - texts[3].text = dic.ContainsKey(eMiniGameObtacleType.GachaCoin) ? dic[eMiniGameObtacleType.GachaCoin].ToString() : "0"; + texts[1].text = dic[eMiniGameObtacleType.AlbumOpen].ToString(); + texts[2].text = dic[eMiniGameObtacleType.ChatCoin].ToString(); + texts[3].text = dic[eMiniGameObtacleType.GachaCoin].ToString(); // 아이템 한 번 바로 지급 LobbyUI.Ins.m_Game_Mini.Save_GameResult(); @@ -21,6 +21,9 @@ public class Game_Mini_Result : MonoBehaviour public void OnClick_AD() { // TODO 광고 보고 한 번 더 지급 - LobbyUI.Ins.m_Game_Mini.Save_GameResult(); + { + 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/Game/MiniGameObtacle.cs b/Assets/Scripts/Game/MiniGameObtacle.cs index 6cc660a..2693199 100644 --- a/Assets/Scripts/Game/MiniGameObtacle.cs +++ b/Assets/Scripts/Game/MiniGameObtacle.cs @@ -4,7 +4,7 @@ using System.Linq; using UnityEngine; using UnityEngine.UI; -public enum eMiniGameObtacleType { White, Red, AlbumOpen, ChatCoin, GachaCoin, HpHeal } +public enum eMiniGameObtacleType { White, Red, HpHeal, AlbumOpen, ChatCoin, GachaCoin, ItemBomb, ItemUmbrella, ItemDildo } public class MiniGameObtacle : MonoBehaviour { @@ -19,7 +19,6 @@ public class MiniGameObtacle : MonoBehaviour { gameObject.SetActive(true); SetRandomTypeByWeight(dic_weight); - m_Dmg = m_Type == eMiniGameObtacleType.Red ? 2 : 1; m_Rigidbody2D.gravityScale = Random.Range(table_GlobalValue.Ins.Get_Float("MiniGameSpeedMin"), table_GlobalValue.Ins.Get_Float("MiniGameSpeedMax")); @@ -54,7 +53,20 @@ public class MiniGameObtacle : MonoBehaviour i_img.sprite = UIAtlasMgr.Ins.Get_Sprite("hp"); m_Dmg = table_GlobalValue.Ins.Get_Int("MiniGame_Heal"); break; + case eMiniGameObtacleType.ItemBomb: + i_img.sprite = UIAtlasMgr.Ins.Get_Sprite("item_bomb"); + m_Dmg = 1; + break; + case eMiniGameObtacleType.ItemUmbrella: + i_img.sprite = UIAtlasMgr.Ins.Get_Sprite("item_umbrella"); + m_Dmg = 1; + break; + case eMiniGameObtacleType.ItemDildo: + i_img.sprite = UIAtlasMgr.Ins.Get_Sprite("item_dildo"); + m_Dmg = 1; + break; } + m_Dmg.Obfuscate(); void SetRandomTypeByWeight(Dictionary dic_weight) {