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

client_linchunjie

2018-08-14 c6689f941359227f0b99b20b9400ccbab81b671c

 System/MainInterfacePanel/DialogueDuidanceWin.cs

@@ -265,7 +265,7 @@
                }

                else

                {

                    DesignDebug.LogError("TaskInFo中没有这个Key。。" + string.Format(platercContentKey, stepNum));

                    DebugEx.LogError("TaskInFo中没有这个Key。。" + string.Format(platercContentKey, stepNum));

                }



            }

@@ -288,7 +288,7 @@
                var taskInfo = ConfigManager.Instance.GetTemplate<TASKINFOConfig>(string.Format(npcContentKey, stepNum));

                if (taskInfo == null)

                {

                    DesignDebug.LogError("TASKINFOConfig中没有找到对应的Key");

                    DebugEx.LogError("TASKINFOConfig中没有找到对应的Key");

                }

                else

                {