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

Assets/Res/UI/DaoYouPanel/DaoYouWidgetItem.prefab

@@ -274,7 +274,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8509535454573882615
 RectTransform:
   m_ObjectHideFlags: 0

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

@@ -131,7 +131,7 @@ namespace Fort23.Mono
         {
             if (summonData.isSummonSocre)
             {
-                TipMessagePanel.OpenTipMessagePanel("已经开启300抽挑战，不能进行单抽了");
+                TipMessagePanel.OpenTipMessagePanel(10793);
                 return;
             }
 

Assets/Scripts/GameUI/UI/DivineSence/DivineSenceItemPanel.cs

@@ -149,7 +149,7 @@ namespace Fort23.Mono
                     divineSenceItemWidget.ItemInfo.config.associateVlaue[2])
                 {
                     TipMessagePanel.OpenTipMessagePanel(LanguageManager.Instance.Text(10787,
-                        AccountFileInfo.Instance.playerData.divineSenseLevel));
+                        divineSenceItemWidget.ItemInfo.config.associateVlaue[2]));
                     return;
                 }
             }