Ver código fonte

修改技能显示bug

liao 4 meses atrás
pai
commit
c642cf8eb1

+ 25 - 25
Assets/Res/UI/SkillUIComponent.prefab

@@ -1737,7 +1737,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
@@ -1753,7 +1753,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1761,7 +1761,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1801,11 +1801,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 498.89496
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1843,7 +1843,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
@@ -1859,7 +1859,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1867,7 +1867,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -1907,11 +1907,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 52.884995
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -1949,7 +1949,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
@@ -1965,7 +1965,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -1973,7 +1973,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -2013,11 +2013,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 647.56494
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2055,7 +2055,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
@@ -2071,7 +2071,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -2079,7 +2079,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -2119,11 +2119,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 350.22498
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -2161,7 +2161,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 1165912544772320847, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_Pivot.x
@@ -2177,7 +2177,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.x
@@ -2185,7 +2185,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_SizeDelta.x
@@ -2225,11 +2225,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 201.55498
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -52.425
       objectReference: {fileID: 0}
     - target: {fileID: 8483118492620715607, guid: 31df5e9de4be4415e88452d7f77f6689, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x

+ 0 - 1
Assets/Scripts/Core/Utility/GlobalParam.cs

@@ -1,7 +1,6 @@
 
 using System;
 using Fort23.UTool;
-using UnityEngine;
 
 namespace Core.Utility
 {

+ 0 - 17
Assets/Scripts/GameLogic/Hero/SkillData.cs

@@ -7,23 +7,6 @@ namespace GameLogic.Hero
 {
     public class SkillData
     {
-        // public SkillConfig skillConfig;
-
-        /// <summary>
-        /// 所有技能
-        /// </summary>
-        // public List<SkillInfo> allSkills = new List<SkillInfo>();
-
-        /// <summary>
-        /// 已解锁的技能
-        /// </summary>
-        // public List<SkillInfo> allUnLockSkill = new List<SkillInfo>();
-        
-        /// <summary>
-        /// 战斗中的技能数据
-        /// </summary>
-        // public List<SkillInfo> allSkill4Combat = new List<SkillInfo>();
-        
         public Dictionary<int, List<SkillInfo>> mySkillDic = new Dictionary<int, List<SkillInfo>>();
 
         public CombatHeroInfo heroInfo;

+ 24 - 28
Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPre.cs

@@ -53,11 +53,7 @@ namespace Fort23.Mono
                 objUpSkill.SetActive(true);
                 objAtts.SetActive(false);
 
-                object[] data = GetSkillParam(skillConfig);//new object[skillConfig.effectValue.Length];
-                // for (int j = 0; j < skillConfig.effectValue.Length; j++)
-                // {
-                //     data[j] = skillConfig.effectValue[j];
-                // }
+                object[] data = HeroUITools.GetSkillParam(skillConfig);
 
                 imgNewSkill4Up.icon_name = skillConfig.icon;
                 txtSkillName4Up.text = LanguageManager.Instance.Text(skillConfig.name);
@@ -115,7 +111,7 @@ namespace Fort23.Mono
                 objProSkillUnlock.SetActive(true);
                 starsPos.localPosition = new Vector3(0, GlobalParam.Hero_Promote_UI_BG_Star_Pos_2, 0);
 
-                object[] data = GetSkillParam(skillConfig);
+                object[] data = HeroUITools.GetSkillParam(skillConfig);
  
 
                 imgNewSkill4Pro.icon_name = skillConfig.icon;
@@ -130,28 +126,28 @@ namespace Fort23.Mono
             }
         }
 
-        private object[] GetSkillParam(SkillConfig skillConfig)
-        {
-            object[] data = null;
-            if (skillConfig.SkillType == 5)
-            {
-                data = new object[skillConfig.addPropertyValue.Length];
-                for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
-                {
-                    data[j] = skillConfig.addPropertyValue[j];
-                }
-            }
-            else
-            {
-                data = new object[skillConfig.effectValue.Length];
-                for (int j = 0; j < skillConfig.effectValue.Length; j++)
-                {
-                    data[j] = skillConfig.effectValue[j];
-                }
-            }
-
-            return data;
-        }
+        // private object[] GetSkillParam(SkillConfig skillConfig)
+        // {
+        //     object[] data = null;
+        //     if (skillConfig.SkillType == 5)
+        //     {
+        //         data = new object[skillConfig.addPropertyValue.Length];
+        //         for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
+        //         {
+        //             data[j] = skillConfig.addPropertyValue[j];
+        //         }
+        //     }
+        //     else
+        //     {
+        //         data = new object[skillConfig.effectValue.Length];
+        //         for (int j = 0; j < skillConfig.effectValue.Length; j++)
+        //         {
+        //             data[j] = skillConfig.effectValue[j];
+        //         }
+        //     }
+        //
+        //     return data;
+        // }
 
         private void SetAttInfo(HeroInfo heroInfo, HeroInfo nextLvInfo)
         {

+ 26 - 0
Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Excel2Json;
 using Fort23.Core;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -9,6 +10,31 @@ namespace Fort23.Mono
 {
     public static class HeroUITools
     {
+     
+        
+        
+        public static object[] GetSkillParam(SkillConfig skillConfig)
+        {
+            object[] data = null;
+            if (skillConfig.SkillType == 5)
+            {
+                data = new object[skillConfig.addPropertyValue.Length];
+                for (int j = 0; j < skillConfig.addPropertyValue.Length; j++)
+                {
+                    data[j] = skillConfig.addPropertyValue[j];
+                }
+            }
+            else
+            {
+                data = new object[skillConfig.effectValue.Length];
+                for (int j = 0; j < skillConfig.effectValue.Length; j++)
+                {
+                    data[j] = skillConfig.effectValue[j];
+                }
+            }
+
+            return data;
+        }
         
         /// <summary>
         /// 更新对应职业的装备图标

+ 7 - 5
Assets/Scripts/GameUI/UI/Hero/SkillUIComponent.cs

@@ -155,11 +155,13 @@ namespace Fort23.Mono
                 }
                 
                 GameObject go = skillDesc[i] as GameObject;
-                object[] data = new object[skillInfos[i].skillConfig.effectValue.Length];
-                for (int j = 0; j < skillInfos[i].skillConfig.effectValue.Length; j++)
-                {
-                    data[j] = skillInfos[i].skillConfig.effectValue[j];
-                }
+                // object[] data = new object[skillInfos[i].skillConfig.effectValue.Length];
+                // for (int j = 0; j < skillInfos[i].skillConfig.effectValue.Length; j++)
+                // {
+                //     data[j] = skillInfos[i].skillConfig.effectValue[j];
+                // }
+
+                object[] data = HeroUITools.GetSkillParam(skillInfos[i].skillConfig);
                 
                 string lvTxt = "";
                 //1级技能直接显示技能效果,从2级开始,UI上要显示 2级:技能效果描述

Diferenças do arquivo suprimidas por serem muito extensas
+ 19 - 20
UserSettings/Layouts/default-2022.dwlt


Alguns arquivos não foram mostrados porque muitos arquivos mudaram nesse diff