From 245347f93e42ee38ae701fe91f69dc0349e9f041 Mon Sep 17 00:00:00 2001 From: Ino Date: Wed, 10 Sep 2025 11:28:59 +0900 Subject: [PATCH] =?UTF-8?q?=EC=83=81=EB=8C=80=EB=B0=A9=20=EB=8F=88=20?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=B0=B8=EC=A1=B0=20=EB=AF=B8?= =?UTF-8?q?=EC=85=98=EC=9D=B4=20=EC=95=88=20=EB=82=98=EC=98=A4=EB=8A=94=20?= =?UTF-8?q?=EB=B2=84=EA=B7=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Memo.txt | 3 +- .../SingletonManagers/Managers/DBManager.cs | 4 +- Assets/Scripts/UI/GamePanel/GamePanel.cs | 12 +++-- Assets/UI/UIAtlas.spriteatlas | 54 +++++++++++++++++++ 4 files changed, 67 insertions(+), 6 deletions(-) diff --git a/Assets/Memo.txt b/Assets/Memo.txt index 42b5976..41f4754 100644 --- a/Assets/Memo.txt +++ b/Assets/Memo.txt @@ -28,8 +28,7 @@ //////////////////////////////////////////////////////////////////////////////////////////////////// -상대방 돈 테이블 참조 - +엿보기 이미지 (섹지 이미지로) 신규 이펙트 적용 (계속) 구글 및 원스토어 이미지 분기 처리 구글 및 원스토어 아이콘 분기 처리 \ No newline at end of file diff --git a/Assets/Scripts/SingletonManagers/Managers/DBManager.cs b/Assets/Scripts/SingletonManagers/Managers/DBManager.cs index 62dd100..1c0452c 100644 --- a/Assets/Scripts/SingletonManagers/Managers/DBManager.cs +++ b/Assets/Scripts/SingletonManagers/Managers/DBManager.cs @@ -652,7 +652,9 @@ public partial class DBManager : MonoBehaviour public int GetHuntingDataLength() => _lstHuntindData.Count; public long GetRemainigNormalGameAIGold() { - long result = (saveData.NormalGameLevel * NORMAL_GAME_CONDITION_PER_LEVEL) - saveData.NormalGame_GetGold; + //long result = (saveData.NormalGameLevel * NORMAL_GAME_CONDITION_PER_LEVEL) - saveData.NormalGame_GetGold; + var data = DB_HuntingData.GetEntity(GameManager.DB.GetUnlockTargetIndex(true) << 1); + long result = data.DBF_ClearConditionMoney - saveData.NormalGame_GetGold; if (result < 0) result = 0; return result; diff --git a/Assets/Scripts/UI/GamePanel/GamePanel.cs b/Assets/Scripts/UI/GamePanel/GamePanel.cs index f5a1137..99c20a4 100644 --- a/Assets/Scripts/UI/GamePanel/GamePanel.cs +++ b/Assets/Scripts/UI/GamePanel/GamePanel.cs @@ -393,16 +393,22 @@ public partial class GamePanel : MonoBehaviour //if (true) // 테스트 : 미션 100% { GameManager.DB.Set_Mission(false); - + + // 메인 미션 { System.Random rand = new System.Random(); - var keys = dic_missionRate.Keys.ToList(); + var keys = dic_missionRate.Keys + .Where(k => k != eMainMission.Max) // Max 제외 + .ToList(); CurMission = keys[rand.Next(keys.Count)]; } + // 서브 미션 { System.Random rand = new System.Random(); - var keys = dic_submisstionRate.Keys.ToList(); + var keys = dic_submisstionRate.Keys + .Where(k => k != eSubMission.Max) // Max 제외 + .ToList(); CurSubMission = keys[rand.Next(keys.Count)]; } diff --git a/Assets/UI/UIAtlas.spriteatlas b/Assets/UI/UIAtlas.spriteatlas index eaf5142..74cd968 100644 --- a/Assets/UI/UIAtlas.spriteatlas +++ b/Assets/UI/UIAtlas.spriteatlas @@ -57,6 +57,7 @@ SpriteAtlas: - 8388c990b53b08c41b9911ee6e007e62: 21300000 - ee933fb03eb4e414b9ac5e0e8f715803: 21300000 - 9a728be0368979641bc27e5cdc038633: 21300000 + - b0729b0100fa5844986e86606239043d: 21300000 - a35ac2215f4696948b93c2b371cab176: 21300000 - fd240161d2563b9479089e7bce603d59: 21300000 - a013d281dd02f78458e78e671da6bc12: 21300000 @@ -72,6 +73,7 @@ SpriteAtlas: - 64cc73f1b28e8884ba355c0cb01034b3: 21300000 - d6fe5ef1ff785d24bab19ac7d42493bd: 21300000 - 854834127d4924f4faad0c767281fc00: 21300000 + - e457a232f40bbae43914b4642d68b2d2: 21300000 - 1da1f7425c213d1469714e92348ea2fa: 21300000 - 6facc842ead05744184e7db7ba064b48: 21300000 - b0ab67920c010f247b8da3f378389732: 21300000 @@ -82,16 +84,20 @@ SpriteAtlas: - bf1e4423df8c44046ac82fcf15d988b8: 21300000 - 11b3e463969a98f4689c4b13651c0ac1: 21300000 - 20910e73c2d410445aef67558d384856: 21300000 + - 50c9ae73508184a489ff159f1cf0c178: 21300000 - a3c4d1a34338dd548bc729ff5fb6b207: 21300000 - ba7c63d392b1fa6449ea4e65bf25bcab: 21300000 - 990694d32bf174f42bc872264a4ca5b5: 21300000 - 03173cd344450534189a895dbd9c1fc0: 21300000 + - 866f8a24640ab5a428d3d0b5127ac6c4: 21300000 - 946d9b343ae931646886ffb83251235f: 21300000 - c7be9d948878f3d4abcff3f46819093e: 21300000 - 7191e8a4e91b6b041a2186f439616094: 21300000 - 482ff405e1f0a0a4885faf2099f34eec: 21300000 - 8dc3c875171e26e48af6694d40d8df72: 21300000 + - c1645c851360d42438b3296177f97bb2: 21300000 - 8fc032a52ac58f345b86d6dd58fff5a5: 21300000 + - 923d24b58aed2b14ca190e86dcd18f4e: 21300000 - ee4ae7c5c34ebd149abd8c8ee541127b: 21300000 - 5818e4d5b38cf0348868c08daae5f015: 21300000 - 73bf19e561f6d73438ac56310f1d98fd: 21300000 @@ -101,16 +107,20 @@ SpriteAtlas: - 405060b628d10bc4b9afcd479d022831: 21300000 - bc42d5b6ca215294f966ee4c4aaf71f9: 21300000 - 9a4e02c6e5890d64a8a84d7c268fe66a: 21300000 + - 3a59cff615a2f0748810b82b4c401c55: 21300000 - 242cb3974cefd0e46aade680f04dd832: 21300000 - ccfdd697b3fac6041ae86c011597e221: 21300000 - edb524b79cd5212478a3f81b25857157: 21300000 + - 139455b7a18a3f84ca6593ec7c20ad61: 21300000 - 3b1d08b7f515e5d46a05a7ff32ed1295: 21300000 - 5f7fd8185eb11854b9a83301264d3454: 21300000 + - 1fea0a38a4efe854f9548e22373becbf: 21300000 - a2337848f96a3f847ade610699559fd6: 21300000 - 9924e7681288fa742af955890c43c4f1: 21300000 - f36045787352db44494d1b5e4362f551: 21300000 - 126aa3a842be8db428a5cc23690c14b9: 21300000 - 749965a82d7a8cf468f77c2e31d94551: 21300000 + - abfddaa86f31fe74781e998bcaf94854: 21300000 - 1ed037e8186121a45a26dc836f9b9ad8: 21300000 - d4fb52f8d4e36a442a4b87c0a511ddd9: 21300000 - f427dc0923fdac8438454f9efc8d9f23: 21300000 @@ -121,8 +131,10 @@ SpriteAtlas: - cb8ac68917adce3459453ecc85a62e5e: 21300000 - c0513c89f74029a40ae3d6016cd50049: 21300000 - b2ca59a9cc0e96c42857542592a2ddf7: 21300000 + - db064bc98e884c24dafec0b1cac9c28d: 21300000 - 25d6f2f90c405574da74a8001b1fa74e: 21300000 - dab1d10a889b89e4a9b58e930a9375d6: 21300000 + - dcb3e52a73e262948b8ce4642236494c: 21300000 - be5e762aaa6291d43976cb98edcb6448: 21300000 - e9ccc17a3494e584e860fbd3f9f04df9: 21300000 - 5943d49aa8260fd42a04c79f281dc835: 21300000 @@ -132,6 +144,7 @@ SpriteAtlas: - 0d943fcaa092c4849a986d58255ba659: 21300000 - c1053e0bd85736741835357ae6f1a81a: 21300000 - 51edb83ba5087e74fac21f7411beb6b0: 21300000 + - 7ceef04b86d450646a8d9dc40676f867: 21300000 - 7857396ba211dab42af1905b4da3cf19: 21300000 - 9e1f479b5a8e93840a056472840fb34f: 21300000 - 0ec030ab67537f549941e69c78e57ea0: 21300000 @@ -140,14 +153,18 @@ SpriteAtlas: - 7e06a9bbaf9336a42a77056ccbda3f04: 21300000 - 971b17cbc8bb8f44987a1f44a7b19ef4: 21300000 - 959763eb7b5c360488d33c655f551163: 21300000 + - 62a646eb0b7f0c34b8cc6cab0c710031: 21300000 - cc97734c8adea6445a7b4b0c95c64395: 21300000 - 95f1519c113dee04fbae9a3519fedced: 21300000 + - 2e9c2e9c15a2cfd4a809cd1ddba28e51: 21300000 - 83daa8eced54f2946ba40f7aafa39a77: 21300000 - e857d8fc6d6313141973d87d1b17fd7d: 21300000 + - e8e8924db5d728c46994bee5f76639d4: 21300000 - 52b87c5dac4cd004281ddbe6250578a8: 21300000 - 3d5b126d0c64bd44c9a1cdf2d0ed2b98: 21300000 - 24d3027d02286ad4ab28c5e1d12a0343: 21300000 - 0fc3518d5197ef14690a45dffc304c89: 21300000 + - 6a070b9d73cba57438ebc25d5b64a131: 21300000 - 441bc4cd52f131d408d4cf0fb388d362: 21300000 - 574c0eed0ff81eb4cba89f7b81c45d87: 21300000 - a8f8d0fdd24945b43949765e74f2b271: 21300000 @@ -167,6 +184,7 @@ SpriteAtlas: - 2242df5f9c25fb449b675752d2e5eb34: 21300000 - d6fb466fcf82f1a4fb558424e6940726: 21300000 - d1ec476f5d26e584a9025b089c31571a: 21300000 + - fb4127afd02b87142be2f8323b8c5eb0: 21300000 - ec4309af687f76f4ca6ed71f65a2d7c7: 21300000 - a042f7df336dfc249aac50e6681e578e: 21300000 m_MasterAtlas: {fileID: 0} @@ -178,6 +196,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 8388c990b53b08c41b9911ee6e007e62, type: 3} - {fileID: 21300000, guid: ee933fb03eb4e414b9ac5e0e8f715803, type: 3} - {fileID: 21300000, guid: 9a728be0368979641bc27e5cdc038633, type: 3} + - {fileID: 21300000, guid: b0729b0100fa5844986e86606239043d, type: 3} - {fileID: 21300000, guid: a35ac2215f4696948b93c2b371cab176, type: 3} - {fileID: 21300000, guid: fd240161d2563b9479089e7bce603d59, type: 3} - {fileID: 21300000, guid: a013d281dd02f78458e78e671da6bc12, type: 3} @@ -193,6 +212,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 64cc73f1b28e8884ba355c0cb01034b3, type: 3} - {fileID: 21300000, guid: d6fe5ef1ff785d24bab19ac7d42493bd, type: 3} - {fileID: 21300000, guid: 854834127d4924f4faad0c767281fc00, type: 3} + - {fileID: 21300000, guid: e457a232f40bbae43914b4642d68b2d2, type: 3} - {fileID: 21300000, guid: 1da1f7425c213d1469714e92348ea2fa, type: 3} - {fileID: 21300000, guid: 6facc842ead05744184e7db7ba064b48, type: 3} - {fileID: 21300000, guid: b0ab67920c010f247b8da3f378389732, type: 3} @@ -203,16 +223,20 @@ SpriteAtlas: - {fileID: 21300000, guid: bf1e4423df8c44046ac82fcf15d988b8, type: 3} - {fileID: 21300000, guid: 11b3e463969a98f4689c4b13651c0ac1, type: 3} - {fileID: 21300000, guid: 20910e73c2d410445aef67558d384856, type: 3} + - {fileID: 21300000, guid: 50c9ae73508184a489ff159f1cf0c178, type: 3} - {fileID: 21300000, guid: a3c4d1a34338dd548bc729ff5fb6b207, type: 3} - {fileID: 21300000, guid: ba7c63d392b1fa6449ea4e65bf25bcab, type: 3} - {fileID: 21300000, guid: 990694d32bf174f42bc872264a4ca5b5, type: 3} - {fileID: 21300000, guid: 03173cd344450534189a895dbd9c1fc0, type: 3} + - {fileID: 21300000, guid: 866f8a24640ab5a428d3d0b5127ac6c4, type: 3} - {fileID: 21300000, guid: 946d9b343ae931646886ffb83251235f, type: 3} - {fileID: 21300000, guid: c7be9d948878f3d4abcff3f46819093e, type: 3} - {fileID: 21300000, guid: 7191e8a4e91b6b041a2186f439616094, type: 3} - {fileID: 21300000, guid: 482ff405e1f0a0a4885faf2099f34eec, type: 3} - {fileID: 21300000, guid: 8dc3c875171e26e48af6694d40d8df72, type: 3} + - {fileID: 21300000, guid: c1645c851360d42438b3296177f97bb2, type: 3} - {fileID: 21300000, guid: 8fc032a52ac58f345b86d6dd58fff5a5, type: 3} + - {fileID: 21300000, guid: 923d24b58aed2b14ca190e86dcd18f4e, type: 3} - {fileID: 21300000, guid: ee4ae7c5c34ebd149abd8c8ee541127b, type: 3} - {fileID: 21300000, guid: 5818e4d5b38cf0348868c08daae5f015, type: 3} - {fileID: 21300000, guid: 73bf19e561f6d73438ac56310f1d98fd, type: 3} @@ -222,16 +246,20 @@ SpriteAtlas: - {fileID: 21300000, guid: 405060b628d10bc4b9afcd479d022831, type: 3} - {fileID: 21300000, guid: bc42d5b6ca215294f966ee4c4aaf71f9, type: 3} - {fileID: 21300000, guid: 9a4e02c6e5890d64a8a84d7c268fe66a, type: 3} + - {fileID: 21300000, guid: 3a59cff615a2f0748810b82b4c401c55, type: 3} - {fileID: 21300000, guid: 242cb3974cefd0e46aade680f04dd832, type: 3} - {fileID: 21300000, guid: ccfdd697b3fac6041ae86c011597e221, type: 3} - {fileID: 21300000, guid: edb524b79cd5212478a3f81b25857157, type: 3} + - {fileID: 21300000, guid: 139455b7a18a3f84ca6593ec7c20ad61, type: 3} - {fileID: 21300000, guid: 3b1d08b7f515e5d46a05a7ff32ed1295, type: 3} - {fileID: 21300000, guid: 5f7fd8185eb11854b9a83301264d3454, type: 3} + - {fileID: 21300000, guid: 1fea0a38a4efe854f9548e22373becbf, type: 3} - {fileID: 21300000, guid: a2337848f96a3f847ade610699559fd6, type: 3} - {fileID: 21300000, guid: 9924e7681288fa742af955890c43c4f1, type: 3} - {fileID: 21300000, guid: f36045787352db44494d1b5e4362f551, type: 3} - {fileID: 21300000, guid: 126aa3a842be8db428a5cc23690c14b9, type: 3} - {fileID: 21300000, guid: 749965a82d7a8cf468f77c2e31d94551, type: 3} + - {fileID: 21300000, guid: abfddaa86f31fe74781e998bcaf94854, type: 3} - {fileID: 21300000, guid: 1ed037e8186121a45a26dc836f9b9ad8, type: 3} - {fileID: 21300000, guid: d4fb52f8d4e36a442a4b87c0a511ddd9, type: 3} - {fileID: 21300000, guid: f427dc0923fdac8438454f9efc8d9f23, type: 3} @@ -242,8 +270,10 @@ SpriteAtlas: - {fileID: 21300000, guid: cb8ac68917adce3459453ecc85a62e5e, type: 3} - {fileID: 21300000, guid: c0513c89f74029a40ae3d6016cd50049, type: 3} - {fileID: 21300000, guid: b2ca59a9cc0e96c42857542592a2ddf7, type: 3} + - {fileID: 21300000, guid: db064bc98e884c24dafec0b1cac9c28d, type: 3} - {fileID: 21300000, guid: 25d6f2f90c405574da74a8001b1fa74e, type: 3} - {fileID: 21300000, guid: dab1d10a889b89e4a9b58e930a9375d6, type: 3} + - {fileID: 21300000, guid: dcb3e52a73e262948b8ce4642236494c, type: 3} - {fileID: 21300000, guid: be5e762aaa6291d43976cb98edcb6448, type: 3} - {fileID: 21300000, guid: e9ccc17a3494e584e860fbd3f9f04df9, type: 3} - {fileID: 21300000, guid: 5943d49aa8260fd42a04c79f281dc835, type: 3} @@ -253,6 +283,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 0d943fcaa092c4849a986d58255ba659, type: 3} - {fileID: 21300000, guid: c1053e0bd85736741835357ae6f1a81a, type: 3} - {fileID: 21300000, guid: 51edb83ba5087e74fac21f7411beb6b0, type: 3} + - {fileID: 21300000, guid: 7ceef04b86d450646a8d9dc40676f867, type: 3} - {fileID: 21300000, guid: 7857396ba211dab42af1905b4da3cf19, type: 3} - {fileID: 21300000, guid: 9e1f479b5a8e93840a056472840fb34f, type: 3} - {fileID: 21300000, guid: 0ec030ab67537f549941e69c78e57ea0, type: 3} @@ -261,14 +292,18 @@ SpriteAtlas: - {fileID: 21300000, guid: 7e06a9bbaf9336a42a77056ccbda3f04, type: 3} - {fileID: 21300000, guid: 971b17cbc8bb8f44987a1f44a7b19ef4, type: 3} - {fileID: 21300000, guid: 959763eb7b5c360488d33c655f551163, type: 3} + - {fileID: 21300000, guid: 62a646eb0b7f0c34b8cc6cab0c710031, type: 3} - {fileID: 21300000, guid: cc97734c8adea6445a7b4b0c95c64395, type: 3} - {fileID: 21300000, guid: 95f1519c113dee04fbae9a3519fedced, type: 3} + - {fileID: 21300000, guid: 2e9c2e9c15a2cfd4a809cd1ddba28e51, type: 3} - {fileID: 21300000, guid: 83daa8eced54f2946ba40f7aafa39a77, type: 3} - {fileID: 21300000, guid: e857d8fc6d6313141973d87d1b17fd7d, type: 3} + - {fileID: 21300000, guid: e8e8924db5d728c46994bee5f76639d4, type: 3} - {fileID: 21300000, guid: 52b87c5dac4cd004281ddbe6250578a8, type: 3} - {fileID: 21300000, guid: 3d5b126d0c64bd44c9a1cdf2d0ed2b98, type: 3} - {fileID: 21300000, guid: 24d3027d02286ad4ab28c5e1d12a0343, type: 3} - {fileID: 21300000, guid: 0fc3518d5197ef14690a45dffc304c89, type: 3} + - {fileID: 21300000, guid: 6a070b9d73cba57438ebc25d5b64a131, type: 3} - {fileID: 21300000, guid: 441bc4cd52f131d408d4cf0fb388d362, type: 3} - {fileID: 21300000, guid: 574c0eed0ff81eb4cba89f7b81c45d87, type: 3} - {fileID: 21300000, guid: a8f8d0fdd24945b43949765e74f2b271, type: 3} @@ -288,6 +323,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 2242df5f9c25fb449b675752d2e5eb34, type: 3} - {fileID: 21300000, guid: d6fb466fcf82f1a4fb558424e6940726, type: 3} - {fileID: 21300000, guid: d1ec476f5d26e584a9025b089c31571a, type: 3} + - {fileID: 21300000, guid: fb4127afd02b87142be2f8323b8c5eb0, type: 3} - {fileID: 21300000, guid: ec4309af687f76f4ca6ed71f65a2d7c7, type: 3} - {fileID: 21300000, guid: a042f7df336dfc249aac50e6681e578e, type: 3} m_PackedSpriteNamesToIndex: @@ -298,6 +334,7 @@ SpriteAtlas: - window 3 - chodan txt_chodan - btn long + - firstbbuck txt_firstbbuck - 3go txt_3go - mission pop icon_mission pop up - 2go image_2go @@ -313,6 +350,7 @@ SpriteAtlas: - arrow icon - 4go txt_4go - pink bg_shop + - bonus txt_bonus - money label - btn 1 - nagari txt_nagari @@ -323,16 +361,20 @@ SpriteAtlas: - 3gwang txt_3gwang - icon 3_shop - b3gwang txt_b3gwang + - youbonus txt_youbonus - ddadack effect_ddadack - icon 2_shop - icon 2_play - bbuck image_bbuck + - 8go txt_8go - icon 1_play - close btn - appreciate mode window_appreciate - appreciate mode icon 4_appreciate - 5go image_5go + - 7go txt_7go - window 5 + - chongtong image_chongtong - card icon - label_black - window 1 @@ -342,16 +384,20 @@ SpriteAtlas: - 5go txt_5go - chungdan image_chungdan - window 2 + - jabbuck txt_jabbuck - lock icon - new pattern - ddadack txt_ddadack + - shake txt_shake - icon 4_shop - pop up window + - bbuckeat txt_bbuckeat - 5gwang image_5gwang - result lose title - icon 9_shop - top bar window - icon 8_shop + - chongtong txt_chongtong - label result_result - appreciate mode icon 3_appreciate - icon 1_shop @@ -362,8 +408,10 @@ SpriteAtlas: - godor txt_godori - chungdan txt_chungdan - window 6 + - youbonus image_youbonus - lose icon_result - ssackssri image 2_ssackssri + - 9go txt_9go - 1go image_1go - choice icon - cash icon @@ -373,6 +421,7 @@ SpriteAtlas: - 3go image_3go - appreciate mode icon 1_appreciate - hunting icon + - bonus image_bonus - title window 2 - peep icon_peep - icon 11_shop @@ -381,14 +430,18 @@ SpriteAtlas: - chu txt_chu - album icon - sparkle + - shake image_shake - icon 4_play - ad icon + - invalidity image_invalidity - blue bg_shop - icon 10_shop + - invalidity txt_invalidity - stop image_stop - btn short - title window 1 - icon 5_shop + - x2pjabbuck txt_2pjabbuck - stop txt_stop - toggle bg - chu heart image_chu @@ -408,6 +461,7 @@ SpriteAtlas: - window 7 - chu image_chu - godori image_godori + - 6go txt_6go - bomb icon_play - "\uCABD" m_RenderDataMap: {}