diff --git a/Client/Assets/0_Scenes/Title.unity b/Client/Assets/0_Scenes/Title.unity index 88ac9280..79e7b0c9 100644 --- a/Client/Assets/0_Scenes/Title.unity +++ b/Client/Assets/0_Scenes/Title.unity @@ -277,14 +277,6 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 4797950767585128335, guid: fd11d2cec9f04a244b8a79b9fad9c7f3, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5296450069761795811, guid: fd11d2cec9f04a244b8a79b9fad9c7f3, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 6231225141918335816, guid: fd11d2cec9f04a244b8a79b9fad9c7f3, type: 3} propertyPath: m_Name value: SystemUI @@ -329,10 +321,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8135403295614570654, guid: fd11d2cec9f04a244b8a79b9fad9c7f3, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Client/Assets/1_Script/GameUI/UnitSetUiCtrl.cs b/Client/Assets/1_Script/GameUI/UnitSetUiCtrl.cs index 221ab010..d19e806d 100644 --- a/Client/Assets/1_Script/GameUI/UnitSetUiCtrl.cs +++ b/Client/Assets/1_Script/GameUI/UnitSetUiCtrl.cs @@ -373,73 +373,92 @@ public class UnitSetUiCtrl : SingletonMonoBehaviour case 0: return "공격력"; case 1: - return "방어 관통력"; + return "방어관통력"; case 2: + return "치명타 확률"; + case 3: return "치명타 대미지"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } case ePart.Armor: //갑옷 switch (randStats) { case 0: - return "방어력"; - case 1: return "체력"; + case 1: + return "방어력"; case 2: + return "이동속도"; + case 3: return "대미지 감소"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } case ePart.Gloves: //장갑 switch (randStats) { case 0: - return "이동속도"; - case 1: - return "공격속도"; - case 2: return "공격력"; + case 1: + return "방어 관통력"; + case 2: + return "치명타 확률"; + case 3: + return "치명타 대미지"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } case ePart.Headpiece: //투구 switch (randStats) { case 0: - return "공격력"; - case 1: - return "방어관통력"; - case 2: return "체력"; + case 1: + return "방어력"; + case 2: + return "이동속도"; + case 3: + return "대미지 감소"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } case ePart.Shield: //보조장비 switch (randStats) { case 0: - return "방어력"; + return "공격속도"; case 1: - return "대미지감소"; + return "이동속도"; case 2: - return "체력"; + return "방어 관통력"; + case 3: + return "공격력"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } case ePart.Ring: //반지 switch (randStats) { case 0: - return "치명타확률"; + return "공격속도"; case 1: return "이동속도"; case 2: - return "공격속도"; + return "대미지 감소"; + case 3: + return "방어력"; default: + Debug.Log("알수없는 능력치 : " + randStats); return ""; } default: + Debug.Log("알수없는 파츠 : " + part); return ""; } } @@ -454,8 +473,8 @@ public class UnitSetUiCtrl : SingletonMonoBehaviour return equipmentData.stats2.ToString(); case 3: return equipmentData.stats3.ToString(); - //case 4: - // return equipmentData.stats4.ToString(); + case 4: + return equipmentData.stats4.ToString(); default: return "0"; } diff --git a/Client/Assets/1_Script/System/Statics.cs b/Client/Assets/1_Script/System/Statics.cs index 48bcf193..b6a9ccd1 100644 --- a/Client/Assets/1_Script/System/Statics.cs +++ b/Client/Assets/1_Script/System/Statics.cs @@ -5,8 +5,8 @@ using UnityEngine.UI; public class Statics { #if UNITY_EDITOR - public static readonly string url = "https://localhost:4860"; - //public static readonly string url = "https://game.pandoli365.com"; + //public static readonly string url = "https://localhost:4860"; + public static readonly string url = "https://game.pandoli365.com"; #else public static readonly string url = "https://game.pandoli365.com"; #endif