From 3fe890fa81e1d2961dd3dca7869cb87b270ea6f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9A=B0=EC=97=B0?= Date: Fri, 27 Sep 2024 22:58:37 +0900 Subject: [PATCH 1/3] Refactor: Specify namespace --- .../Runtime/CH2/Main/TurnController.cs | 1 + Assets/Scripts/Runtime/ETC/CSVReader.cs | 61 ++++++++++--------- Assets/Scripts/Runtime/ETC/ImageAnimation.cs | 43 +++++++------ Assets/Scripts/Runtime/Main/DataCheater.cs | 11 ++++ .../Scripts/Runtime/Main/DataCheater.cs.meta | 11 ++++ Assets/Scripts/Runtime/Main/TestData.cs | 49 ++++++++------- Assets/StreamingAssets/build_info | 2 +- 7 files changed, 105 insertions(+), 73 deletions(-) create mode 100644 Assets/Scripts/Runtime/Main/DataCheater.cs create mode 100644 Assets/Scripts/Runtime/Main/DataCheater.cs.meta diff --git a/Assets/Scripts/Runtime/CH2/Main/TurnController.cs b/Assets/Scripts/Runtime/CH2/Main/TurnController.cs index 48dd2ac2..357621c2 100644 --- a/Assets/Scripts/Runtime/CH2/Main/TurnController.cs +++ b/Assets/Scripts/Runtime/CH2/Main/TurnController.cs @@ -1,4 +1,5 @@ using Runtime.CH2.Location; +using Runtime.ETC; using System.Collections.Generic; using UnityEngine; using Yarn.Unity; diff --git a/Assets/Scripts/Runtime/ETC/CSVReader.cs b/Assets/Scripts/Runtime/ETC/CSVReader.cs index 0d50a64c..64fd3dfd 100644 --- a/Assets/Scripts/Runtime/ETC/CSVReader.cs +++ b/Assets/Scripts/Runtime/ETC/CSVReader.cs @@ -2,46 +2,49 @@ using System.Collections.Generic; using System.Text.RegularExpressions; -public class CSVReader +namespace Runtime.ETC { - static string SPLIT_RE = @",(?=(?:[^""]*""[^""]*"")*(?![^""]*""))"; - static string LINE_SPLIT_RE = @"\r\n|\n\r|\n|\r"; - static char[] TRIM_CHARS = { '\"' }; - - public static List> Read(string file) + public class CSVReader { - var list = new List>(); - TextAsset data = Resources.Load(file) as TextAsset; + static string SPLIT_RE = @",(?=(?:[^""]*""[^""]*"")*(?![^""]*""))"; + static string LINE_SPLIT_RE = @"\r\n|\n\r|\n|\r"; + static char[] TRIM_CHARS = { '\"' }; - var lines = Regex.Split(data.text, LINE_SPLIT_RE); + public static List> Read(string file) + { + var list = new List>(); + TextAsset data = Resources.Load(file) as TextAsset; - if (lines.Length <= 1) return list; + var lines = Regex.Split(data.text, LINE_SPLIT_RE); - var header = Regex.Split(lines[0], SPLIT_RE); - for (var i = 1; i < lines.Length; i++) - { - var values = Regex.Split(lines[i], SPLIT_RE); - if (values.Length == 0 || values[0] == "") continue; + if (lines.Length <= 1) return list; - var entry = new Dictionary(); - for (var j = 0; j < header.Length && j < values.Length; j++) + var header = Regex.Split(lines[0], SPLIT_RE); + for (var i = 1; i < lines.Length; i++) { - string value = values[j]; - value = value.TrimStart(TRIM_CHARS).TrimEnd(TRIM_CHARS).Replace("\\", ""); - object finalvalue = value; + var values = Regex.Split(lines[i], SPLIT_RE); + if (values.Length == 0 || values[0] == "") continue; - if (int.TryParse(value, out int n)) + var entry = new Dictionary(); + for (var j = 0; j < header.Length && j < values.Length; j++) { - finalvalue = n; - } - else if (float.TryParse(value, out float f)) - { - finalvalue = f; + string value = values[j]; + value = value.TrimStart(TRIM_CHARS).TrimEnd(TRIM_CHARS).Replace("\\", ""); + object finalvalue = value; + + if (int.TryParse(value, out int n)) + { + finalvalue = n; + } + else if (float.TryParse(value, out float f)) + { + finalvalue = f; + } + entry[header[j]] = finalvalue; } - entry[header[j]] = finalvalue; + list.Add(entry); } - list.Add(entry); + return list; } - return list; } } \ No newline at end of file diff --git a/Assets/Scripts/Runtime/ETC/ImageAnimation.cs b/Assets/Scripts/Runtime/ETC/ImageAnimation.cs index c06b5ee3..275a8adb 100644 --- a/Assets/Scripts/Runtime/ETC/ImageAnimation.cs +++ b/Assets/Scripts/Runtime/ETC/ImageAnimation.cs @@ -1,31 +1,34 @@ using UnityEngine; using UnityEngine.UI; -[RequireComponent(typeof(Image))] -public class ImageAnimation : MonoBehaviour +namespace Runtime.ETC { - private Image _image; - public Sprite[] Sprites; - private int _animFrame = -1; - [SerializeField] - private float _animTime = 0.25f; - - public void Awake() + [RequireComponent(typeof(Image))] + public class ImageAnimation : MonoBehaviour { - _image = GetComponent(); - } + private Image _image; + public Sprite[] Sprites; + private int _animFrame = -1; + [SerializeField] + private float _animTime = 0.25f; - private void Start() - { - InvokeRepeating(nameof(NextSprite), _animTime, _animTime); - } + public void Awake() + { + _image = GetComponent(); + } - public void NextSprite() - { - if (Sprites.Length != 0) + private void Start() + { + InvokeRepeating(nameof(NextSprite), _animTime, _animTime); + } + + public void NextSprite() { - _animFrame = ++_animFrame % Sprites.Length; - _image.sprite = Sprites[_animFrame]; + if (Sprites.Length != 0) + { + _animFrame = ++_animFrame % Sprites.Length; + _image.sprite = Sprites[_animFrame]; + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Main/DataCheater.cs b/Assets/Scripts/Runtime/Main/DataCheater.cs new file mode 100644 index 00000000..7aa4da83 --- /dev/null +++ b/Assets/Scripts/Runtime/Main/DataCheater.cs @@ -0,0 +1,11 @@ +using UnityEngine; + +namespace Runtime.Main +{ + namespace Runtime.ETC + { + public class DataCheater : MonoBehaviour + { + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Main/DataCheater.cs.meta b/Assets/Scripts/Runtime/Main/DataCheater.cs.meta new file mode 100644 index 00000000..9d2f5015 --- /dev/null +++ b/Assets/Scripts/Runtime/Main/DataCheater.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 809c2265c1d50ee4793bb5386eacfb7d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Runtime/Main/TestData.cs b/Assets/Scripts/Runtime/Main/TestData.cs index 821429f1..b1b355f6 100644 --- a/Assets/Scripts/Runtime/Main/TestData.cs +++ b/Assets/Scripts/Runtime/Main/TestData.cs @@ -1,29 +1,32 @@ -public class TestData +namespace Runtime.Main { - public void DataAfterIntro() + public class TestData { - Managers.Data.Chapter = 1; - Managers.Data.Stage = 1; - Managers.Data.Scene = 1; - Managers.Data.SceneDetail = 1; - } + public void DataAfterIntro() + { + Managers.Data.Chapter = 1; + Managers.Data.Stage = 1; + Managers.Data.Scene = 1; + Managers.Data.SceneDetail = 1; + } - public void DataAfterPacmom() - { - DataAfterIntro(); - Managers.Data.MeetLucky = true; - Managers.Data.IsPacmomPlayed = true; - Managers.Data.IsPacmomCleared = true; - Managers.Data.PacmomCoin = 300; - } + public void DataAfterPacmom() + { + DataAfterIntro(); + Managers.Data.MeetLucky = true; + Managers.Data.IsPacmomPlayed = true; + Managers.Data.IsPacmomCleared = true; + Managers.Data.PacmomCoin = 300; + } - public void DataAfter3Match() - { - DataAfterPacmom(); - Managers.Data.Stage = 2; - Managers.Data.Scene = 3; - Managers.Data.SceneDetail = 1; - Managers.Data.Is3MatchEntered = true; - Managers.Data.Is3MatchCleared = true; + public void DataAfter3Match() + { + DataAfterPacmom(); + Managers.Data.Stage = 2; + Managers.Data.Scene = 3; + Managers.Data.SceneDetail = 1; + Managers.Data.Is3MatchEntered = true; + Managers.Data.Is3MatchCleared = true; + } } } \ No newline at end of file diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index c3ffe2cd..59e0c848 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from DESKTOP-R2SMLEI at 2024-09-20 오후 1:31:05 \ No newline at end of file +Build from WOOS_COM at 2024-09-27 오후 10:57:12 \ No newline at end of file From 2862d7dd45c8d6cbefa70ca047876f2b2d2fd6c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9A=B0=EC=97=B0?= Date: Fri, 27 Sep 2024 23:09:32 +0900 Subject: [PATCH 2/3] Feat: Add DataCheater.cs --- Assets/Resources/Cheat.meta | 8 ++++++++ Assets/Scripts/Runtime/Main/DataCheater.cs | 14 ++++++++++++++ Assets/Scripts/Runtime/Manager/DataManager.cs | 5 +++++ Assets/StreamingAssets/build_info | 2 +- 4 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Assets/Resources/Cheat.meta diff --git a/Assets/Resources/Cheat.meta b/Assets/Resources/Cheat.meta new file mode 100644 index 00000000..f1b6efd6 --- /dev/null +++ b/Assets/Resources/Cheat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 70d1894a1d27c7d4b90231fc6cc18235 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Runtime/Main/DataCheater.cs b/Assets/Scripts/Runtime/Main/DataCheater.cs index 7aa4da83..1cee707b 100644 --- a/Assets/Scripts/Runtime/Main/DataCheater.cs +++ b/Assets/Scripts/Runtime/Main/DataCheater.cs @@ -1,3 +1,4 @@ +using Runtime.Manager; using UnityEngine; namespace Runtime.Main @@ -6,6 +7,19 @@ namespace Runtime.ETC { public class DataCheater : MonoBehaviour { + public void LoadCheatData(string file) + { + TextAsset jsonFile = Resources.Load("Cheat/" + file); // (파일명).json 파일을 불러옴 + + if (jsonFile == null) + { + Debug.LogError("JSON file not found!"); + } + + string jsonData = jsonFile.text; + GameData data = JsonUtility.FromJson(jsonData); + Managers.Data.ChangeData(data); + } } } } \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Manager/DataManager.cs b/Assets/Scripts/Runtime/Manager/DataManager.cs index 5e2d2b41..cd919d2a 100644 --- a/Assets/Scripts/Runtime/Manager/DataManager.cs +++ b/Assets/Scripts/Runtime/Manager/DataManager.cs @@ -185,6 +185,11 @@ public bool LoadGame() return true; } + public void ChangeData(GameData data) + { + Managers.Data.SaveData = data; + } + public void NewGame() { _gameData = new GameData { Version = Application.version }; diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 59e0c848..1eee4efd 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from WOOS_COM at 2024-09-27 오후 10:57:12 \ No newline at end of file +Build from WOOS_COM at 2024-09-27 오후 11:08:07 \ No newline at end of file From c424a30ed7e3fc02128252ac98fbaa09db8aebaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9A=B0=EC=97=B0?= Date: Fri, 27 Sep 2024 23:47:54 +0900 Subject: [PATCH 3/3] Feat: LoadCheatDataByString --- Assets/Resources/Cheat/AfterIntro.json | 1 + Assets/Resources/Cheat/AfterIntro.json.meta | 7 + Assets/Resources/Cheat/AfterMamago.json | 1 + Assets/Resources/Cheat/AfterMamago.json.meta | 7 + Assets/Resources/Cheat/StartFrom3Match.json | 1 + .../Resources/Cheat/StartFrom3Match.json.meta | 7 + Assets/Resources/Cheat/StartFromCH2.json | 1 + Assets/Resources/Cheat/StartFromCH2.json.meta | 7 + Assets/Resources/Cheat/StartFromMamago.json | 1 + .../Resources/Cheat/StartFromMamago.json.meta | 7 + Assets/Resources/Cheat/StartFromSLG.json | 1 + Assets/Resources/Cheat/StartFromSLG.json.meta | 7 + Assets/Scenes/Main.unity | 665 ++++++++++++++++-- Assets/Scripts/Runtime/Main/DataCheater.cs | 5 + Assets/Scripts/Runtime/Main/MainController.cs | 42 +- Assets/Scripts/Runtime/Main/TestData.cs | 32 - Assets/Scripts/Runtime/Main/TestData.cs.meta | 11 - Assets/Scripts/Runtime/Manager/DataManager.cs | 1 + Assets/StreamingAssets/build_info | 2 +- 19 files changed, 667 insertions(+), 139 deletions(-) create mode 100644 Assets/Resources/Cheat/AfterIntro.json create mode 100644 Assets/Resources/Cheat/AfterIntro.json.meta create mode 100644 Assets/Resources/Cheat/AfterMamago.json create mode 100644 Assets/Resources/Cheat/AfterMamago.json.meta create mode 100644 Assets/Resources/Cheat/StartFrom3Match.json create mode 100644 Assets/Resources/Cheat/StartFrom3Match.json.meta create mode 100644 Assets/Resources/Cheat/StartFromCH2.json create mode 100644 Assets/Resources/Cheat/StartFromCH2.json.meta create mode 100644 Assets/Resources/Cheat/StartFromMamago.json create mode 100644 Assets/Resources/Cheat/StartFromMamago.json.meta create mode 100644 Assets/Resources/Cheat/StartFromSLG.json create mode 100644 Assets/Resources/Cheat/StartFromSLG.json.meta delete mode 100644 Assets/Scripts/Runtime/Main/TestData.cs delete mode 100644 Assets/Scripts/Runtime/Main/TestData.cs.meta diff --git a/Assets/Resources/Cheat/AfterIntro.json b/Assets/Resources/Cheat/AfterIntro.json new file mode 100644 index 00000000..1deae05d --- /dev/null +++ b/Assets/Resources/Cheat/AfterIntro.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":1,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":1,"Scene":1,"SceneDetail":1,"MeetLucky":false,"Is3MatchEntered":false,"Is3MatchCleared":false,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":false,"IsPacmomCleared":false,"PacmomCoin":0,"SLGConstructionBeginTime":0,"SLGProgressData":0,"SLGWoodCount":0,"SLGStoneCount":0,"SLGBridgeRebuild":false,"TranslatorCount":0,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/AfterIntro.json.meta b/Assets/Resources/Cheat/AfterIntro.json.meta new file mode 100644 index 00000000..6b198fa0 --- /dev/null +++ b/Assets/Resources/Cheat/AfterIntro.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 1a9939d1fd89ad14d97ca81ac8db0589 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cheat/AfterMamago.json b/Assets/Resources/Cheat/AfterMamago.json new file mode 100644 index 00000000..bb0995b7 --- /dev/null +++ b/Assets/Resources/Cheat/AfterMamago.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":1,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":3,"Scene":6,"SceneDetail":0,"MeetLucky":true,"Is3MatchEntered":true,"Is3MatchCleared":true,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":true,"IsPacmomCleared":true,"PacmomCoin":190,"SLGConstructionBeginTime":63863076842,"SLGProgressData":4,"SLGWoodCount":10,"SLGStoneCount":70,"SLGBridgeRebuild":false,"TranslatorCount":1,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/AfterMamago.json.meta b/Assets/Resources/Cheat/AfterMamago.json.meta new file mode 100644 index 00000000..aea18125 --- /dev/null +++ b/Assets/Resources/Cheat/AfterMamago.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 306828a84ef14e0488834a5bcedf1050 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cheat/StartFrom3Match.json b/Assets/Resources/Cheat/StartFrom3Match.json new file mode 100644 index 00000000..0c0dd80a --- /dev/null +++ b/Assets/Resources/Cheat/StartFrom3Match.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":1,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":5,"Scene":3,"SceneDetail":0,"MeetLucky":true,"Is3MatchEntered":false,"Is3MatchCleared":false,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":true,"IsPacmomCleared":true,"PacmomCoin":300,"SLGConstructionBeginTime":0,"SLGProgressData":0,"SLGWoodCount":0,"SLGStoneCount":0,"SLGBridgeRebuild":false,"TranslatorCount":0,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/StartFrom3Match.json.meta b/Assets/Resources/Cheat/StartFrom3Match.json.meta new file mode 100644 index 00000000..a046b334 --- /dev/null +++ b/Assets/Resources/Cheat/StartFrom3Match.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f1e3da1ef16c0cc4190771fe4a38ab7a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cheat/StartFromCH2.json b/Assets/Resources/Cheat/StartFromCH2.json new file mode 100644 index 00000000..7b720726 --- /dev/null +++ b/Assets/Resources/Cheat/StartFromCH2.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":2,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":3,"Scene":6,"SceneDetail":1,"MeetLucky":true,"Is3MatchEntered":true,"Is3MatchCleared":true,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":true,"IsPacmomCleared":true,"PacmomCoin":190,"SLGConstructionBeginTime":63863076842,"SLGProgressData":6,"SLGWoodCount":10,"SLGStoneCount":70,"SLGBridgeRebuild":false,"TranslatorCount":1,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/StartFromCH2.json.meta b/Assets/Resources/Cheat/StartFromCH2.json.meta new file mode 100644 index 00000000..febf2424 --- /dev/null +++ b/Assets/Resources/Cheat/StartFromCH2.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 996dbbe408ae468448b195ee471087e6 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cheat/StartFromMamago.json b/Assets/Resources/Cheat/StartFromMamago.json new file mode 100644 index 00000000..88c0acfc --- /dev/null +++ b/Assets/Resources/Cheat/StartFromMamago.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":1,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":3,"Scene":4,"SceneDetail":0,"MeetLucky":true,"Is3MatchEntered":true,"Is3MatchCleared":true,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":true,"IsPacmomCleared":true,"PacmomCoin":300,"SLGConstructionBeginTime":0,"SLGProgressData":2,"SLGWoodCount":40,"SLGStoneCount":100,"SLGBridgeRebuild":false,"TranslatorCount":0,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/StartFromMamago.json.meta b/Assets/Resources/Cheat/StartFromMamago.json.meta new file mode 100644 index 00000000..f3f06cad --- /dev/null +++ b/Assets/Resources/Cheat/StartFromMamago.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b7080826363c1db47b26d8ca18a0f72e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Cheat/StartFromSLG.json b/Assets/Resources/Cheat/StartFromSLG.json new file mode 100644 index 00000000..e218dbe0 --- /dev/null +++ b/Assets/Resources/Cheat/StartFromSLG.json @@ -0,0 +1 @@ +{"Version":"0.2.0","Chapter":1,"BgmVolume":0.5,"SfxVolume":0.5,"Stage":3,"Scene":4,"SceneDetail":0,"MeetLucky":true,"Is3MatchEntered":true,"Is3MatchCleared":true,"ThreeMatchPuzzleStageData":[{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]},{"isClear":false,"jewelryPositions":[]}],"IsPacmomPlayed":true,"IsPacmomCleared":true,"PacmomCoin":300,"SLGConstructionBeginTime":0,"SLGProgressData":0,"SLGWoodCount":0,"SLGStoneCount":0,"SLGBridgeRebuild":false,"TranslatorCount":0,"CH2":{"Turn":0,"Location":""}} \ No newline at end of file diff --git a/Assets/Resources/Cheat/StartFromSLG.json.meta b/Assets/Resources/Cheat/StartFromSLG.json.meta new file mode 100644 index 00000000..026b10ea --- /dev/null +++ b/Assets/Resources/Cheat/StartFromSLG.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 066ba20a764ee72428e0d9f2e51aa234 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index a73e6431..205625bc 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -159,7 +159,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 381, y: -487} + m_AnchoredPosition: {x: -141, y: -581} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &25714698 @@ -206,16 +206,16 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 624253866} - m_TargetAssemblyTypeName: Runtime.Main.MainController, Scripts - m_MethodName: GoCH2 - m_Mode: 1 + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: AfterIntro m_BoolArgument: 0 m_CallState: 2 --- !u!114 &25714699 @@ -313,7 +313,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "CH2 \uBC14\uB85C\uAC00\uAE30" + m_text: "\uC778\uD2B8\uB85C \uC774\uD6C4\uBD80\uD130" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} @@ -497,9 +497,11 @@ RectTransform: m_Children: - {fileID: 995860356} - {fileID: 25714697} - - {fileID: 1554896326} - {fileID: 882502905} - {fileID: 916971118} + - {fileID: 1604169819} + - {fileID: 1129966203} + - {fileID: 1517652545} m_Father: {fileID: 1519525745} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -796,6 +798,7 @@ GameObject: m_Component: - component: {fileID: 624253867} - component: {fileID: 624253866} + - component: {fileID: 624253868} m_Layer: 0 m_Name: MainController m_TagString: Untagged @@ -816,6 +819,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _sceneSystem: {fileID: 306113482} + _dataCheater: {fileID: 624253868} --- !u!4 &624253867 Transform: m_ObjectHideFlags: 0 @@ -831,6 +835,19 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &624253868 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 624253865} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 809c2265c1d50ee4793bb5386eacfb7d, type: 3} + m_Name: + m_EditorClassIdentifier: + _sceneSystem: {fileID: 306113482} --- !u!1 &647073632 GameObject: m_ObjectHideFlags: 0 @@ -965,6 +982,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 647073632} m_CullTransparentMesh: 1 +--- !u!1 &692848825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692848826} + - component: {fileID: 692848828} + - component: {fileID: 692848827} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &692848826 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692848825} + 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: 1604169819} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &692848827 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692848825} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "\uB9C8\uB9C8\uACE0 \uC9D3\uAE30\uBD80\uD130" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} + m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &692848828 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692848825} + m_CullTransparentMesh: 1 --- !u!1 &757205734 GameObject: m_ObjectHideFlags: 0 @@ -1209,7 +1360,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 191, y: -608} + m_AnchoredPosition: {x: 199.99997, y: -581} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &882502906 @@ -1256,16 +1407,16 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 624253866} - m_TargetAssemblyTypeName: Runtime.Main.MainController, Scripts - m_MethodName: AfterPacmom - m_Mode: 1 + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: StartFrom3Match m_BoolArgument: 0 m_CallState: 2 --- !u!114 &882502907 @@ -1342,7 +1493,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 559, y: -608} + m_AnchoredPosition: {x: 549, y: -581} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &916971119 @@ -1389,16 +1540,16 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 624253866} - m_TargetAssemblyTypeName: Runtime.Main.MainController, Scripts - m_MethodName: After3Match - m_Mode: 1 + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: StartFromSLG m_BoolArgument: 0 m_CallState: 2 --- !u!114 &916971120 @@ -1475,7 +1626,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 16, y: -487} + m_AnchoredPosition: {x: 199, y: -466} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &995860357 @@ -1918,6 +2069,139 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1129966202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1129966203} + - component: {fileID: 1129966206} + - component: {fileID: 1129966205} + - component: {fileID: 1129966204} + m_Layer: 5 + m_Name: Cheat_6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1129966203 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129966202} + 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: 1857126572} + m_Father: {fileID: 381487179} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 197, y: -692} + m_SizeDelta: {x: 300, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1129966204 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129966202} + 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: 1129966205} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: AfterMamago + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1129966205 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129966202} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1129966206 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129966202} + m_CullTransparentMesh: 1 --- !u!114 &1209420266 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 977441387082237809, guid: 0d61b18444317944a99ee38e37220ff8, type: 3} @@ -2290,6 +2574,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1447165291} m_CullTransparentMesh: 1 +--- !u!1 &1517652544 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1517652545} + - component: {fileID: 1517652548} + - component: {fileID: 1517652547} + - component: {fileID: 1517652546} + m_Layer: 5 + m_Name: Cheat_7 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1517652545 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517652544} + 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: 1561783598} + m_Father: {fileID: 381487179} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 547, y: -692} + m_SizeDelta: {x: 300, y: 60} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1517652546 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517652544} + 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: 1517652547} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: StartFromCH2 + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1517652547 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517652544} + 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: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1517652548 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1517652544} + m_CullTransparentMesh: 1 --- !u!1 &1519525741 GameObject: m_ObjectHideFlags: 0 @@ -2425,7 +2842,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1554896325 +--- !u!1 &1561783597 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2433,44 +2850,178 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1554896326} - - component: {fileID: 1554896329} - - component: {fileID: 1554896328} - - component: {fileID: 1554896327} + - component: {fileID: 1561783598} + - component: {fileID: 1561783600} + - component: {fileID: 1561783599} m_Layer: 5 - m_Name: Cheat_5 + m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1554896326 +--- !u!224 &1561783598 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1554896325} + m_GameObject: {fileID: 1561783597} + 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: 1517652545} + 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: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1561783599 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561783597} + 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: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: "CH2\uBD80\uD130" + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} + m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 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 &1561783600 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1561783597} + m_CullTransparentMesh: 1 +--- !u!1 &1604169818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604169819} + - component: {fileID: 1604169822} + - component: {fileID: 1604169821} + - component: {fileID: 1604169820} + m_Layer: 5 + m_Name: Cheat_4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1604169819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604169818} 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: 1856502456} + - {fileID: 692848826} m_Father: {fileID: 381487179} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: -164, y: -608} + m_AnchoredPosition: {x: -148, y: -691} m_SizeDelta: {x: 300, y: 60} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1554896327 +--- !u!114 &1604169820 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1554896325} + m_GameObject: {fileID: 1604169818} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -2504,29 +3055,29 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1554896328} + m_TargetGraphic: {fileID: 1604169821} m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 624253866} - m_TargetAssemblyTypeName: Runtime.Main.MainController, Scripts - m_MethodName: AfterIntro - m_Mode: 1 + - m_Target: {fileID: 624253868} + m_TargetAssemblyTypeName: Runtime.Main.Runtime.ETC.DataCheater, Scripts + m_MethodName: LoadCheatData + m_Mode: 5 m_Arguments: m_ObjectArgument: {fileID: 0} m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine m_IntArgument: 0 m_FloatArgument: 0 - m_StringArgument: + m_StringArgument: StartFromMamago m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1554896328 +--- !u!114 &1604169821 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1554896325} + m_GameObject: {fileID: 1604169818} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -2550,13 +3101,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1554896329 +--- !u!222 &1604169822 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1554896325} + m_GameObject: {fileID: 1604169818} m_CullTransparentMesh: 1 --- !u!1 &1676664108 GameObject: @@ -2646,7 +3197,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uD329\uB9D8 \uC774\uD6C4\uBD80\uD130" + m_text: "3\uB9E4\uCE58\uBD80\uD130" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} @@ -2840,7 +3391,7 @@ Canvas: m_SortingLayerID: 1546151723 m_SortingOrder: 5 m_TargetDisplay: 0 ---- !u!1 &1856502455 +--- !u!1 &1857126571 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2848,9 +3399,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1856502456} - - component: {fileID: 1856502458} - - component: {fileID: 1856502457} + - component: {fileID: 1857126572} + - component: {fileID: 1857126574} + - component: {fileID: 1857126573} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -2858,32 +3409,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1856502456 +--- !u!224 &1857126572 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1856502455} + m_GameObject: {fileID: 1857126571} 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: 1554896326} + m_Father: {fileID: 1129966203} 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: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1856502457 +--- !u!114 &1857126573 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1856502455} + m_GameObject: {fileID: 1857126571} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -2897,7 +3448,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uC778\uD2B8\uB85C \uC774\uD6C4\uBD80\uD130" + m_text: "\uB9C8\uB9C8\uACE0 \uC774\uD6C4(\uC784\uC2DC)" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} @@ -2966,13 +3517,13 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1856502458 +--- !u!222 &1857126574 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1856502455} + m_GameObject: {fileID: 1857126571} m_CullTransparentMesh: 1 --- !u!1001 &1903406276 PrefabInstance: @@ -3354,7 +3905,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "3Match \uC774\uD6C4\uBD80\uD130" + m_text: "SLG\uBD80\uD130" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} m_sharedMaterial: {fileID: 8398014560776052167, guid: c8cb25ccd1fe043408814de784fa425a, type: 2} diff --git a/Assets/Scripts/Runtime/Main/DataCheater.cs b/Assets/Scripts/Runtime/Main/DataCheater.cs index 1cee707b..51a00134 100644 --- a/Assets/Scripts/Runtime/Main/DataCheater.cs +++ b/Assets/Scripts/Runtime/Main/DataCheater.cs @@ -1,3 +1,4 @@ +using Runtime.InGameSystem; using Runtime.Manager; using UnityEngine; @@ -7,6 +8,8 @@ namespace Runtime.ETC { public class DataCheater : MonoBehaviour { + [SerializeField] private SceneSystem _sceneSystem; + public void LoadCheatData(string file) { TextAsset jsonFile = Resources.Load("Cheat/" + file); // (파일명).json 파일을 불러옴 @@ -19,6 +22,8 @@ public void LoadCheatData(string file) string jsonData = jsonFile.text; GameData data = JsonUtility.FromJson(jsonData); Managers.Data.ChangeData(data); + + _sceneSystem.LoadScene($"CH{Managers.Data.Chapter}"); } } } diff --git a/Assets/Scripts/Runtime/Main/MainController.cs b/Assets/Scripts/Runtime/Main/MainController.cs index 6617e582..4433f285 100644 --- a/Assets/Scripts/Runtime/Main/MainController.cs +++ b/Assets/Scripts/Runtime/Main/MainController.cs @@ -1,4 +1,5 @@ using Runtime.InGameSystem; +using Runtime.Main.Runtime.ETC; using UnityEngine; namespace Runtime.Main @@ -6,11 +7,10 @@ namespace Runtime.Main public class MainController : MonoBehaviour { [SerializeField] private SceneSystem _sceneSystem; - private TestData _testData; + [SerializeField] private DataCheater _dataCheater; private void Start() { - _testData = new TestData(); Managers.Data.InGameKeyBinder.GameControlReset(); } @@ -23,11 +23,7 @@ public void NewGame() public void LoadGame() { Managers.Data.LoadGame(); - - if (Managers.Data.Chapter == 1) - _sceneSystem.LoadScene("CH1"); - else if (Managers.Data.Chapter == 2) - _sceneSystem.LoadScene("CH2"); + _sceneSystem.LoadScene($"CH{Managers.Data.Chapter}"); } public void GoPacmom() @@ -35,35 +31,5 @@ public void GoPacmom() Managers.Data.NewGame(); _sceneSystem.LoadScene("Pacmom"); } - - public void GoCH2() - { - Managers.Data.NewGame(); - _sceneSystem.LoadScene("CH2"); - } - - public void AfterIntro() - { - Managers.Data.NewGame(); - _testData.DataAfterIntro(); - Managers.Data.SaveGame(); - LoadGame(); - } - - public void AfterPacmom() - { - Managers.Data.NewGame(); - _testData.DataAfterPacmom(); - Managers.Data.SaveGame(); - LoadGame(); - } - - public void After3Match() - { - Managers.Data.NewGame(); - _testData.DataAfter3Match(); - Managers.Data.SaveGame(); - LoadGame(); - } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Main/TestData.cs b/Assets/Scripts/Runtime/Main/TestData.cs deleted file mode 100644 index b1b355f6..00000000 --- a/Assets/Scripts/Runtime/Main/TestData.cs +++ /dev/null @@ -1,32 +0,0 @@ -namespace Runtime.Main -{ - public class TestData - { - public void DataAfterIntro() - { - Managers.Data.Chapter = 1; - Managers.Data.Stage = 1; - Managers.Data.Scene = 1; - Managers.Data.SceneDetail = 1; - } - - public void DataAfterPacmom() - { - DataAfterIntro(); - Managers.Data.MeetLucky = true; - Managers.Data.IsPacmomPlayed = true; - Managers.Data.IsPacmomCleared = true; - Managers.Data.PacmomCoin = 300; - } - - public void DataAfter3Match() - { - DataAfterPacmom(); - Managers.Data.Stage = 2; - Managers.Data.Scene = 3; - Managers.Data.SceneDetail = 1; - Managers.Data.Is3MatchEntered = true; - Managers.Data.Is3MatchCleared = true; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Runtime/Main/TestData.cs.meta b/Assets/Scripts/Runtime/Main/TestData.cs.meta deleted file mode 100644 index 57d9a387..00000000 --- a/Assets/Scripts/Runtime/Main/TestData.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 433fd0b94fce34847892e492cf659a8a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Runtime/Manager/DataManager.cs b/Assets/Scripts/Runtime/Manager/DataManager.cs index cd919d2a..2d81ee67 100644 --- a/Assets/Scripts/Runtime/Manager/DataManager.cs +++ b/Assets/Scripts/Runtime/Manager/DataManager.cs @@ -188,6 +188,7 @@ public bool LoadGame() public void ChangeData(GameData data) { Managers.Data.SaveData = data; + SaveGame(); } public void NewGame() diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 1eee4efd..85fe2bfa 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from WOOS_COM at 2024-09-27 오후 11:08:07 \ No newline at end of file +Build from WOOS_COM at 2024-09-27 오후 11:47:12 \ No newline at end of file