diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index ba43733..acc617a 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -53,7 +53,7 @@ MonoBehaviour: m_Id: m_RemoteCatalogLoadPath: m_Id: - m_ContentStateBuildPathProfileVariableName: + m_ContentStateBuildPathProfileVariableName: m_CustomContentStateBuildPath: m_ContentStateBuildPath: m_BuildAddressablesWithPlayerBuild: 0 diff --git a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset index c041f6b..3993abd 100644 --- a/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset +++ b/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset @@ -26,6 +26,11 @@ MonoBehaviour: m_ReadOnly: 0 m_SerializedLabels: [] FlaggedDuringContentUpdateRestriction: 0 + - m_GUID: 9bef269f90a11c545bd6c49e5eeaa40c + m_Address: Assets/Res_Addr/Girl_LuckyGame + m_ReadOnly: 0 + m_SerializedLabels: [] + FlaggedDuringContentUpdateRestriction: 0 m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: a2b1186de4aee1c42bc7b90913f7e65c, type: 2} m_SchemaSet: diff --git a/Assets/ResWork/Table/Export/GlobalValue.json b/Assets/ResWork/Table/Export/GlobalValue.json index 6b17a5b..be55ac7 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": "75", "exception": "럭키 블록 최소 스피드"}, {"s_ID": "LuckyBlockSpeedMax", "n_Value": "150", "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": "럭키 블록 최대 스피드"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/SheGotWet.xlsm b/Assets/ResWork/Table/SheGotWet.xlsm index b2feda6..169ae37 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 11ec4fa..36c2a19 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -2855,7 +2855,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 38faf4b1b79d421409ae711c54f00723, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -11055,6 +11055,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Game_Lucky_Result: {fileID: 1534428863} + i_girl: {fileID: 314847187} texts: - {fileID: 1294694361} - {fileID: 662051363} diff --git a/Assets/Scripts/AttachToGameObject/SaveMgr.cs b/Assets/Scripts/AttachToGameObject/SaveMgr.cs index 82670c5..400b07b 100644 --- a/Assets/Scripts/AttachToGameObject/SaveMgr.cs +++ b/Assets/Scripts/AttachToGameObject/SaveMgr.cs @@ -2,7 +2,6 @@ using GUPS.AntiCheat.Protected; using Newtonsoft.Json; using System.Collections; using TigerForge; -using UnityEngine; public class SaveMgr : MonoBehaviourSingletonTemplate { @@ -44,7 +43,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate MoneyGacha = 0, MoneyHeart = 0, MoneyLucky = 0, - GirlSelectIndex = 0, + SelectGirlID = 1, LastDoY = 0, AttendanceDoY = 0, GirlUnLockIndex = 1 @@ -146,6 +145,7 @@ public class SaveMgr : MonoBehaviourSingletonTemplate } public int Get_UnLockIndex() { return m_SaveData.GirlUnLockIndex; } + public int Get_SelectGirlID() { return m_SaveData.SelectGirlID; } } public class SaveData @@ -153,7 +153,7 @@ public class SaveData public bool bSound, bBgm; ProtectedInt32 _LastDoY; public int LastDoY { get { return _LastDoY; } set { _LastDoY = value; _LastDoY.Obfuscate(); } } - ProtectedInt32 _GirlSelectIndex; public int GirlSelectIndex { get { return _GirlSelectIndex; } set { _GirlSelectIndex = value; _GirlSelectIndex.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(); } } diff --git a/Assets/Scripts/Game/Game_Lucky.cs b/Assets/Scripts/Game/Game_Lucky.cs index 4e75e96..3791821 100644 --- a/Assets/Scripts/Game/Game_Lucky.cs +++ b/Assets/Scripts/Game/Game_Lucky.cs @@ -3,10 +3,13 @@ using System.Collections; using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.ResourceManagement.AsyncOperations; +using UnityEngine.UI; public class Game_Lucky : MonoBehaviour { public Game_Lucky_Result m_Game_Lucky_Result; + public Image i_girl; public TextMeshProUGUI[] texts; // 0 시간, 1 획득 재화 public GameObject go_dropobj; // 떨어질 공 prefab public Transform tf_cup; // 컵 (움직이고 회전하는 부분) @@ -26,6 +29,8 @@ public class Game_Lucky : MonoBehaviour ProtectedInt32 _bb; public int m_BubbleAmount { get { return _bb; } set { _bb = value; _bb.Obfuscate(); } } ProtectedInt32 TotalBubbleAmount = 50; + AsyncOperationHandle m_Handle; + public void Set() { gameObject.SetActive(true); @@ -33,6 +38,14 @@ public class Game_Lucky : MonoBehaviour bRotCup = false; + i_girl.enabled = false; + AddrResourceMgr.Ins.LoadObject($"Girl_LuckyGame/{SaveMgr.Ins.Get_SelectGirlID()}.png", handle => + { + m_Handle = handle; + i_girl.enabled = true; + i_girl.sprite = handle.Result; + }); + // tf_cup 초기화 tf_cup.localPosition = Vector3.zero; tf_cup.rotation = Quaternion.Euler(0, 0, 0); @@ -100,6 +113,13 @@ public class Game_Lucky : MonoBehaviour StopAllCoroutines(); } + public void ReleaseImage() + { + AddrResourceMgr.Ins.Relese(m_Handle); + i_girl.sprite = null; + gameObject.SetActive(false); + } + Vector3 Get_CupInLocalPos() { return new Vector3(Random.Range(-50f, 50f), 30f + Random.Range(-50f, 50f), 0f); diff --git a/Assets/Scripts/Game/Game_Lucky_Result.cs b/Assets/Scripts/Game/Game_Lucky_Result.cs index 14d885d..79dbec6 100644 --- a/Assets/Scripts/Game/Game_Lucky_Result.cs +++ b/Assets/Scripts/Game/Game_Lucky_Result.cs @@ -15,6 +15,6 @@ public class Game_Lucky_Result : MonoBehaviour public void OnClick_Get() { gameObject.SetActive(false); - LobbyUI.Ins.m_Game_Lucky.gameObject.SetActive(false); + LobbyUI.Ins.m_Game_Lucky.ReleaseImage(); } } \ No newline at end of file diff --git a/Assets/Scripts/UI/GachaUI.cs b/Assets/Scripts/UI/GachaUI.cs index 5cbce77..8e2b169 100644 --- a/Assets/Scripts/UI/GachaUI.cs +++ b/Assets/Scripts/UI/GachaUI.cs @@ -31,9 +31,9 @@ public class GachaUI : uScrollViewMgr public void OnClick_Lucky() { - if (SaveMgr.Ins.Check_Money(eMoney.Lucky, table_GlobalValue.Ins.Get_Int("LuckyPoint"))) + //if (SaveMgr.Ins.Check_Money(eMoney.Lucky, table_GlobalValue.Ins.Get_Int("LuckyPoint"))) { - SaveMgr.Ins.Add_Money(eMoney.Lucky, -table_GlobalValue.Ins.Get_Int("LuckyPoint")); + //SaveMgr.Ins.Add_Money(eMoney.Lucky, -table_GlobalValue.Ins.Get_Int("LuckyPoint")); SaveMgr.Ins.Save(); LobbyUI.Ins.m_Game_Lucky.Set(); Set_UI();