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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/MainInterfacePanel/FlyingShoesTask.cs

@@ -299,7 +299,7 @@
            }

            else

            {

                DesignDebug.LogError("任务表格PyTaskInfo配置缺失");

                DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                return;

            }



@@ -369,7 +369,7 @@
                }

                else

                {

                    DesignDebug.LogError("任务表格PyTaskInfo配置缺失");

                    DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                }

            }

        }

@@ -380,7 +380,7 @@
            var config = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(taskmodel.allMissionDict[taskID].Name);

            if (config == null)

            {

                DesignDebug.LogError("任务表格PyTaskInfo配置缺失");

                DebugEx.LogError("任务表格PyTaskInfo配置缺失");

                return null;

            }

            string taskName = config.show_writing;