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

client_linchunjie

2018-11-06 fc5d4318db0dbe68eb5e8d3e7bb7dacbf05bc3a7

 Fight/Stage/MapEditor/GuideDialogueWin.cs

@@ -153,7 +153,12 @@
            npcContent.text = m_DialogConfig.content;



            var npcConfig = Config.Instance.Get<NPCConfig>(m_DialogConfig.npcId);

            UI3DModelExhibition.Instance.ShowNPC(m_DialogConfig.npcId, npcConfig.UIModeLOffset, npcConfig.UIModelRotation, npcIcon, false, true);

            var data = new UI3DModelExhibition.UI3DNPCExhibitionData()

            {

                npcId = m_DialogConfig.npcId,

                isDialogue = true,

            };

            UI3DModelExhibition.Instance.ShowNPC(npcIcon, data);

        }



        if (m_DialogConfig.TalkID != 0)