로그인 기능 추가

유닛 생성 시스템 수정

Client/Assets/0_Scenes/Game.unity

@@ -318,6 +318,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 26067830}
   m_CullTransparentMesh: 1
+--- !u!1 &49774426
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 49774427}
+  - component: {fileID: 49774429}
+  - component: {fileID: 49774428}
+  m_Layer: 5
+  m_Name: MissionUi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &49774427
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 49774426}
+  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: 131930850}
+  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 &49774428
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 49774426}
+  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}
+  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: 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 &49774429
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 49774426}
+  m_CullTransparentMesh: 1
 --- !u!1 &54711394
 GameObject:
   m_ObjectHideFlags: 0
@@ -727,6 +802,11 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 247032538}
+  - {fileID: 544367043}
+  - {fileID: 432455696}
+  - {fileID: 315316775}
+  - {fileID: 1647398731}
+  - {fileID: 49774427}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
@@ -830,7 +910,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1475,7 +1555,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: "\uC2DC\uB098\uB9AC\uC624"
+  m_text: "\uD30C\uD2F0\uD3B8\uC131"
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 78b099802c23b534092adfc44d096c87, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 78b099802c23b534092adfc44d096c87, type: 2}
@@ -1631,6 +1711,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 289303910}
   m_CullTransparentMesh: 1
+--- !u!1 &315316774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 315316775}
+  - component: {fileID: 315316777}
+  - component: {fileID: 315316776}
+  m_Layer: 5
+  m_Name: EquipmentUi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &315316775
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 315316774}
+  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: 131930850}
+  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 &315316776
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 315316774}
+  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}
+  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: 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 &315316777
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 315316774}
+  m_CullTransparentMesh: 1
 --- !u!1 &332257318
 GameObject:
   m_ObjectHideFlags: 0
@@ -1911,6 +2066,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 414701001}
   m_CullTransparentMesh: 1
+--- !u!1 &432455695
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 432455696}
+  - component: {fileID: 432455698}
+  - component: {fileID: 432455697}
+  m_Layer: 5
+  m_Name: BagUI
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &432455696
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 432455695}
+  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: 131930850}
+  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 &432455697
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 432455695}
+  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}
+  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: 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 &432455698
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 432455695}
+  m_CullTransparentMesh: 1
 --- !u!1 &440143453
 GameObject:
   m_ObjectHideFlags: 0
@@ -2413,6 +2643,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 534736522}
   m_CullTransparentMesh: 1
+--- !u!1 &544367042
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 544367043}
+  - component: {fileID: 544367045}
+  - component: {fileID: 544367044}
+  m_Layer: 5
+  m_Name: UnitSetUi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &544367043
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544367042}
+  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: 131930850}
+  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 &544367044
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544367042}
+  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}
+  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: 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 &544367045
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 544367042}
+  m_CullTransparentMesh: 1
 --- !u!1 &564622128
 GameObject:
   m_ObjectHideFlags: 0
@@ -4080,7 +4385,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4398,7 +4703,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 0}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4577,6 +4882,81 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1593528350}
   m_CullTransparentMesh: 1
+--- !u!1 &1647398730
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1647398731}
+  - component: {fileID: 1647398733}
+  - component: {fileID: 1647398732}
+  m_Layer: 5
+  m_Name: ShopUi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1647398731
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1647398730}
+  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: 131930850}
+  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 &1647398732
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1647398730}
+  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}
+  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: 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 &1647398733
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1647398730}
+  m_CullTransparentMesh: 1
 --- !u!1 &1683343204
 GameObject:
   m_ObjectHideFlags: 0

Client/Assets/1_Script/Info/BuildingInfo.cs

@@ -5,4 +5,11 @@ using UnityEngine;
 public class BuildingInfo
 {
     public List<UnitCtrl> units = new List<UnitCtrl>();
+
+    public int level;
+
+    public BuildingInfo()
+    {
+        level = 1;
+    }
 }

Client/Assets/1_Script/Info/SummonsUnit.cs

@@ -28,7 +28,11 @@ public class SummonsUnit : MonoBehaviour
     private void Start()
     {
         if (isEnemy)
+        {
+            //0스테이지 에서 유닛이 세팅되게 시스템 작성
             PlayCtrl.Instance.enemy = this;
+            EnemyStageSet(0);
+        }
         else
             PlayCtrl.Instance.player = this;
 
@@ -54,12 +58,16 @@ public class SummonsUnit : MonoBehaviour
             listCount = buildingInfo.units.Count;
 
         for (int n = 0;  n < listCount; n++)
+        {
+            for(int m = 0; m < buildingInfo.level; m++)
             {
                 float pos = Random.Range(-3.7f, -0.3f);
                 if (isEnemy) //적소환
-                Instantiate(buildingInfo.units[n].gameObject, new Vector3(Random.Range(44.0f, 46.0f), pos, pos + 3.8f), Quaternion.identity).GetComponent<UnitCtrl>().isEnemy = isEnemy;
+                    Instantiate(buildingInfo.units[n].gameObject, new Vector3(Random.Range(44.0f, 46.0f), pos, pos + 3.8f), Quaternion.identity).GetComponent<UnitCtrl>().UnitBonusSet(isEnemy, buildingInfo.level);
                 else //아군 유닛 소환
-                Instantiate(buildingInfo.units[n].gameObject, new Vector3(Random.Range(-44.0f, -46.0f), pos, pos + 3.8f), Quaternion.identity).GetComponent<UnitCtrl>().isEnemy = isEnemy;
+                    Instantiate(buildingInfo.units[n].gameObject, new Vector3(Random.Range(-44.0f, -46.0f), pos, pos + 3.8f), Quaternion.identity).GetComponent<UnitCtrl>().UnitBonusSet(isEnemy, buildingInfo.level);
+            }
+
         }
         if (!isEnemy)//자원 생성
         {
@@ -72,9 +80,7 @@ public class SummonsUnit : MonoBehaviour
         List<AI> ai = Statics.excelDatas.GamestageAIList(Statics.chapter, stage);
         for(int n = 0; n < ai.Count; n++)
         {
-            int wave = ai[n].position / 10;
+            buildings[ai[n].wave].units.Add(Statics.units[ai[n].unit].GetComponent<UnitCtrl>());
-            //int pos = ai[n].position % 10;
-            buildings[wave].units.Add(Statics.units[ai[n].unit].GetComponent<UnitCtrl>());
             //if (ai[n].command.Equals(eCommand.add))
             //units.Add();
         }

Client/Assets/1_Script/Info/UnitCtrl.cs

@@ -21,13 +21,13 @@ public class UnitCtrl : MonoBehaviour
 
     public void DataSet(UnitData ud)
     {
-        unit.name = ud.name;
+        unit = new UnitInfo(ud);
-        unit.hp = ud.hp;
+    }
-        unit.attack = ud.attack;
+
-        unit.attackSpeed = ud.attack_speed;
+    public void UnitBonusSet(bool isEnemy, int unitLevel)
-        unit.defense = ud.defense;
+    {
-        unit.moveSpeed = ud.move_speed;
+        this.isEnemy = isEnemy;
-        unit.buy = ud.buy.ToArray();
+        unit.UnitBonusSet(new UnitBonus(unitLevel, new int[0], 0, 0));
     }
 
     private void Awake()

Client/Assets/1_Script/Info/UnitInfo.cs

@@ -3,11 +3,85 @@ using System;
 [Serializable]
 public class UnitInfo
 {
-    public string name;
+    string _name;
+
+    public string name { get { return _name; } }
+
+    int _maxHp;
+    public int maxHp { get { return (int)(_maxHp * unitBonus.levelBonus); } }
+
     public int hp;
-    public int attack;
+
-    public float attackSpeed;
+    int _attack;
-    public int defense;
+    public int attack { get { return (int)(_attack * unitBonus.levelBonus); } }
-    public float moveSpeed;
+    float _attackSpeed;
-    public int[] buy;
+    public float attackSpeed { get { return _attackSpeed + ((float)(unitBonus.level - 1) * 0.5f); } }
+    int _defense;
+    public int defense { get { return (int)(_defense * unitBonus.levelBonus); } }
+    float _moveSpeed;
+    public float moveSpeed { get { return _moveSpeed + ((float)(unitBonus.level - 1) * 0.5f); } }
+    int[] _buy;
+    public int[] buy { get { return _buy; } }
+
+    UnitBonus unitBonus;
+
+    public UnitInfo(UnitData ud)
+    {
+        _name = ud.name;
+        _maxHp = ud.hp;
+        _attack = ud.attack;
+        _attackSpeed = ud.attack_speed;
+        _defense = ud.defense;
+        _moveSpeed = ud.move_speed;
+        _buy = ud.buy.ToArray();
+    }
+
+    public void UnitBonusSet(UnitBonus unitBonus)
+    {
+        this.unitBonus = unitBonus;
+        this.hp = maxHp;
+    }
+}
+
+public class UnitBonus
+{
+    //시스템에서 강화되는 데이터
+    //1 > 1.12 > 1.272 > 1.439 > 1.643
+    int _level;
+
+    public int level { get { return level; } }
+
+    public float levelBonus { get { switch (_level)
+            {
+                case 1:
+                    return 1.0f;
+                case 2:
+                    return 1.12f;
+                case 3:
+                    return 1.272f;
+                case 4:
+                    return 1.439f;
+                case 5:
+                    return 1.643f;
+                    default: return 0.0f;
+            } } }
+
+    //장착 장비 정보
+    int[] _equipment;
+
+    public int[] equipment { get { return _equipment; } }
+
+    //장착한 리더의 강화 수치
+    int _leaderType;
+    public int leaderType { get { return _leaderType; } }
+    int _leaderbonus;
+    public int leaderbonus { get { return _leaderbonus; } }
+
+    public UnitBonus(int level, int[] equipment, int leaderType, int leaderbonus)
+    {
+        this._level = level;
+        this._equipment = equipment;
+        this._leaderType = leaderType;
+        this._leaderbonus = leaderbonus;
+    }
 }

Client/Assets/1_Script/MainCtrl.cs

@@ -4,12 +4,51 @@ using TMPro;
 public class MainCtrl : MonoBehaviour
 {
     [SerializeField] TMP_Text title_Text;
+    [SerializeField] TMP_Text messageText;
+    [SerializeField] TMP_InputField email;
+
+    [SerializeField] GameObject gameStartButton;
+    [SerializeField] GameObject loginButton;
+    [SerializeField] GameObject gestLoginButton;
+    [SerializeField] GameObject message;
 
     bool is_On;
     float dtime = 0;
+    bool isUpdate;
+
+    string uuid;
+
+    private void Awake()
+    {
+        gameStartButton.SetActive(false);
+        loginButton.SetActive(false);
+        gestLoginButton.SetActive(false);
+        message.SetActive(true);
+        isUpdate = false;
+        messageText.text = "data °ËÁõÁß....";
+
+    }
 
     private void Update()
     {
+        if (GameManager.Instance.isExcel)
+        {
+            return;
+        }
+        else if (!isUpdate)
+        {
+            isUpdate = !isUpdate;
+            uuid = PlayerPrefs.GetString("uuid");
+            message.SetActive(false);
+            if (uuid != "")
+            {
+                gameStartButton.SetActive(true);
+            }
+            else
+            {
+                loginButton.SetActive(true);
+            }
+        }
         if(is_On)
         {
             if(title_Text.color.a >= 1)
@@ -41,9 +80,50 @@ public class MainCtrl : MonoBehaviour
             }
         }
     }
+#if UNITY_EDITOR
+    public void GestLogin()
+    {
+        gestLoginButton.SetActive(true);
+    }
+
+    public void Join()
+    {
+        loginButton.SetActive(false);
+        gestLoginButton.SetActive(false);
+        gameStartButton.SetActive(true);
+
+    }
+#endif
+
+    public void FireBaseLogin()
+    {
+
+    }
+
+    public void MastodonLogin()
+    {
+
+    }
 
     public void NextButton()
     {
+        LoginResp resp = new LoginResp();
+        LoginReq req = new LoginReq(email.text, uuid);
+
+        message.SetActive(true);
+        messageText.text = "Login...";
+
+        resp.Request(req, (data) =>
+        {
+            //·Î±×ÀÎ ¼º°ø½Ã
+            PlayerPrefs.SetString("uuid",data.uuid);
             GameManager.Instance.NextScene(GameManager.eScene.Game);
+        }, () =>
+        {
+            PlayerPrefs.SetString("uuid", "");
+            Awake();
+        });
+ 
+ 
     }
 }

Client/Assets/1_Script/PlayCtrl.cs

@@ -54,8 +54,6 @@ public class PlayCtrl : SingletonMonoBehaviour<PlayCtrl>
         }
         //테스트용 일단은 이곳에서 임시 처리
         Statics.chapter = 101;
-        //0스테이지에서도 데이터 세팅을 할수 있게 수정
-        enemy.EnemyStageSet(stage);
         uiExit();
     }
 

Client/Assets/1_Script/System/Datas/AI.cs

@@ -9,7 +9,7 @@ public class AI : Excel
     public eCommand command;
     public string unit;
     public int position;
-    public bool is_next;
+    public int wave;
 
     public List<int> buy;
 

Client/Assets/1_Script/System/GameManager.cs

@@ -16,7 +16,7 @@ public class GameManager : DontDestroy<GameManager>
     /// <summary>
     /// 현재 엑셀 처리가 끝났는지 확인하는 부분.
     /// </summary>
-    public bool isExcel { get { return corExcel != null || corExcel.IsRunning; } }
+    public bool isExcel { get { return corExcel != null && corExcel.IsRunning; } }
 
     protected override void OnStart()
     {

Client/Assets/1_Script/System/Http/Protocol.cs

@@ -13,6 +13,7 @@ public enum Protocol
 
 
     Downlode = 100,//기획 데이터 다운로드
+    Login = 101,//±âȹ µ¥ÀÌÅÍ ´Ù¿î·Îµå
 }
 
 #region 100 : Downlode
@@ -38,3 +39,29 @@ public class DownlodeResp : Request<DownlodeResp>
     }
 }
 #endregion
+
+#region 101 : Login
+public class LoginReq
+{
+    public string mail { get; set; }
+    public string uuid { get; set; }
+
+    public LoginReq(string mail, string uuid)
+    {
+        this.mail = mail;
+        this.uuid = uuid;
+    }
+}
+
+public class LoginResp : Request<LoginResp>
+{
+    private Protocol protocol = Protocol.Login;
+    public string uuid { get; set; }
+    public string nickname { get; set; }
+
+    public void Request(LoginReq loginReq, Action<LoginResp> onRequestFinished, Action errorRequestFinished)
+    {
+        CreateRequest(protocol, onRequestFinished, loginReq, HTTPMethods.Post, errorRequestFinished);
+    }
+}
+#endregion

Client/Assets/1_Script/Test.cs

@@ -9,21 +9,6 @@ public class Test : MonoBehaviour
     [ContextMenu("test")]
     public void test()
     {
-        //Debug.Log(JsonConvert.SerializeObject(testlist));
-        //DownlodeResp request = new DownlodeResp();
-        //request.Request((data) =>
-        //{
-        //    Crypto cr = new Crypto();
-        //    Debug.Log(cr.Decompress(data.data));
-        //    Statics.version = data.version;
-        //});
-        int test = 1;
-        int wave = test / 10;
-        int pos = test % 10;
-
-
-        Debug.Log(wave);
-        Debug.Log(pos);
     }
 
     [ContextMenu("test2")]
@@ -33,7 +18,6 @@ public class Test : MonoBehaviour
         string testdd = cr.Compress("testdata");
         Debug.Log(testdd);
         Debug.Log(cr.Decompress(testdd));
-
     }
 
 

Client/Assets/Wooden_UI/Wooden_UI_png/Plank_06.png.meta

@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 20, y: 20, z: 20, w: 20}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -79,7 +79,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
@@ -92,7 +92,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -105,7 +105,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
@@ -118,7 +118,20 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -126,7 +139,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []

Client/Assets/Wooden_UI/Wooden_UI_png/frame_c_05.png.meta

@@ -49,7 +49,7 @@ TextureImporter:
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
   spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteBorder: {x: 208, y: 208, z: 208, w: 208}
   spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 1
@@ -79,7 +79,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
@@ -92,7 +92,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
@@ -105,7 +105,7 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 2048
@@ -118,7 +118,20 @@ TextureImporter:
     overridden: 0
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -126,7 +139,7 @@ TextureImporter:
     physicsShape: []
     bones: []
     spriteID: 5e97eb03825dee720800000000000000
-    internalID: 0
+    internalID: 1537655665
     vertices: []
     indices: 
     edges: []