Merge remote-tracking branch 'origin/master' into LuaOrgan

client_Lhy

2019-07-04 8ebdcb8980b7a630beb6a1ff82381baa0ab2ddb5

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -300,7 +300,7 @@
                        show = !GeneralDefine.worldBossNoRebornRemindMaps.Contains(mapId);

                        break;

                    case FindPreciousType.BossHome:

                        killable = bossHomeModel.wearyValue < vipModel.GetVipPrivilegeCnt(VipPrivilegeType.BossHomeAwardLimit);

                        killable = bossHomeModel.remindTimes > 0;

                        show = !GeneralDefine.bossHomeNoRebornRemindMaps.Contains(mapId);

                        break;

                    case FindPreciousType.ElderGodArea: