Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/UI/CombatPanel/SkillSelectPanel.cs

@@ -519,6 +519,10 @@ namespace Fort23.Mono
                 return 1;
             }
 
+            return type1.skillConfig.SkillType != type2.skillConfig.SkillType
+                ? type1.skillConfig.SkillType.CompareTo(type2.skillConfig.SkillType)
+                : type1.skillConfig.ID.CompareTo(type2.skillConfig.ID);
+
             return 0;
         }