2 Commits 3165b3b0cd ... 267ef17625

Author SHA1 Message Date
  zenghaowei 267ef17625 Merge branch 'dev' of http://47.96.66.225:10080/chelios/xsdmx-CocosCreator into dev 3 years ago
  zenghaowei d62c4976cd 地图一对话 3 years ago
2 changed files with 1933 additions and 1524 deletions
  1. 1 0
      assets/Script/game/fight/evnet/FDialogNoneNPC.ts
  2. 1932 1524
      assets/resources/prefab/map/map1.prefab

+ 1 - 0
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(() => {

File diff suppressed because it is too large
+ 1932 - 1524
assets/resources/prefab/map/map1.prefab