SHA1
--- a/assets/Script/game/fight/evnet/FDialogNoneNPC.ts
+++ b/assets/Script/game/fight/evnet/FDialogNoneNPC.ts
@@ -114,6 +114,7 @@ export default class FDialogNoneNPC extends BaseEvent {
 
				     }
			
 
				 
			
 
				     npcFly(callBack: Function) {
			
 
				+        return
			
 
				         //1.幽灵变身
			
 
				         this.spine.setAnimation(0, 'escape', false);
			
 
				         this.spine.setCompleteListener(() => {
			
--- a/assets/resources/prefab/map/map1.prefab
+++ b/assets/resources/prefab/map/map1.prefab
Autors	SHA1 Ziņojums	Datums
zenghaowei	267ef17625 Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev	3 gadi atpakaļ
zenghaowei	d62c4976cd 地图一对话	3 gadi atpakaļ