Commit 3de267a2 authored by 박찬수's avatar 박찬수

Edit intro scene's canvas scaler, apply stageName from selectScene into gameScene

parent 6db16342
Pipeline #282 skipped
......@@ -1487,6 +1487,7 @@ MonoBehaviour:
DestroySlider: {fileID: 1260268595}
NatureImage: {fileID: 631792885}
NatureText: {fileID: 236659006}
stageText: {fileID: 1492999039}
activeEnemyList: []
--- !u!1 &444105185
GameObject:
......@@ -4420,7 +4421,7 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 25
m_FontSize: 18
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 1
......
......@@ -705,10 +705,10 @@ MonoBehaviour:
m_Script: {fileID: 1980459831, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_UiScaleMode: 0
m_UiScaleMode: 1
m_ReferencePixelsPerUnit: 100
m_ScaleFactor: 1
m_ReferenceResolution: {x: 800, y: 600}
m_ReferenceResolution: {x: 800, y: 450}
m_ScreenMatchMode: 0
m_MatchWidthOrHeight: 0
m_PhysicalUnit: 3
......
......@@ -18,6 +18,7 @@ public class MainLogic : MonoBehaviour {
public Slider DestroySlider;
public Image NatureImage;
public Text NatureText;
public Text stageText;
public List<Enemy> activeEnemyList = new List<Enemy>();
......@@ -31,6 +32,7 @@ public class MainLogic : MonoBehaviour {
void Start () {
DestroyButton.interactable = false;
DestroyText.text = "고심...";
stageText.text = PlayerPrefs.GetString("stageName");
godnessManager.godnessHP = Data.GodnessHP;
enemyManager.lastEnemyNum = Data.EnemyNumber;
nextSpwnrate = Data.startGen;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment