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

Assets/Scripts/GameUI/UI/ItemDetailsPanel/ItemDetailsPanel.cs

@@ -64,7 +64,7 @@ namespace Fort23.Mono
             ItemAssociateConfig itemAssociateConfig =
                 ConfigComponent.Instance.Get<ItemAssociateConfig>(itemInfo.config.associateID);
 
-            if (itemAssociateConfig.LanID != -1 || itemAssociateConfig.LanID != 0)
+            if (itemAssociateConfig.LanID != -1 && itemAssociateConfig.LanID != 0)
             {
                 ItemDetailsWidget itemDetailsWidge2 =
                     await UIManager.Instance.CreateGComponent<ItemDetailsWidget>(null, Connect);