diff --git a/JisolGameCocos/assets/resources/12.txt b/JisolGameCocos/assets/resources/12.txt
deleted file mode 100644
index 00a8a689..00000000
--- a/JisolGameCocos/assets/resources/12.txt
+++ /dev/null
@@ -1,158 +0,0 @@
-1 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-2- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-3- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-4- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-5- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-7- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-9- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-10- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-5- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 29 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 29 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GFSMAnimBase.ts:125 undefined 播放动画-1- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-2- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-3- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-7- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-9- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-4- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-10- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-2GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GFSMAnimBase.ts:125 undefined 播放动画-2- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 101 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 101 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 102 播放动画-7- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GFSMAnimBase.ts:125 115 播放动画-3- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GFSMAnimBase.ts:125 undefined 播放动画-1- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 119 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-9- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GFSMAnimBase.ts:125 undefined 播放动画-5- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 168 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[8] onAttack 6
-GFSMAnimBase.ts:125 undefined 播放动画-6- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[11] onAttack 4
-GFSMAnimBase.ts:125 216 播放动画-4- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-10- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-10- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/12.txt.meta b/JisolGameCocos/assets/resources/12.txt.meta
deleted file mode 100644
index bf32c654..00000000
--- a/JisolGameCocos/assets/resources/12.txt.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ver": "1.0.2",
-  "importer": "text",
-  "imported": true,
-  "uuid": "aa8a78cc-e890-455c-8ca8-f0ab5fece55f",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/JisolGameCocos/assets/resources/33.txt b/JisolGameCocos/assets/resources/33.txt
deleted file mode 100644
index 783bfed0..00000000
--- a/JisolGameCocos/assets/resources/33.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-1 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-2- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-3- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-4- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-5- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-7- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-9- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-10- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 1 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-5- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 29 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 29 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GFSMAnimBase.ts:125 undefined 播放动画-1- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-2- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-3- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-7- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-9- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-4- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-10- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-2GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GFSMAnimBase.ts:125 undefined 播放动画-2- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 101 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 101 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 102 播放动画-7- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GFSMAnimBase.ts:125 115 播放动画-1- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 115 播放动画-3- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:125 undefined 播放动画-9- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GFSMAnimBase.ts:125 undefined 播放动画-5- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 168 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GFSMAnimBase.ts:125 undefined 播放动画-8- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GFSMAnimBase.ts:125 221 播放动画-6- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GFSMAnimBase.ts:125 undefined 播放动画-4- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 undefined 播放动画-10- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:125 226 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 226 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 undefined 播放动画-12- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:125 292 播放动画-11- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/33.txt.meta b/JisolGameCocos/assets/resources/33.txt.meta
deleted file mode 100644
index c51678d3..00000000
--- a/JisolGameCocos/assets/resources/33.txt.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ver": "1.0.2",
-  "importer": "text",
-  "imported": true,
-  "uuid": "987c7c4a-057a-454a-85f4-772f5c3a6935",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/JisolGameCocos/assets/resources/331.txt b/JisolGameCocos/assets/resources/331.txt
deleted file mode 100644
index ae64a8d2..00000000
--- a/JisolGameCocos/assets/resources/331.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-1 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-2- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-3- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-4- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-5- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-7- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-9- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-10- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-5- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 29 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 29 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GFSMAnimBase.ts:154 undefined 播放动画-1- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-2- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-3- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-7- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-9- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-4- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-10- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-2GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GFSMAnimBase.ts:154 undefined 播放动画-2- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 101 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 101 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 102 播放动画-7- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GFSMAnimBase.ts:154 115 播放动画-1- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 115 播放动画-3- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-9- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GFSMAnimBase.ts:154 undefined 播放动画-5- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 168 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GFSMAnimBase.ts:154 221 播放动画-6- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GFSMAnimBase.ts:154 undefined 播放动画-4- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-10- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 226 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 226 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 292 播放动画-11- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/331.txt.meta b/JisolGameCocos/assets/resources/331.txt.meta
deleted file mode 100644
index 55be04a6..00000000
--- a/JisolGameCocos/assets/resources/331.txt.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ver": "1.0.2",
-  "importer": "text",
-  "imported": true,
-  "uuid": "2201bceb-a177-49c8-91e5-65399342de88",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/JisolGameCocos/assets/resources/332.txt b/JisolGameCocos/assets/resources/332.txt
deleted file mode 100644
index ae64a8d2..00000000
--- a/JisolGameCocos/assets/resources/332.txt
+++ /dev/null
@@ -1,156 +0,0 @@
-1 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-2- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-3- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-4- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-5- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-7- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-9- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-10- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 1 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-5- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 29 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 29 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GFSMAnimBase.ts:154 undefined 播放动画-1- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-2- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-3- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-7- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-9- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-4- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-10- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[1] onAttack 7
-GRoleDefault.ts:117 播放动画[2] onAttack 8
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[7] onAttack 1
-GRoleDefault.ts:117 播放动画[8] onAttack 2
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-2GRoleDefault.ts:117 播放动画[11] onAttack 2
-GRoleDefault.ts:117 播放动画[6] onAttack 7
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 7
-GRoleDefault.ts:117 播放动画[12] onAttack 1
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 1
-GFSMAnimBase.ts:154 undefined 播放动画-2- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 101 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 101 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 102 播放动画-7- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-1- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-6- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[3] onAttack 9
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 3
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[9] onAttack 3
-GFSMAnimBase.ts:154 115 播放动画-1- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 115 播放动画-3- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 9
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GFSMAnimBase.ts:154 undefined 播放动画-9- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-6- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[5] onAttack 8
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 5 8
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[11] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[8] onAttack 5
-GFSMAnimBase.ts:154 undefined 播放动画-5- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 168 播放动画-8- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GFSMAnimBase.ts:154 undefined 播放动画-8- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-11- {title: '攻击', animName: 'atk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GRoleDefault.ts:117 播放动画[12] onAttack 6
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 12 6
-GRoleDefault.ts:117 播放动画[6] onAttack 12
-GAttackParabolicBangRemote.ts:43 播放动画[GAttackParabolicRemote] 6 12
-2GRoleDefault.ts:117 播放动画[11] onAttack 6
-GFSMAnimBase.ts:154 221 播放动画-6- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GRoleDefault.ts:117 播放动画[4] onAttack 10
-GRoleDefault.ts:117 播放动画[10] onAttack 4
-GFSMAnimBase.ts:154 undefined 播放动画-4- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 undefined 播放动画-10- {title: '死亡', animName: 'jifei', isLoop: true, mixs: Array(2), ifTo: Array(0), …}
-GFSMAnimBase.ts:154 226 播放动画-11- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 226 播放动画-12- {title: '移动', animName: 'walk', isLoop: true, mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 undefined 播放动画-12- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
-GFSMAnimBase.ts:154 292 播放动画-11- {title: '等待', isLoop: true, animName: 'std', mixs: Array(2), to: Array(3), …}
\ No newline at end of file
diff --git a/JisolGameCocos/assets/resources/332.txt.meta b/JisolGameCocos/assets/resources/332.txt.meta
deleted file mode 100644
index 53990bf8..00000000
--- a/JisolGameCocos/assets/resources/332.txt.meta
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "ver": "1.0.2",
-  "importer": "text",
-  "imported": true,
-  "uuid": "3573cc27-514e-49fc-91ef-510f3fca6aab",
-  "files": [
-    ".json"
-  ],
-  "subMetas": {},
-  "userData": {}
-}
diff --git a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab
index 1e3de58d..ebb1c1aa 100644
--- a/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab
+++ b/JisolGameCocos/assets/resources/prefab/ui/常用预制体/阵法/阵法节点.prefab
@@ -27,9 +27,6 @@
     ],
     "_active": true,
     "_components": [
-      {
-        "__id__": 24
-      },
       {
         "__id__": 26
       },
@@ -37,14 +34,17 @@
         "__id__": 28
       },
       {
-        "__id__": 32
+        "__id__": 30
       },
       {
-        "__id__": 30
+        "__id__": 34
+      },
+      {
+        "__id__": 32
       }
     ],
     "_prefab": {
-      "__id__": 35
+      "__id__": 37
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -348,11 +348,11 @@
     "_active": true,
     "_components": [
       {
-        "__id__": 21
+        "__id__": 23
       }
     ],
     "_prefab": {
-      "__id__": 23
+      "__id__": 25
     },
     "_lpos": {
       "__type__": "cc.Vec3",
@@ -385,137 +385,115 @@
   },
   {
     "__type__": "cc.Node",
-    "_name": "spine",
     "_objFlags": 0,
-    "__editorExtras__": {},
     "_parent": {
       "__id__": 14
     },
-    "_children": [],
-    "_active": true,
-    "_components": [
-      {
-        "__id__": 16
-      },
+    "_prefab": {
+      "__id__": 16
+    },
+    "__editorExtras__": {}
+  },
+  {
+    "__type__": "cc.PrefabInfo",
+    "root": {
+      "__id__": 15
+    },
+    "asset": {
+      "__uuid__": "ef1f320e-328a-41c9-bfdc-ad17d402e14f",
+      "__expectedType__": "cc.Prefab"
+    },
+    "fileId": "02c3tqHwFAbp7zhkA22zq9",
+    "instance": {
+      "__id__": 17
+    },
+    "targetOverrides": null
+  },
+  {
+    "__type__": "cc.PrefabInstance",
+    "fileId": "2cKGuBsmpOdL+zCHLA4m9m",
+    "prefabRootNode": {
+      "__id__": 1
+    },
+    "mountedChildren": [],
+    "mountedComponents": [],
+    "propertyOverrides": [
       {
         "__id__": 18
+      },
+      {
+        "__id__": 20
+      },
+      {
+        "__id__": 21
+      },
+      {
+        "__id__": 22
       }
     ],
-    "_prefab": {
-      "__id__": 20
+    "removedComponents": []
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
     },
-    "_lpos": {
+    "propertyPath": [
+      "_name"
+    ],
+    "value": "宠物ICON"
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "02c3tqHwFAbp7zhkA22zq9"
+    ]
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
+    },
+    "propertyPath": [
+      "_lpos"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
-      "y": -35.47,
+      "y": 0,
       "z": 0
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
     },
-    "_lrot": {
+    "propertyPath": [
+      "_lrot"
+    ],
+    "value": {
       "__type__": "cc.Quat",
       "x": 0,
       "y": 0,
       "z": 0,
       "w": 1
+    }
+  },
+  {
+    "__type__": "CCPropertyOverrideInfo",
+    "targetInfo": {
+      "__id__": 19
     },
-    "_lscale": {
-      "__type__": "cc.Vec3",
-      "x": 0.8,
-      "y": 0.8,
-      "z": 1
-    },
-    "_mobility": 0,
-    "_layer": 33554432,
-    "_euler": {
+    "propertyPath": [
+      "_euler"
+    ],
+    "value": {
       "__type__": "cc.Vec3",
       "x": 0,
       "y": 0,
       "z": 0
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.UITransform",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 17
-    },
-    "_contentSize": {
-      "__type__": "cc.Size",
-      "width": 100,
-      "height": 100
-    },
-    "_anchorPoint": {
-      "__type__": "cc.Vec2",
-      "x": 0.5,
-      "y": 0.5
-    },
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "65I6WOBWVCLrW6iywP48T/"
-  },
-  {
-    "__type__": "sp.Skeleton",
-    "_name": "",
-    "_objFlags": 0,
-    "__editorExtras__": {},
-    "node": {
-      "__id__": 15
-    },
-    "_enabled": true,
-    "__prefab": {
-      "__id__": 19
-    },
-    "_customMaterial": null,
-    "_srcBlendFactor": 2,
-    "_dstBlendFactor": 4,
-    "_color": {
-      "__type__": "cc.Color",
-      "r": 255,
-      "g": 255,
-      "b": 255,
-      "a": 255
-    },
-    "_skeletonData": null,
-    "defaultSkin": "",
-    "defaultAnimation": "",
-    "_premultipliedAlpha": true,
-    "_timeScale": 1,
-    "_preCacheMode": -1,
-    "_cacheMode": 0,
-    "_defaultCacheMode": 0,
-    "_sockets": [],
-    "_useTint": false,
-    "_debugMesh": false,
-    "_debugBones": false,
-    "_debugSlots": false,
-    "_enableBatch": false,
-    "loop": true,
-    "_id": ""
-  },
-  {
-    "__type__": "cc.CompPrefabInfo",
-    "fileId": "0f1OnVOdxOHpmwVY/VyzDJ"
-  },
-  {
-    "__type__": "cc.PrefabInfo",
-    "root": {
-      "__id__": 1
-    },
-    "asset": {
-      "__id__": 0
-    },
-    "fileId": "76QA5Y2AxFN7Jjq4/IKsPA",
-    "instance": null,
-    "targetOverrides": null,
-    "nestedPrefabInstanceRoots": null
+    }
   },
   {
     "__type__": "cc.UITransform",
@@ -527,7 +505,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 22
+      "__id__": 24
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -568,7 +546,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 25
+      "__id__": 27
     },
     "_contentSize": {
       "__type__": "cc.Size",
@@ -596,7 +574,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 27
+      "__id__": 29
     },
     "_customMaterial": null,
     "_srcBlendFactor": 2,
@@ -641,7 +619,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 29
+      "__id__": 31
     },
     "noPet": {
       "__id__": 2
@@ -649,8 +627,9 @@
     "havePet": {
       "__id__": 14
     },
+    "petIcon": null,
     "drag": {
-      "__id__": 30
+      "__id__": 32
     },
     "_id": ""
   },
@@ -668,7 +647,7 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 31
+      "__id__": 33
     },
     "_id": ""
   },
@@ -686,11 +665,11 @@
     },
     "_enabled": true,
     "__prefab": {
-      "__id__": 33
+      "__id__": 35
     },
     "clickEvents": [
       {
-        "__id__": 34
+        "__id__": 36
       }
     ],
     "_interactable": true,
@@ -756,6 +735,37 @@
     },
     "fileId": "f15AW5eMVEKKgrwPWb2eZo",
     "instance": null,
-    "targetOverrides": null
+    "targetOverrides": [
+      {
+        "__id__": 38
+      }
+    ],
+    "nestedPrefabInstanceRoots": [
+      {
+        "__id__": 15
+      }
+    ]
+  },
+  {
+    "__type__": "cc.TargetOverrideInfo",
+    "source": {
+      "__id__": 30
+    },
+    "sourceInfo": null,
+    "propertyPath": [
+      "petIcon"
+    ],
+    "target": {
+      "__id__": 15
+    },
+    "targetInfo": {
+      "__id__": 39
+    }
+  },
+  {
+    "__type__": "cc.TargetInfo",
+    "localID": [
+      "a8v6Wyt6FBsbms2ouS3gEa"
+    ]
   }
 ]
\ No newline at end of file
diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts
index d77b1e14..5f7ad4ac 100644
--- a/JisolGameCocos/assets/script/App.ts
+++ b/JisolGameCocos/assets/script/App.ts
@@ -26,12 +26,12 @@ import { JAPI, JAPIConfig } from "../../extensions/ngame/assets/ngame/util/JAPI"
 import { AppData } from "./AppData";
 import AppAction from "./AppAction";
 
-let APIPath = `http://localhost:8080`
-let WsPath = `ws://localhost:8080/websocket`
+// let APIPath = `http://localhost:8080`
+// let WsPath = `ws://localhost:8080/websocket`
 // let APIPath = `http://192.168.1.23:8080`
 // let WsPath = `ws://192.168.1.23:8080/websocket`
-// let APIPath = `http://192.168.0.170:8080`
-// let WsPath = `ws://192.168.0.170:8080/websocket`
+let APIPath = `http://192.168.0.113:8080`
+let WsPath = `ws://192.168.0.113:8080/websocket`
 // let APIPath = `https://api.pet.jisol.cn`
 // let WsPath = `wss://api.pet.jisol.cn/websocket`
 
@@ -47,7 +47,7 @@ class JNGSocket extends JNSocket{
         this.on(GAction.TOKEN_EXPIRED,this.onTokenExpired.bind(this));
         await super.onInit();
     }
-    public url():Promise<string> {
+    public async url():Promise<string> {
         return new Promise<string>(resolve => {
             //获取Token
             let token = StorageData.get(StorageEnum.Token);
diff --git a/JisolGameCocos/assets/script/consts/API.ts b/JisolGameCocos/assets/script/consts/API.ts
index c1f1d516..acb02b97 100644
--- a/JisolGameCocos/assets/script/consts/API.ts
+++ b/JisolGameCocos/assets/script/consts/API.ts
@@ -86,6 +86,7 @@ export interface ResourceOV{
     playerId:number;                  //玩家Id
     resourceTbId:number;              //资源配置表Id
     resourceValue:number;             //资源数量
+    version:number;                     //版本号
 }
 
 export const API = {
diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts
index 6e50cfc4..7a48a85d 100644
--- a/JisolGameCocos/assets/script/data/ResourceData.ts
+++ b/JisolGameCocos/assets/script/data/ResourceData.ts
@@ -24,6 +24,9 @@ export default class ResourceData extends BaseData{
     //资源数据 {资源Id:资源数量}
     data:{[key:number]:number} = {};
 
+    //资源更新的版本号
+    versions:{[key:number]:number} = {};
+
     //初始化
     async onInit() {
         await this.onUpdateResource();
@@ -47,6 +50,16 @@ export default class ResourceData extends BaseData{
         return this.data[type] || 0;
     }
 
+    //更新资源
+    onResource(resource:ResourceOV){
+        let version = this.versions[resource.resourceTbId] || 0;
+        if(resource.version >= version){
+            version = this.versions[resource.resourceTbId] = resource.version;
+            this.data[resource.resourceTbId] = resource.resourceValue;
+            app.event.emit(ResourceEvent.UPDATE,this.data[resource.resourceTbId])
+        }
+    }
+
     //刷新返回资源
     onUpdateOV(operation:number,resource:ResourceOV){
 
@@ -54,9 +67,7 @@ export default class ResourceData extends BaseData{
         if(!resource) return;
 
         if(operation == ResourceUpdateType.UPDATE){
-            //更新资源
-            this.data[resource.resourceTbId] = resource.resourceValue;
-            app.event.emit(ResourceEvent.UPDATE)
+            this.onResource(resource);
         }
 
     }
diff --git a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts
index 9ffddc03..95aace39 100644
--- a/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts
+++ b/JisolGameCocos/assets/script/ui/Consts/Tactical/PlayerTacticalItem.ts
@@ -9,6 +9,7 @@ import { Vec3 } from 'cc';
 import { NodeEventType } from 'cc';
 import { EventTouch } from 'cc';
 import JNodeDrag from '../../../../../extensions/ngame/assets/ngame/util/components/JNodeDrag';
+import { PetIcon } from '../Pet/PetIcon';
 const { ccclass, property } = _decorator;
 
 @ccclass('PlayerTacticalItem')
@@ -25,6 +26,10 @@ export class PlayerTacticalItem extends Component {
     @property(Node)
     havePet:Node;
 
+    //宠物节点
+    @property(PetIcon)
+    petIcon:PetIcon;
+
     //拖拽
     @property(JNodeDrag)
     drag:JNodeDrag;
@@ -66,12 +71,10 @@ export class PlayerTacticalItem extends Component {
     //更新宠物信息
     onUpdatePetView(){
 
-        let spine = this.havePet.getComponentInChildren(sp.Skeleton);
         //获取宠物信息
         let info = PlayerPetData.getIns().petIdQueryPetInfo(this.petId);
-        spine.skeletonData = app.battleRes.roleSpine[info.petTbId];
-        spine.setAnimation(0,UIPetAnim.std,true);
-
+        this.petIcon.set(info);
+        
     }
     
     //打开选择阵法宠物
diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame
index b1ff668c..306bd4b5 160000
--- a/JisolGameCocos/extensions/ngame
+++ b/JisolGameCocos/extensions/ngame
@@ -1 +1 @@
-Subproject commit b1ff668cfa5f73ab924bf16904c77cac17817961
+Subproject commit 306bd4b593b9164f095ea6abaf291294cc23359f
diff --git a/JisolGameCocos/settings/v2/packages/engine.json b/JisolGameCocos/settings/v2/packages/engine.json
index e020168a..5eecf89d 100644
--- a/JisolGameCocos/settings/v2/packages/engine.json
+++ b/JisolGameCocos/settings/v2/packages/engine.json
@@ -95,7 +95,7 @@
         "_value": true
       },
       "websocket": {
-        "_value": false
+        "_value": true
       },
       "websocket-server": {
         "_value": false
@@ -118,10 +118,10 @@
       "marionette": {
         "_value": false
       },
-      "custom-pipeline": {
+      "procedural-animation": {
         "_value": false
       },
-      "procedural-animation": {
+      "custom-pipeline": {
         "_value": false
       }
     },
@@ -142,6 +142,7 @@
       "tween",
       "ui",
       "video",
+      "websocket",
       "webview"
     ],
     "noDeprecatedFeatures": {
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
index 64780203..b0e0fb7c 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
@@ -146,6 +146,13 @@ public class GPlayerPetController {
 
         TbGRoleUpLevel resource = TD.DATA.getTbGRoleUpLevel().get(pet.getPetLevel() + 1);
 
+        if(Objects.isNull(resource)) return NewsResource.onFail("无法升级");
+
+        //星级不够则 无法升级
+        if(pet.getPetStar() * 10 <= pet.getPetLevel()){
+            return NewsResource.onFail("突破星级 可升级");
+        }
+
         //扣除玩家材料
         for (int i = 0; i < resource.materials.length; i++) {
             TResource res = resource.materials[i];
diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java
index d4958ad1..371ccd08 100644
--- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java
+++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java
@@ -47,7 +47,7 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
                     Wrappers.lambdaUpdate(Resource.class)
                             .eq(Resource::getPlayerId, playerId) //玩家
                             .eq(Resource::getResourceTbId, type) //资源
-                            .setSql("resource_value = resource_value + "+value)
+                            .setSql("version = version + 1,resource_value = resource_value + "+value)
             )){
                 //添加资源
                 res.setResourceValue(res.getResourceValue() + value);