Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Dogz/DogzWin.cs

@@ -70,8 +70,9 @@
        }





        private void OnOpenFuncEvent(int order)

        private void OnOpenFuncEvent(int order,int equipIndex)

        {

            ModelCenter.Instance.GetModel<GodBeastModel>().ItemPlace = equipIndex;

            funcBtnGroup.TriggerByOrder(order);

            if(WindowCenter.Instance.CheckOpen<DogzPackWin>())

            {