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

Assets/Res/Config/LanguageChineseConfig.json

@@ -40319,6 +40319,10 @@
     {
       "ID": 10820,
       "txt": "挂机修为已达上限."
+    },
+    {
+      "ID": 10821,
+      "txt": "今日宝券广告次数已用完！"
     }
   ]
 }

Assets/Scripts/GameUI/UI/AppBarPanel/AppBarPanel.cs

@@ -260,7 +260,7 @@ namespace Fort23.Mono
             // }
 
             CombatDrive.Instance.CombatController.ChangeState(CombatController.update);
-            EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
+            // EventManager.Instance.Dispatch(CustomEventType.ShengShiOnClick, null);
         }
 
         public void CustomInit(UIPanel uiPanel)

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

@@ -154,6 +154,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;