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

client_Hale

2019-07-04 0d86cb96d37ebc52d1c65e7f4b46b6a10ba2d947

 System/MainInterfacePanel/TaskFeedbackModel.cs

@@ -180,7 +180,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

@@ -212,7 +219,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }

@@ -245,7 +259,14 @@
                                    if (TryGetSatisfyConditionFuncs(feedback.failFuns[index], out succFuncs))

                                    {

                                        taskFeedbackFuncs.Clear();

                                        taskFeedbackFuncs.AddRange(succFuncs);

                                        if (config.onlyOneFunc == 1)

                                        {

                                            taskFeedbackFuncs.Add(succFuncs[0]);

                                        }

                                        else

                                        {

                                            taskFeedbackFuncs.AddRange(succFuncs);

                                        }

                                        TaskFeedbackFuncWin.funcTitle = funcTitle;

                                        WindowCenter.Instance.Open<TaskFeedbackFuncWin>();

                                    }