Team.thewar
/
thewar_client
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

스크립트 대응 작업 완

This commit is contained in:
김판돌 2024-04-08 21:47:40 +09:00
parent 0bcc40b572
commit a7607d2a93
7 changed files with 22 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Client/Assets/0_Scenes/Play.unity
View File

@ -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

15
Client/Assets/1_Script/GameUI/StoryPlayUiCtrl.cs
View File

@ -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<StoryPlayUiCtrl>
{
@ -12,8 +12,10 @@ public class StoryPlayUiCtrl : SingletonMonoBehaviour<StoryPlayUiCtrl>
[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<StoryPlayUiCtrl>
{
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<UnitCtrl>();
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<UnitCtrl>();
youUnitNickname.text = unit.unit.name;
youUnitImage.sprite = Statics.stringIcons[unit.unit.name];
}
scriptText.text = scriptDatas[index].text;
}

2
Client/Assets/1_Script/PlayCtrl.cs
View File

@ -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<PlayCtrl>
{
//게임씬으로 이동
StoryPlayUiCtrl.Instance.EndButtle();
isStop = true;
}
return;
}

2
Client/Assets/1_Script/Prefab/StoryPrefab.cs
View File

@ -17,6 +17,6 @@ public class StoryPrefab : MonoBehaviour
}
public void StoryButton()
{
Debug.Log(storyText.text);
GameManager.Instance.chapterData = Statics.excelDatas.chapterData[101];
}
}

4
Client/Assets/1_Script/System/Cam.cs
View File

@ -1,6 +1,4 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine;
using UnityEngine.SceneManagement;
public class Cam : MonoBehaviour

24
Client/Assets/1_Script/System/CanvasSet.cs
View File

@ -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<CanvasScaler>().uiScaleMode = CanvasScaler.ScaleMode.ScaleWithScreenSize;
// //gameObject.GetComponent<CanvasScaler>().referenceResolution = new Vector2(GameManager.Instance.x, GameManager.Instance.y);
//}
//void Start()
//{
// if(GameManager.Instance.Over)
// {
// gameObject.GetComponent<CanvasScaler>().matchWidthOrHeight = 1.0f;
// }
// else
// {
// gameObject.GetComponent<CanvasScaler>().matchWidthOrHeight = 0.0f;
// }
//}
}

11
Client/Assets/1_Script/System/CanvasSet.cs.meta
View File

@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: ae9ea970822749648bac8d63c27f0c8a
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: