From a7607d2a93c27e44f93fbdd6c757c74138b6f932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B9=80=ED=8C=90=EB=8F=8C?= Date: Mon, 8 Apr 2024 21:47:40 +0900 Subject: [PATCH] =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=20?= =?UTF-8?q?=EB=8C=80=EC=9D=91=20=EC=9E=91=EC=97=85=20=EC=99=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Client/Assets/0_Scenes/Play.unity | 14 +++++------ .../Assets/1_Script/GameUI/StoryPlayUiCtrl.cs | 15 ++++++++---- Client/Assets/1_Script/PlayCtrl.cs | 2 ++ Client/Assets/1_Script/Prefab/StoryPrefab.cs | 2 +- Client/Assets/1_Script/System/Cam.cs | 4 +--- Client/Assets/1_Script/System/CanvasSet.cs | 24 ------------------- .../Assets/1_Script/System/CanvasSet.cs.meta | 11 --------- 7 files changed, 22 insertions(+), 50 deletions(-) delete mode 100644 Client/Assets/1_Script/System/CanvasSet.cs delete mode 100644 Client/Assets/1_Script/System/CanvasSet.cs.meta diff --git a/Client/Assets/0_Scenes/Play.unity b/Client/Assets/0_Scenes/Play.unity index 2ea77f41..9998f417 100644 --- a/Client/Assets/0_Scenes/Play.unity +++ b/Client/Assets/0_Scenes/Play.unity @@ -13901,11 +13901,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a43250127931d8478b4a0b5e3611638, type: 3} m_Name: m_EditorClassIdentifier: - iUnit: {fileID: 0} - iUnitNickname: {fileID: 0} - youUnit: {fileID: 0} - youUnitNickname: {fileID: 0} - scriptText: {fileID: 0} + iUnit: {fileID: 6975796988758163051} + iUnitNickname: {fileID: 5127557828549460664} + youUnit: {fileID: 37635086790962674} + youUnitNickname: {fileID: 6831365340785763945} + scriptText: {fileID: 6037302274294790102} --- !u!1 &2554568632941243214 GameObject: m_ObjectHideFlags: 0 @@ -14742,7 +14742,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 73.005005, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &8383471597735064555 @@ -14799,7 +14799,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 73.005005, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!224 &8772798237890598308 diff --git a/Client/Assets/1_Script/GameUI/StoryPlayUiCtrl.cs b/Client/Assets/1_Script/GameUI/StoryPlayUiCtrl.cs index 6b2c5955..8db1089a 100644 --- a/Client/Assets/1_Script/GameUI/StoryPlayUiCtrl.cs +++ b/Client/Assets/1_Script/GameUI/StoryPlayUiCtrl.cs @@ -1,8 +1,8 @@ -using System; using System.Collections.Generic; -using System.Reflection; using TMPro; +using Unity.VisualScripting; using UnityEngine; +using UnityEngine.UI; public class StoryPlayUiCtrl : SingletonMonoBehaviour { @@ -12,8 +12,10 @@ public class StoryPlayUiCtrl : SingletonMonoBehaviour [SerializeField] GameObject iUnit; [SerializeField] TMP_Text iUnitNickname; + [SerializeField] Image iUnitImage; [SerializeField] GameObject youUnit; [SerializeField] TMP_Text youUnitNickname; + [SerializeField] Image youUnitImage; [SerializeField] TMP_Text scriptText; @@ -71,13 +73,18 @@ public class StoryPlayUiCtrl : SingletonMonoBehaviour { iUnit.SetActive(scriptDatas[index].position); youUnit.SetActive(!scriptDatas[index].position); + UnitCtrl unit; if (scriptDatas[index].position) { - iUnitNickname.text = Statics.intUnits[scriptDatas[index].unit_id].name; + unit = Statics.intUnits[scriptDatas[index].unit_id].GetComponent(); + iUnitNickname.text = unit.unit.name; + iUnitImage.sprite = Statics.stringIcons[unit.unit.name]; } else { - youUnitNickname.text = Statics.intUnits[scriptDatas[index].unit_id].name; + unit = Statics.intUnits[scriptDatas[index].unit_id].GetComponent(); + youUnitNickname.text = unit.unit.name; + youUnitImage.sprite = Statics.stringIcons[unit.unit.name]; } scriptText.text = scriptDatas[index].text; } diff --git a/Client/Assets/1_Script/PlayCtrl.cs b/Client/Assets/1_Script/PlayCtrl.cs index 63d1b4c4..226e5a3b 100644 --- a/Client/Assets/1_Script/PlayCtrl.cs +++ b/Client/Assets/1_Script/PlayCtrl.cs @@ -1,6 +1,7 @@ using System.Collections; using System.Collections.Generic; using TMPro; +using Unity.VisualScripting; using UnityEngine; using UnityEngine.UI; @@ -90,6 +91,7 @@ public class PlayCtrl : SingletonMonoBehaviour { //°ÔÀÓ¾ÀÀ¸·Î À̵¿ StoryPlayUiCtrl.Instance.EndButtle(); + isStop = true; } return; } diff --git a/Client/Assets/1_Script/Prefab/StoryPrefab.cs b/Client/Assets/1_Script/Prefab/StoryPrefab.cs index 09a73872..e0cd8404 100644 --- a/Client/Assets/1_Script/Prefab/StoryPrefab.cs +++ b/Client/Assets/1_Script/Prefab/StoryPrefab.cs @@ -17,6 +17,6 @@ public class StoryPrefab : MonoBehaviour } public void StoryButton() { - Debug.Log(storyText.text); + GameManager.Instance.chapterData = Statics.excelDatas.chapterData[101]; } } diff --git a/Client/Assets/1_Script/System/Cam.cs b/Client/Assets/1_Script/System/Cam.cs index fd657614..90630607 100644 --- a/Client/Assets/1_Script/System/Cam.cs +++ b/Client/Assets/1_Script/System/Cam.cs @@ -1,6 +1,4 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; +using UnityEngine; using UnityEngine.SceneManagement; public class Cam : MonoBehaviour diff --git a/Client/Assets/1_Script/System/CanvasSet.cs b/Client/Assets/1_Script/System/CanvasSet.cs deleted file mode 100644 index 9a4a2637..00000000 --- a/Client/Assets/1_Script/System/CanvasSet.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class CanvasSet : MonoBehaviour -{ - //private void Awake() - //{ - // gameObject.GetComponent().uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize; - // //gameObject.GetComponent().referenceResolution = new Vector2(GameManager.Instance.x, GameManager.Instance.y); - //} - //void Start() - //{ - // if(GameManager.Instance.Over) - // { - // gameObject.GetComponent().matchWidthOrHeight = 1.0f; - // } - // else - // { - // gameObject.GetComponent().matchWidthOrHeight = 0.0f; - // } - //} -} diff --git a/Client/Assets/1_Script/System/CanvasSet.cs.meta b/Client/Assets/1_Script/System/CanvasSet.cs.meta deleted file mode 100644 index 3d806fe7..00000000 --- a/Client/Assets/1_Script/System/CanvasSet.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ae9ea970822749648bac8d63c27f0c8a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: