Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-10-18 7a749cc69821704494e52b9fa562e23417186527

 System/MainInterfacePanel/PlayerTaskDatas.cs

@@ -358,7 +358,10 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)

                    {

                    RequestGetTaskAward("OK");

                    }

                }



            }

@@ -375,10 +378,13 @@
            {

                if (BountyDic.ContainsKey(_TaskNow) || FairyAuDic.ContainsKey(_TaskNow))

                {

                    if (!ModelCenter.Instance.GetModel<TeamModel>().teamPrepare.isPreparing)

                    {

                    RequestGetTaskAward("OK");

                }

            }

        }

        }



    }