Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-26 703337574c8d4d4e852ea90c778e3aff3523ce12

 System/MainInterfacePanel/InGamePushContainer.cs

@@ -343,6 +343,15 @@
            }

            else

            {

                SnxxzGame.Instance.StartCoroutine(Co_DeActiveFairyGrabBoss());

            }

        }



        IEnumerator Co_DeActiveFairyGrabBoss()

        {

            yield return null;

            if (fairyGrabBossModel.fairyGrabBossHelps.Count == 0)

            {

                m_FairyGrabBossHelpBehaviour.gameObject.SetActive(false);

            }

        }