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

Assets/Res/UI/AppBarPanel/AppBarPanel.prefab

@@ -4968,7 +4968,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Content: {fileID: 2303318506788104112}
-  m_Horizontal: 1
+  m_Horizontal: 0
   m_Vertical: 1
   m_MovementType: 1
   m_Elasticity: 0.1

Assets/Scripts/GameUI/UI/BoxPanel/WidgetItemType2.cs

@@ -120,6 +120,10 @@ namespace Fort23.Mono
                 {
                     icon.icon_name = "dec_gfbook_tu";
                 }
+                else if (skillConfig.attribute == 0)
+                {
+                    icon.icon_name = "dec_gfbook_fuzhu";
+                }
 
                 Icon_Skill.gameObject.SetActive(true);
                 Icon_Skill.icon_name = skillConfig.icon;