스토리모드 임시 작업

This commit is contained in:
김판돌 2024-04-07 17:28:51 +09:00
parent 232d5e86d4
commit 76865ddec2
8 changed files with 1437 additions and 292 deletions

View File

@ -14782,7 +14782,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 30}
m_Pivot: {x: 0, y: 1}
--- !u!114 &1348509583
MonoBehaviour:
@ -18593,7 +18593,6 @@ GameObject:
m_Component:
- component: {fileID: 1699950330}
- component: {fileID: 1699950332}
- component: {fileID: 1699950331}
- component: {fileID: 1699950333}
m_Layer: 5
m_Name: StroyUi
@ -18601,7 +18600,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1699950330
RectTransform:
m_ObjectHideFlags: 0
@ -18623,36 +18622,6 @@ RectTransform:
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1699950331
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1699950329}
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: 0.5803922}
m_RaycastTarget: 0
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 0
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
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 &1699950332
CanvasRenderer:
m_ObjectHideFlags: 0

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,19 @@
using System.Collections.Generic;
public class StoryPlayUiCtrl : SingletonMonoBehaviour<StoryPlayUiCtrl>
{
List<ScriptData> scriptDatas = new List<ScriptData>();
bool isScript = false;
protected override void OnAwake()
{
//TODO game메니저를 확인해서 데이터가 있으면 true 없으면 바로 게임종료가 되도록 수정할것
isScript = true;
gameObject.SetActive(true);
}
public void SelectNextButton()
{
}
}

View File

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

View File

@ -59,7 +59,7 @@ public class UnitCtrl : MonoBehaviour
}
private void Update()
{
if (PlayCtrl.Instance.isEndGame || _isDie)
if (PlayCtrl.Instance.isEndGame || _isDie || PlayCtrl.Instance.isStop)
return;
delay -= Time.deltaTime;
if (delay > 0)

View File

@ -31,6 +31,7 @@ public class PlayCtrl : SingletonMonoBehaviour<PlayCtrl>
public SummonsUnit player;
public SummonsUnit enemy;
public BuildingCtrl buildingCtrl;
public bool isStop;
public bool isEndGame;
private float delay;
@ -44,6 +45,7 @@ public class PlayCtrl : SingletonMonoBehaviour<PlayCtrl>
money = 0;
moneyText.text = money.ToString();
isEndGame = false;
isStop = false;
delay = 0.0f;
units = new UnitCtrl[9];
units[0] = Statics.longUnits[Statics.itemManager.box.FindDeckUnitInfo(Statics.deck_info[0].deck_unit0_id).unit_data_id].GetComponent<UnitCtrl>();
@ -77,6 +79,10 @@ public class PlayCtrl : SingletonMonoBehaviour<PlayCtrl>
}
private void Update()
{
if (isStop)
{
return;
}
if (isEndGame)
{
delay += Time.deltaTime;

File diff suppressed because one or more lines are too long