Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -160,12 +160,12 @@ namespace Fort23.Mono
                 shownextIcon = nextIcon3;
             }
 
-            if (eventConditionConfig.NPCID == 0)
+            if (eventConditionConfig.NPCID == 100)
             {
                 Text_Name1.text = PlayerManager.Instance.PlayerName;
                 PLayerNameRoot.SetActive(true);
             }
-            else if (eventConditionConfig.NPCID == -1)
+            else if (eventConditionConfig.NPCID == 0)
             {
                 PLayerNameRoot.SetActive(false);
             }