少年修仙传客户端代码仓库
parent: d5f9047f | 补丁 | 提交 | ignore whitespace
client_linchunjie
2018-10-18 7a749cc69821704494e52b9fa562e23417186527 
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
28 ■■■■■ 已修改文件
System/MainInterfacePanel/PlayerTaskDatas.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskBoxBGMWin.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/Team/TeamData.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 System/MainInterfacePanel/PlayerTaskDatas.cs


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


            {



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



                {



                    RequestGetTaskAward("OK");



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



                    {



                        RequestGetTaskAward("OK");



                    }



                }







            }



@@ -375,7 +378,10 @@


            {



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



                {



                    RequestGetTaskAward("OK");



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



                    {



                        RequestGetTaskAward("OK");



                    }               


                }



            }



        }





 System/MainInterfacePanel/TaskBoxBGMWin.cs


@@ -143,11 +143,15 @@


            if (_AllMissionDict.ContainsKey(_TaskId))



            {







                if (_AllMissionDict[_TaskId].Type == 7 || (_AllMissionDict[_TaskId].Type == 12 /*&& vipmodel.GetVipPrivilegeCnt(VipPrivilegeType.AutoFairyMisstion) >= 1*/))



                if (_AllMissionDict[_TaskId].Type == 7 || (_AllMissionDict[_TaskId].Type == 12))



                {



                    taskmodel.RequestGetTaskAward("OK");



                    WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();



                    WindowCenter.Instance.Open<MainInterfaceWin>();



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



                    {



                        taskmodel.RequestGetTaskAward("OK");



                        WindowCenter.Instance.CloseImmediately<TaskBoxBGMWin>();



                        WindowCenter.Instance.Open<MainInterfaceWin>();



                    }



                   


                }



            }



        }





 System/Team/TeamData.cs


@@ -448,6 +448,12 @@


            }



        }







        public bool isPreparing {



            get {



                return !IsAllOk() && !isError && !IsReject();



            }



        }







        public TeamPrepare()



        {



        }