장비창 열기,닫기 추가

2023-12-07 21:04:04 +09:00 · 2023-12-07 21:04:04 +09:00 · 94da5297b2
parent 0137559398
commit 94da5297b2
14 changed files with 370 additions and 7180 deletions
--- a/Client/Assets/0_Scenes/Game.unity
+++ b/Client/Assets/0_Scenes/Game.unity
--- a/Client/Assets/0_Scenes/Main.unity
+++ b/Client/Assets/0_Scenes/Main.unity
@ -369,7 +369,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0, y: 1}
  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 974.99994, y: -449.99997}
+  m_AnchoredPosition: {x: 900, y: -449.99997}
  m_SizeDelta: {x: 300, y: 100}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1125634795
@ -1201,7 +1201,7 @@ MonoBehaviour:
  m_ScaleFactor: 1
  m_ReferenceResolution: {x: 1800, y: 900}
  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
+  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
--- a/Client/Assets/0_Scenes/Play.unity
+++ b/Client/Assets/0_Scenes/Play.unity
@ -991,16 +991,6 @@ MonoBehaviour:
  newBuildingUI: {fileID: 1842952264}
  buildingLevelupUI: {fileID: 1785205477}
  backButton: {fileID: 1396764732}
-  units:
-  - {fileID: 6160760351963478645, guid: 5f38f860c4c61754ba8bbfa49d925b5f, type: 3}
-  - {fileID: 2589336159898910466, guid: ab93cd2f431d169408ca3e6cf43b2090, type: 3}
-  - {fileID: 2776803815121232242, guid: dd44a7468973dec4991cc3e6f036b5a6, type: 3}
-  - {fileID: 1769621809454940063, guid: def11be6f06804f479b438558506d5da, type: 3}
-  - {fileID: 7468181147198415131, guid: 742c034f1775e114e9c83507505b1f78, type: 3}
-  - {fileID: 8474998885444812674, guid: 7b0af7dce16ba4f468435f35d3a85161, type: 3}
-  - {fileID: 7995012865909342350, guid: 1cc56f1de218825438370e0b04d8eb4b, type: 3}
-  - {fileID: 824116206199136150, guid: 668f19ec68faa3749b5a955d6a5a66c8, type: 3}
-  - {fileID: 2789618061690570302, guid: 1efaad54f2327b845b5147b6d8d162ee, type: 3}
  buyText: {fileID: 663203141}
  sellText: {fileID: 1782769547}
  moneyText: {fileID: 13568456}
@ -1600,7 +1590,7 @@ MonoBehaviour:
  m_ScaleFactor: 1
  m_ReferenceResolution: {x: 1800, y: 900}
  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
+  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
@ -13647,7 +13637,7 @@ RectTransform:
  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: -900}
+  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!95 &2078404821
--- a/Client/Assets/0_Scenes/Title.unity
+++ b/Client/Assets/0_Scenes/Title.unity
@ -375,10 +375,10 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, 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: 1800, y: 800}
  m_ScreenMatchMode: 0
  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
--- a/Client/Assets/1_Script/Info/SummonsUnit.cs
+++ b/Client/Assets/1_Script/Info/SummonsUnit.cs
@ -67,7 +67,7 @@ public class SummonsUnit : MonoBehaviour

    public void EnemyStageSet(int stage)
    {
-        List<AI> ai = Statics.excelDatas.GamestageAIList(Statics.chapter, stage);
+        List<AIData> ai = Statics.excelDatas.GamestageAIList(Statics.chapter, stage);
        for(int n = 0; n < ai.Count; n++)
        {
            switch (ai[n].command)
--- a/Client/Assets/1_Script/System/Datas/AIData.cs
+++ b/Client/Assets/1_Script/System/Datas/AIData.cs
@ -1,7 +1,7 @@
 using Newtonsoft.Json;
 using System.Collections.Generic;

-public class AI : Excel
+public class AIData : Excel
 {
    public int index;
    public int chapter;
--- a/Client/Assets/1_Script/System/Datas/AIData.cs.meta
+++ b/Client/Assets/1_Script/System/Datas/AIData.cs.meta
--- a/Client/Assets/1_Script/System/Datas/EquipmentData.cs
+++ b/Client/Assets/1_Script/System/Datas/EquipmentData.cs
@ -0,0 +1,28 @@
+
+
+public class EquipmentData : Excel
+{
+    public int index;
+    public string name;
+    public ePart part;
+    public int stats1;
+    public int stats2;
+    public int stats3;
+    public int stats4;
+
+
+    public override void toJson()
+    {
+
+    }
+}
+
+public enum ePart
+{
+    Weapon = 0, //무기
+    Armor, //방어구
+    Shoes, //신발
+    Earrings, //귀걸이
+    Bracelet, //팔찌
+    Ring //반지
+}
--- a/Client/Assets/1_Script/System/Datas/EquipmentData.cs.meta
+++ b/Client/Assets/1_Script/System/Datas/EquipmentData.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 7e23163a5cda6d645bcacf6cbfbe59cf
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/1_Script/System/Datas/ExcelDatas.cs
+++ b/Client/Assets/1_Script/System/Datas/ExcelDatas.cs
@ -5,7 +5,10 @@ using System.Collections.Generic;
 public class ExcelDatas
 {
    public Dictionary<long, UnitData> unitData;
-    public Dictionary<long, AI> ai;
+    public Dictionary<long, AIData> ai;
+    public Dictionary<long, LeaderData> leaderData;
+    public Dictionary<long, EquipmentData> equipment;
+



@ -21,9 +24,9 @@ public class ExcelDatas
        action();
    }

-    public List<AI> GamestageAIList(int chapter, int stage)
+    public List<AIData> GamestageAIList(int chapter, int stage)
    {
-        List<AI> data = new List<AI>();
+        List<AIData> data = new List<AIData>();
        foreach (var item in ai)
        {
            if(item.Value.chapter == chapter && item.Value.stage == stage)
--- a/Client/Assets/1_Script/System/Datas/LeaderData.cs
+++ b/Client/Assets/1_Script/System/Datas/LeaderData.cs
@ -0,0 +1,25 @@
+using Newtonsoft.Json;
+using System.Collections.Generic;
+
+public class LeaderData : Excel
+{
+    public int index;
+    public string name;
+    public string ability_list;
+    public string ability_point_list;
+    public int hp;
+    public int attack;
+    public int attack_speed;
+    public int defense;
+    public int move_speed;
+
+    public List<int> ability;
+    public List<int> ability_point;
+
+
+    public override void toJson()
+    {
+        ability = JsonConvert.DeserializeObject<List<int>>(ability_list);
+        ability_point = JsonConvert.DeserializeObject<List<int>>(ability_point_list);
+    }
+}
--- a/Client/Assets/1_Script/System/Datas/LeaderData.cs.meta
+++ b/Client/Assets/1_Script/System/Datas/LeaderData.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e30150a001053c54ea04dc6ee48e3510
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Client/Assets/1_Script/System/Http/Request.cs
+++ b/Client/Assets/1_Script/System/Http/Request.cs
@ -32,8 +32,8 @@ public class Request<T>
            , (request, response) => {
                if (response == null                                            //알 수 없는 문제
                 || (response.StatusCode < 200 && response.StatusCode > 299)    //성공 외 반환
-                 || string.IsNullOrEmpty(response.DataAsText)                   //서버에서 반환 데이터 없음
-                 || response.DataAsText.Contains("error"))                      //서버에서 처리 중 에러 반환
+                 || string.IsNullOrEmpty(response.DataAsText))                   //서버에서 반환 데이터 없음
+                 //|| response.DataAsText.Contains("error"))                      //서버에서 처리 중 에러 반환
                {
                    Debug.LogError("status : " + response.StatusCode);

--- a/Client/Assets/3_Prefab/SystemUI.prefab
+++ b/Client/Assets/3_Prefab/SystemUI.prefab
@ -2649,7 +2649,7 @@ MonoBehaviour:
  m_ScaleFactor: 1
  m_ReferenceResolution: {x: 1800, y: 900}
  m_ScreenMatchMode: 0
-  m_MatchWidthOrHeight: 1
+  m_MatchWidthOrHeight: 0
  m_PhysicalUnit: 3
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96