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

Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -82,7 +82,7 @@ namespace Fort23.Mono
             {
 
 
-                bool relust = await TipsPanle.OpenPnael("提示","是否重置功法");
+                bool relust = await TipsPanle.OpenPnael(10799);
                 if (!relust)
                 {
                     return;