diff --git a/JisolGameCocos/assets/Main.scene b/JisolGameCocos/assets/Main.scene index 3da48e3d..b6b83aa8 100644 --- a/JisolGameCocos/assets/Main.scene +++ b/JisolGameCocos/assets/Main.scene @@ -3,6 +3,7 @@ "__type__": "cc.SceneAsset", "_name": "Main", "_objFlags": 0, + "__editorExtras__": {}, "_native": "", "scene": { "__id__": 1 @@ -147,9 +148,15 @@ "octree": { "__id__": 10 }, - "lightProbeInfo": { + "skin": { "__id__": 11 }, + "lightProbeInfo": { + "__id__": 12 + }, + "postSettings": { + "__id__": 13 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, @@ -277,6 +284,12 @@ }, "_depth": 8 }, + { + "__type__": "cc.SkinInfo", + "_enabled": true, + "_blurRadius": 0.01, + "_sssIntensity": 3 + }, { "__type__": "cc.LightProbeInfo", "_giScale": 1, @@ -286,6 +299,11 @@ "_showProbe": true, "_showWireframe": true, "_showConvex": false, - "_data": null + "_data": null, + "_lightProbeSphereVolume": 1 + }, + { + "__type__": "cc.PostSettingsInfo", + "_toneMappingType": 0 } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/battle.meta b/JisolGameCocos/assets/battle.meta index 1063e7a4..5fffdc5e 100644 --- a/JisolGameCocos/assets/battle.meta +++ b/JisolGameCocos/assets/battle.meta @@ -2,11 +2,10 @@ "ver": "1.2.0", "importer": "directory", "imported": true, - "uuid": "6c6fced9-32fe-4d89-83a4-f71cc0648f7a", + "uuid": "9db2a905-9153-4912-9a0d-92f388b9c476", "files": [], "subMetas": {}, "userData": { - "compressionType": {}, - "isRemoteBundle": {} + "isBundle": true } } diff --git a/JisolGameCocos/assets/role/bullets.meta b/JisolGameCocos/assets/battle/bullets.meta similarity index 100% rename from JisolGameCocos/assets/role/bullets.meta rename to JisolGameCocos/assets/battle/bullets.meta diff --git a/JisolGameCocos/assets/role/bullets/疯狂松鼠.meta b/JisolGameCocos/assets/battle/bullets/疯狂松鼠.meta similarity index 100% rename from JisolGameCocos/assets/role/bullets/疯狂松鼠.meta rename to JisolGameCocos/assets/battle/bullets/疯狂松鼠.meta diff --git a/JisolGameCocos/assets/role/bullets/疯狂松鼠/attack.png b/JisolGameCocos/assets/battle/bullets/疯狂松鼠/attack.png similarity index 100% rename from JisolGameCocos/assets/role/bullets/疯狂松鼠/attack.png rename to JisolGameCocos/assets/battle/bullets/疯狂松鼠/attack.png diff --git a/JisolGameCocos/assets/role/bullets/疯狂松鼠/attack.png.meta b/JisolGameCocos/assets/battle/bullets/疯狂松鼠/attack.png.meta similarity index 100% rename from JisolGameCocos/assets/role/bullets/疯狂松鼠/attack.png.meta rename to JisolGameCocos/assets/battle/bullets/疯狂松鼠/attack.png.meta diff --git a/JisolGameCocos/assets/role/effect.meta b/JisolGameCocos/assets/battle/effect.meta similarity index 100% rename from JisolGameCocos/assets/role/effect.meta rename to JisolGameCocos/assets/battle/effect.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果.meta b/JisolGameCocos/assets/battle/effect/子弹效果.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果.meta rename to JisolGameCocos/assets/battle/effect/子弹效果.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/000.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/000.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/000.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/000.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/000.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/000.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/000.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/000.png.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/001.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/001.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/001.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/001.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/001.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/001.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/001.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/001.png.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/002.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/002.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/002.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/002.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/002.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/002.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/002.png.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/003.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/003.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/003.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/003.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/003.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/003.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/003.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/003.png.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/004.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/004.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/004.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/004.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/004.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/004.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/004.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/004.png.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/buff_fire.spine b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/buff_fire.spine similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/buff_fire.spine rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/buff_fire.spine diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/buff_fire.spine.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/buff_fire.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/buff_fire.spine.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/buff_fire.spine.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.atlas.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.json b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.json similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.json rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.json diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.json.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.json.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.json.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.json.meta diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.png b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.png similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.png rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.png diff --git a/JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.png.meta b/JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/子弹效果/base_fly_fire/spine/buff_fire.png.meta rename to JisolGameCocos/assets/battle/effect/子弹效果/base_fly_fire/spine/buff_fire.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果.meta b/JisolGameCocos/assets/battle/effect/爆炸效果.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0001.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0001.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0001.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0001.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0001.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0001.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0001.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0001.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0002.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0002.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0002.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0002.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0002.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0002.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0002.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0003.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0003.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0003.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0003.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0003.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0003.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0003.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0003.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0004.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0004.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0004.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0004.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0004.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0004.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0004.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0004.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0005.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0005.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0005.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0005.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0005.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0005.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0005.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0005.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0006.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0006.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0006.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0006.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0006.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0006.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/baozha0006.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/baozha0006.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangdian.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangdian.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangdian.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangdian.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangdian.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangdian.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangdian.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangdian.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangqiu.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangqiu.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangqiu.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangqiu.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangqiu.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangqiu.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/guangqiu.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/guangqiu.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/shouji_01.spine b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/shouji_01.spine similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/shouji_01.spine rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/shouji_01.spine diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/shouji_01.spine.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/shouji_01.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/shouji_01.spine.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/shouji_01.spine.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.atlas b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.atlas similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.atlas rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.atlas diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.atlas.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.atlas.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.atlas.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.json b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.json similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.json rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.json diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.json.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.json.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.json.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.json.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.png b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/shouji_01/spine/shouji_01.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/shouji_01/spine/shouji_01.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/4845-baozha2.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0058.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0060.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0062.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0064.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_hybz_0068.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00000.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00002.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00004.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/TX_xsx_00006.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/baoguang.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/gq2.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian02.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian03.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian04.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian05.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian06.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian07.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_baodian08.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_guangdiand1.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/ef/tx_quan4.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.atlas.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.json.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/spine/zhouyu_skill2_2.png.meta diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine diff --git a/JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine.meta b/JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine.meta rename to JisolGameCocos/assets/battle/effect/爆炸效果/zhouyu_skill2_2/zhouyu_skill2_2.spine.meta diff --git a/JisolGameCocos/assets/battle/map/MAP2.meta b/JisolGameCocos/assets/battle/map/MAP2.meta new file mode 100644 index 00000000..d4b8ec11 --- /dev/null +++ b/JisolGameCocos/assets/battle/map/MAP2.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "70dad29f-ded9-4cdf-9726-f99418bf8d42", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/battle/map/MAP2_1.png b/JisolGameCocos/assets/battle/map/MAP2/MAP2_1.png similarity index 100% rename from JisolGameCocos/assets/battle/map/MAP2_1.png rename to JisolGameCocos/assets/battle/map/MAP2/MAP2_1.png diff --git a/JisolGameCocos/assets/battle/map/MAP2_1.png.meta b/JisolGameCocos/assets/battle/map/MAP2/MAP2_1.png.meta similarity index 100% rename from JisolGameCocos/assets/battle/map/MAP2_1.png.meta rename to JisolGameCocos/assets/battle/map/MAP2/MAP2_1.png.meta diff --git a/JisolGameCocos/assets/battle/map/MAP2_2.png b/JisolGameCocos/assets/battle/map/MAP2/MAP2_2.png similarity index 100% rename from JisolGameCocos/assets/battle/map/MAP2_2.png rename to JisolGameCocos/assets/battle/map/MAP2/MAP2_2.png diff --git a/JisolGameCocos/assets/battle/map/MAP2_2.png.meta b/JisolGameCocos/assets/battle/map/MAP2/MAP2_2.png.meta similarity index 100% rename from JisolGameCocos/assets/battle/map/MAP2_2.png.meta rename to JisolGameCocos/assets/battle/map/MAP2/MAP2_2.png.meta diff --git a/JisolGameCocos/assets/battle/map/MAP6.meta b/JisolGameCocos/assets/battle/map/MAP6.meta new file mode 100644 index 00000000..6c9ccdd7 --- /dev/null +++ b/JisolGameCocos/assets/battle/map/MAP6.meta @@ -0,0 +1,9 @@ +{ + "ver": "1.2.0", + "importer": "directory", + "imported": true, + "uuid": "e931fdad-7bd8-4ab3-8409-158f84f59fe0", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png b/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png new file mode 100644 index 00000000..e8b44af5 Binary files /dev/null and b/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png differ diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png.meta b/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png.meta new file mode 100644 index 00000000..72ce5dc1 --- /dev/null +++ b/JisolGameCocos/assets/battle/map/MAP6/MAP6_1.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "a73cc36b-81f8-4a83-ae05-c7c976183907", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "a73cc36b-81f8-4a83-ae05-c7c976183907@6c48a", + "displayName": "MAP6_1", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "a73cc36b-81f8-4a83-ae05-c7c976183907", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "a73cc36b-81f8-4a83-ae05-c7c976183907@f9941", + "displayName": "MAP6_1", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": -3, + "trimX": 0, + "trimY": 6, + "width": 1200, + "height": 442, + "rawWidth": 1200, + "rawHeight": 448, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -600, + -221, + 0, + 600, + -221, + 0, + -600, + 221, + 0, + 600, + 221, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 442, + 1200, + 442, + 0, + 0, + 1200, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 0.9866071428571429, + 1, + 0.9866071428571429 + ], + "minPos": [ + -600, + -221, + 0 + ], + "maxPos": [ + 600, + 221, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "a73cc36b-81f8-4a83-ae05-c7c976183907@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "type": "sprite-frame", + "redirect": "a73cc36b-81f8-4a83-ae05-c7c976183907@f9941" + } +} diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png b/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png new file mode 100644 index 00000000..018e87f1 Binary files /dev/null and b/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png differ diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png.meta b/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png.meta new file mode 100644 index 00000000..3261b0ca --- /dev/null +++ b/JisolGameCocos/assets/battle/map/MAP6/MAP6_2.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "dc059148-a12d-4947-a708-ae642f146745", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "dc059148-a12d-4947-a708-ae642f146745@6c48a", + "displayName": "MAP6_2", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "dc059148-a12d-4947-a708-ae642f146745", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "dc059148-a12d-4947-a708-ae642f146745@f9941", + "displayName": "MAP6_2", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 8, + "trimX": 0, + "trimY": 5, + "width": 1200, + "height": 419, + "rawWidth": 1200, + "rawHeight": 445, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -600, + -209.5, + 0, + 600, + -209.5, + 0, + -600, + 209.5, + 0, + 600, + 209.5, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 440, + 1200, + 440, + 0, + 21, + 1200, + 21 + ], + "nuv": [ + 0, + 0.04719101123595506, + 1, + 0.04719101123595506, + 0, + 0.9887640449438202, + 1, + 0.9887640449438202 + ], + "minPos": [ + -600, + -209.5, + 0 + ], + "maxPos": [ + 600, + 209.5, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "dc059148-a12d-4947-a708-ae642f146745@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": true, + "type": "sprite-frame", + "redirect": "dc059148-a12d-4947-a708-ae642f146745@f9941" + } +} diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png b/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png new file mode 100644 index 00000000..2082bb88 Binary files /dev/null and b/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png differ diff --git a/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png.meta b/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png.meta new file mode 100644 index 00000000..71b0fe2c --- /dev/null +++ b/JisolGameCocos/assets/battle/map/MAP6/MAP6_3.png.meta @@ -0,0 +1,134 @@ +{ + "ver": "1.0.26", + "importer": "image", + "imported": true, + "uuid": "24869eec-947e-498b-93cb-9ac58ecb5876", + "files": [ + ".json", + ".png" + ], + "subMetas": { + "6c48a": { + "importer": "texture", + "uuid": "24869eec-947e-498b-93cb-9ac58ecb5876@6c48a", + "displayName": "MAP6_3", + "id": "6c48a", + "name": "texture", + "userData": { + "wrapModeS": "repeat", + "wrapModeT": "repeat", + "minfilter": "linear", + "magfilter": "linear", + "mipfilter": "none", + "anisotropy": 0, + "isUuid": true, + "imageUuidOrDatabaseUri": "24869eec-947e-498b-93cb-9ac58ecb5876", + "visible": false + }, + "ver": "1.0.22", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "f9941": { + "importer": "sprite-frame", + "uuid": "24869eec-947e-498b-93cb-9ac58ecb5876@f9941", + "displayName": "MAP6_3", + "id": "f9941", + "name": "spriteFrame", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 24, + "height": 24, + "rawWidth": 24, + "rawHeight": 24, + "borderTop": 11, + "borderBottom": 11, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [ + -12, + -12, + 0, + 12, + -12, + 0, + -12, + 12, + 0, + 12, + 12, + 0 + ], + "indexes": [ + 0, + 1, + 2, + 2, + 1, + 3 + ], + "uv": [ + 0, + 24, + 24, + 24, + 0, + 0, + 24, + 0 + ], + "nuv": [ + 0, + 0, + 1, + 0, + 0, + 1, + 1, + 1 + ], + "minPos": [ + -12, + -12, + 0 + ], + "maxPos": [ + 12, + 12, + 0 + ] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "24869eec-947e-498b-93cb-9ac58ecb5876@6c48a", + "atlasUuid": "" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "fixAlphaTransparencyArtifacts": false, + "hasAlpha": false, + "type": "sprite-frame", + "redirect": "24869eec-947e-498b-93cb-9ac58ecb5876@f9941" + } +} diff --git a/JisolGameCocos/assets/role/spine.meta b/JisolGameCocos/assets/battle/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine.meta rename to JisolGameCocos/assets/battle/spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1a.spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/guaiA1aTexture.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_head.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legL.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/pic/guaiA1a/guaiA1a_legR.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.json.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/坚强小石/guaiA1a_1/spine/guaiA1a.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1a.spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/guaiA1aTexture.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/beimian.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao1.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao2.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao3.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/jiao4.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/shenti.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/yan.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/pic/guaiA1a/ye.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.json.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/小石头/guaiA1a/spine/guaiA1a.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4e.spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/guaiA4eTexture.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 002.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 003.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 004.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 005.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 006.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 007.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 008.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 009.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 010.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 011.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 012.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 013.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 014.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 015.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 016.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/pic/guaiA4e/timo5 017.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.json.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4e_2/spine/guaiA4e.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4es.spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/guaiA4esTexture.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/01.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/02.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/03.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/04.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/05.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/06.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/07.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/08.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 002.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 003.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 004.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 005.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 006.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 007.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 008.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 009.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 010.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 011.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 012.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 013.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 014.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 015.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 016.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/pic/guaiA4es/timo5 017.png.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.json.meta diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png diff --git a/JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png.meta b/JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png.meta rename to JisolGameCocos/assets/battle/spine/召唤与合成819个Spine/疯狂松鼠/guaiA4es_2/spine/guaiA4es.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/001妙蛙种子.spine.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/shenti_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/tou_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi1_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi2_bz_g.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_bianzi3_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_shou_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/y_yanjing_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi1_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi2_bz_g.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_bianzi3_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_jiao_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_shou_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/z_yanjing_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zhongzi_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/BZ/zuiba_bz.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00008.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00010.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00012.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/Energy 007 Impact Radial_00015.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0010.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0012.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0014.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0016.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_shua_0018.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0024.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/TX_S1_yan_0029.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0025.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0027.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0028.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0030.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/atk_guangci3_0031.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/b_lg_2.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/cao.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu1.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu3.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu4.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/chentu5.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/daoguang_red.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/guangyun.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a2.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a3.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a4.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_a5.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/hua_b.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/huiji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liugguang2.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/liuguang3.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuangcdr_00010002.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuye.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/shuyefaguang.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_mi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/suduxian_su.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/xuanzhuan.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/TX/z_bianzi2_bz_liuguang.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/hei.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/hei.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/hei.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/hei.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/hei.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/hei.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/hei.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/hei.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/shenti.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/shenti.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/shenti.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/shenti.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/shenti.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/shenti.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/shenti.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/shenti.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/tou.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/tou.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/tou.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/tou.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/tou.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/tou.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/tou.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/tou.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-meimao_shouji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y-yanjing_shouji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_houtui.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_gongji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_pingshi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_meimao_shengli.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_qiantui.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yan_shengli.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_gongji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/y_yanjing_pingshi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/yinying.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/yinying.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/yinying.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/yinying.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/yinying.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/yinying.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/yinying.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/yinying.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shengli.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-meimao_shouji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z-yanjing_shouji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_houtui.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_gongji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_meimao_pingshi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_qiantui.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yan_shengli.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_gongji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/z_yanjing_pingshi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zhonzi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_gongji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_pingshi.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/images/zui_shouji.png.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.atlas.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.json.meta diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png diff --git a/JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png.meta b/JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png.meta similarity index 100% rename from JisolGameCocos/assets/role/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png.meta rename to JisolGameCocos/assets/battle/spine/神奇宝贝/001妙蛙种子/spine/001妙蛙种子.png.meta diff --git a/JisolGameCocos/assets/resources/WorldCanvas.prefab b/JisolGameCocos/assets/resources/WorldCanvas.prefab index aeb8dafb..47706ef4 100644 --- a/JisolGameCocos/assets/resources/WorldCanvas.prefab +++ b/JisolGameCocos/assets/resources/WorldCanvas.prefab @@ -340,10 +340,16 @@ "camera": { "__id__": 3 }, - "prefab": { - "__uuid__": "3520eceb-6d73-4cdc-b333-c80f737fee27", - "__expectedType__": "cc.Prefab" - }, + "prefabs": [ + { + "__uuid__": "b882ecdb-012a-4d85-b799-e4da5991c0dd", + "__expectedType__": "cc.Prefab" + }, + { + "__uuid__": "3520eceb-6d73-4cdc-b333-c80f737fee27", + "__expectedType__": "cc.Prefab" + } + ], "_id": "" }, { diff --git a/JisolGameCocos/assets/resources/config/game/GMap.json b/JisolGameCocos/assets/resources/config/game/GMap.json new file mode 100644 index 00000000..a0ca9626 --- /dev/null +++ b/JisolGameCocos/assets/resources/config/game/GMap.json @@ -0,0 +1 @@ +{"60001":{"id":60001,"mapName":"天空城","map1":"map/MAP6/MAP6_1/spriteFrame","map2":"map/MAP6/MAP6_2/spriteFrame","map3":"map/MAP6/MAP6_3/spriteFrame","map1OffsetY":100,"map2OffsetY":400,"map3OffsetY":400}} \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/game/GMap.json.meta b/JisolGameCocos/assets/resources/config/game/GMap.json.meta new file mode 100644 index 00000000..a6f5ae5f --- /dev/null +++ b/JisolGameCocos/assets/resources/config/game/GMap.json.meta @@ -0,0 +1,11 @@ +{ + "ver": "2.0.1", + "importer": "json", + "imported": true, + "uuid": "d0ea1d51-329d-4f0e-83cf-33182eaa13f0", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/config/ts/TableGMap.ts b/JisolGameCocos/assets/resources/config/ts/TableGMap.ts new file mode 100644 index 00000000..2bc2d2c5 --- /dev/null +++ b/JisolGameCocos/assets/resources/config/ts/TableGMap.ts @@ -0,0 +1,55 @@ +import { JsonUtil } from "../../../../extensions/ngame/assets/ngame/util/JsonUtil"; + +export class TableGMap { + static TableName: string = "GMap"; + + static getAllConfig(): { [id: string]: TableGMap } { + return JsonUtil.get(TableGMap.TableName); + } + + static getConfig(id: number | string) { + return TableGMap.getAllConfig()[id] as TableGMap; + } + + private data: any; + + init(id: number) { + var table = JsonUtil.get(TableGMap.TableName); + this.data = table[id]; + this._id = id; + } + /** id */ private _id: number = 0; + + /** id */ + get id(): number { + return this.data.id; + } + /** 地图名称 */ + get mapName(): string { + return this.data.mapName; + } + /** 地图1(前) */ + get map1(): string { + return this.data.map1; + } + /** 地图2(后) */ + get map2(): string { + return this.data.map2; + } + /** 地图3(天空) */ + get map3(): string { + return this.data.map3; + } + /** 地图1(前) 偏移量Y */ + get map1OffsetY(): number { + return this.data.map1OffsetY; + } + /** 地图2(后) 偏移量Y */ + get map2OffsetY(): number { + return this.data.map2OffsetY; + } + /** 地图2(后) 偏移量Y */ + get map3OffsetY(): number { + return this.data.map3OffsetY; + } +} \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/ts/TableGMap.ts.meta b/JisolGameCocos/assets/resources/config/ts/TableGMap.ts.meta new file mode 100644 index 00000000..2642a69a --- /dev/null +++ b/JisolGameCocos/assets/resources/config/ts/TableGMap.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "57cb0026-1494-41ca-948c-346b43746aa7", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab b/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab index 9131e63e..52d35779 100644 --- a/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab +++ b/JisolGameCocos/assets/resources/prefab/battle/mode/GOnHookMode.prefab @@ -17,18 +17,81 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": null, - "_children": [], - "_active": true, - "_components": [ + "_children": [ { "__id__": 2 }, { - "__id__": 4 + "__id__": 8 + }, + { + "__id__": 14 + }, + { + "__id__": 20 + } + ], + "_active": true, + "_components": [ + { + "__id__": 24 + }, + { + "__id__": 26 } ], "_prefab": { - "__id__": 6 + "__id__": 28 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "map3", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 3 + }, + { + "__id__": 5 + } + ], + "_prefab": { + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", @@ -59,6 +122,371 @@ }, "_id": "" }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1bc4yeTedDaotqIZIiO62p" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "20DqQdn2RLYYhgTzqQbvqY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "39bav/cE1PmLEj5YR2N1ZZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "map2", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 9 + }, + { + "__id__": 11 + } + ], + "_prefab": { + "__id__": 13 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 10 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2frjnRjdpF2YGx5+xg+qHO" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 8 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cBroenCBJ/opob0jtjJuN" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8999+3ds9PDLLFh+SeJoMh", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "map1", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 15 + }, + { + "__id__": 17 + } + ], + "_prefab": { + "__id__": 19 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "73Zql/5spAq5MK9cva+AXA" + }, + { + "__type__": "0dd9fmWmbBAra4y0n8wnsva", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 14 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ck9vXBiFC8Jmwj/4+fJeh" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "26UVXGn2pD27pZYKj87yDp", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "objects", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + } + ], + "_prefab": { + "__id__": 23 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ab/o6YLntOsqtrgbUYd8/8" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "26pTDLadlMBa4Emx8+EIwd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -69,7 +497,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 25 }, "_contentSize": { "__type__": "cc.Size", @@ -97,12 +525,24 @@ }, "_enabled": true, "__prefab": { - "__id__": 5 + "__id__": 27 }, "rolePrefab": { "__uuid__": "e989c288-5957-41c1-953c-190622651f52", "__expectedType__": "cc.Prefab" }, + "map1": { + "__id__": 17 + }, + "map2": { + "__id__": 11 + }, + "map3": { + "__id__": 5 + }, + "objects": { + "__id__": 20 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/resources/prefab/ui/Home/HomeView.prefab b/JisolGameCocos/assets/resources/prefab/ui/Home/HomeView.prefab index 52af3e57..db526c2a 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/Home/HomeView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/Home/HomeView.prefab @@ -22,35 +22,44 @@ "__id__": 2 }, { - "__id__": 8 + "__id__": 10 }, { - "__id__": 18 + "__id__": 16 }, { - "__id__": 39 + "__id__": 26 }, { - "__id__": 60 + "__id__": 47 }, { - "__id__": 75 + "__id__": 68 + }, + { + "__id__": 83 + }, + { + "__id__": 98 + }, + { + "__id__": 113 } ], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 128 }, { - "__id__": 92 + "__id__": 130 }, { - "__id__": 94 + "__id__": 132 } ], "_prefab": { - "__id__": 96 + "__id__": 134 }, "_lpos": { "__type__": "cc.Vec3", @@ -83,7 +92,7 @@ }, { "__type__": "cc.Node", - "_name": "WorldCamera", + "_name": "bg", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -97,10 +106,13 @@ }, { "__id__": 5 + }, + { + "__id__": 7 } ], "_prefab": { - "__id__": 7 + "__id__": 9 }, "_lpos": { "__type__": "cc.Vec3", @@ -143,6 +155,178 @@ "__prefab": { "__id__": 4 }, + "_contentSize": { + "__type__": "cc.Size", + "width": 720, + "height": 1280 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ftYzn1eBL/KI9lfvctDGE" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 6 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 114, + "g": 182, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "72OG0M5ThEtaIaziixD4R1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 720, + "_originalHeight": 720, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ejneRsd9FXLr6cGBBG0Rk" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "85bQbPz7FPkaRPL/kSAwAE", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "WorldCamera", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 11 + }, + { + "__id__": 13 + } + ], + "_prefab": { + "__id__": 15 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 12 + }, "_contentSize": { "__type__": "cc.Size", "width": 720, @@ -165,11 +349,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 2 + "__id__": 10 }, "_enabled": true, "__prefab": { - "__id__": 6 + "__id__": 14 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -229,20 +413,20 @@ "_active": true, "_components": [ { - "__id__": 9 + "__id__": 17 }, { - "__id__": 11 + "__id__": 19 }, { - "__id__": 13 + "__id__": 21 }, { - "__id__": 15 + "__id__": 23 } ], "_prefab": { - "__id__": 17 + "__id__": 25 }, "_lpos": { "__type__": "cc.Vec3", @@ -279,11 +463,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 10 + "__id__": 18 }, "_contentSize": { "__type__": "cc.Size", @@ -307,11 +491,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 12 + "__id__": 20 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -352,11 +536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 14 + "__id__": 22 }, "_color": { "__type__": "cc.Color", @@ -378,11 +562,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 8 + "__id__": 16 }, "_enabled": true, "__prefab": { - "__id__": 16 + "__id__": 24 }, "_alignFlags": 33, "_target": null, @@ -431,26 +615,26 @@ }, "_children": [ { - "__id__": 19 + "__id__": 27 }, { - "__id__": 25 + "__id__": 33 } ], "_active": true, "_components": [ { - "__id__": 31 + "__id__": 39 }, { - "__id__": 33 + "__id__": 41 }, { - "__id__": 35 + "__id__": 43 } ], "_prefab": { - "__id__": 38 + "__id__": 46 }, "_lpos": { "__type__": "cc.Vec3", @@ -487,20 +671,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 26 }, "_children": [], "_active": false, "_components": [ { - "__id__": 20 + "__id__": 28 }, { - "__id__": 22 + "__id__": 30 } ], "_prefab": { - "__id__": 24 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -537,11 +721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 21 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -565,11 +749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 19 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -623,20 +807,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 18 + "__id__": 26 }, "_children": [], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 34 }, { - "__id__": 28 + "__id__": 36 } ], "_prefab": { - "__id__": 30 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -673,11 +857,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -701,11 +885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -759,11 +943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 40 }, "_contentSize": { "__type__": "cc.Size", @@ -787,11 +971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 42 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -832,11 +1016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 18 + "__id__": 26 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 44 }, "clickEvents": [], "_interactable": true, @@ -879,16 +1063,16 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 18 + "__id__": 26 }, "checkEvents": [ { - "__id__": 37 + "__id__": 45 } ], "_isChecked": false, "_checkMark": { - "__id__": 22 + "__id__": 30 }, "_id": "" }, @@ -929,26 +1113,26 @@ }, "_children": [ { - "__id__": 40 + "__id__": 48 }, { - "__id__": 46 + "__id__": 54 } ], "_active": true, "_components": [ { - "__id__": 52 + "__id__": 60 }, { - "__id__": 54 + "__id__": 62 }, { - "__id__": 56 + "__id__": 64 } ], "_prefab": { - "__id__": 59 + "__id__": 67 }, "_lpos": { "__type__": "cc.Vec3", @@ -985,20 +1169,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 47 }, "_children": [], "_active": false, "_components": [ { - "__id__": 41 + "__id__": 49 }, { - "__id__": 43 + "__id__": 51 } ], "_prefab": { - "__id__": 45 + "__id__": 53 }, "_lpos": { "__type__": "cc.Vec3", @@ -1035,11 +1219,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 50 }, "_contentSize": { "__type__": "cc.Size", @@ -1063,11 +1247,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 48 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 52 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1121,20 +1305,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 39 + "__id__": 47 }, "_children": [], "_active": true, "_components": [ { - "__id__": 47 + "__id__": 55 }, { - "__id__": 49 + "__id__": 57 } ], "_prefab": { - "__id__": 51 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -1171,11 +1355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 48 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1199,11 +1383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 46 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 50 + "__id__": 58 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1257,11 +1441,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1285,11 +1469,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 63 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1330,11 +1514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 39 + "__id__": 47 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 65 }, "clickEvents": [], "_interactable": true, @@ -1377,16 +1561,16 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 39 + "__id__": 47 }, "checkEvents": [ { - "__id__": 58 + "__id__": 66 } ], "_isChecked": false, "_checkMark": { - "__id__": 43 + "__id__": 51 }, "_id": "" }, @@ -1427,23 +1611,23 @@ }, "_children": [ { - "__id__": 61 + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 75 }, { - "__id__": 69 + "__id__": 77 }, { - "__id__": 71 + "__id__": 79 } ], "_prefab": { - "__id__": 74 + "__id__": 82 }, "_lpos": { "__type__": "cc.Vec3", @@ -1480,20 +1664,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 60 + "__id__": 68 }, "_children": [], "_active": true, "_components": [ { - "__id__": 62 + "__id__": 70 }, { - "__id__": 64 + "__id__": 72 } ], "_prefab": { - "__id__": 66 + "__id__": 74 }, "_lpos": { "__type__": "cc.Vec3", @@ -1530,11 +1714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 63 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1558,11 +1742,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 69 }, "_enabled": true, "__prefab": { - "__id__": 65 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1616,11 +1800,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 76 }, "_contentSize": { "__type__": "cc.Size", @@ -1644,11 +1828,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 78 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1689,15 +1873,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 68 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 80 }, "clickEvents": [ { - "__id__": 73 + "__id__": 81 } ], "_interactable": true, @@ -1749,7 +1933,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 60 + "__id__": 68 }, "_id": "" }, @@ -1790,23 +1974,23 @@ }, "_children": [ { - "__id__": 76 + "__id__": 84 } ], "_active": true, "_components": [ { - "__id__": 82 + "__id__": 90 }, { - "__id__": 84 + "__id__": 92 }, { - "__id__": 86 + "__id__": 94 } ], "_prefab": { - "__id__": 89 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -1843,20 +2027,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 75 + "__id__": 83 }, "_children": [], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 85 }, { - "__id__": 79 + "__id__": 87 } ], "_prefab": { - "__id__": 81 + "__id__": 89 }, "_lpos": { "__type__": "cc.Vec3", @@ -1893,11 +2077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 78 + "__id__": 86 }, "_contentSize": { "__type__": "cc.Size", @@ -1921,11 +2105,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 76 + "__id__": 84 }, "_enabled": true, "__prefab": { - "__id__": 80 + "__id__": 88 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1979,11 +2163,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 83 + "__id__": 91 }, "_contentSize": { "__type__": "cc.Size", @@ -2007,11 +2191,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 93 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2052,15 +2236,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 75 + "__id__": 83 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 95 }, "clickEvents": [ { - "__id__": 88 + "__id__": 96 } ], "_interactable": true, @@ -2112,7 +2296,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 75 + "__id__": 83 }, "_id": "" }, @@ -2143,6 +2327,732 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Button-002", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 99 + } + ], + "_active": true, + "_components": [ + { + "__id__": 105 + }, + { + "__id__": 107 + }, + { + "__id__": 109 + } + ], + "_prefab": { + "__id__": 112 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -257.954, + "y": 414.543, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 98 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 100 + }, + { + "__id__": 102 + } + ], + "_prefab": { + "__id__": 104 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 99 + }, + "_enabled": true, + "__prefab": { + "__id__": 101 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "27LlaNzrpGrKETMdfGobkO" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 99 + }, + "_enabled": true, + "__prefab": { + "__id__": 103 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_string": "PVP", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "61XeEHyStNPbG4n2nfIsEQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8c+LvgDIdKFqySAnsN+HjN", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 98 + }, + "_enabled": true, + "__prefab": { + "__id__": 106 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1fF0+uXqhL3rMnNkxpa1Ws" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 98 + }, + "_enabled": true, + "__prefab": { + "__id__": 108 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "686NsPKXRBfZQVxordVnJV" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 98 + }, + "_enabled": true, + "__prefab": { + "__id__": 110 + }, + "clickEvents": [ + { + "__id__": 111 + } + ], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 98 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9f1H91mr5KiJHRBl5szAaV" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "15051raQgZN6J5ICgY2OfSS", + "handler": "onClickGoPVP", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cainqikw9Ga4Etlqv6OA8T", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button-003", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 114 + } + ], + "_active": true, + "_components": [ + { + "__id__": 120 + }, + { + "__id__": 122 + }, + { + "__id__": 124 + } + ], + "_prefab": { + "__id__": 127 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -122.84, + "y": 414.543, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 113 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 115 + }, + { + "__id__": 117 + } + ], + "_prefab": { + "__id__": 119 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 114 + }, + "_enabled": true, + "__prefab": { + "__id__": 116 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e8bceZ9aJN16fFlE6INswu" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 114 + }, + "_enabled": true, + "__prefab": { + "__id__": 118 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_string": "无尽", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 1, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": false, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d6NfZjhZBFrbWWfKzUypg/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fe/vAbeIZDSL5+jLMLpQx1", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 113 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f3tTtTb3tIvLRgSMzRdatV" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 113 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "30hQXcxAVAkJPdIW/yG4Qa" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 113 + }, + "_enabled": true, + "__prefab": { + "__id__": 125 + }, + "clickEvents": [ + { + "__id__": 126 + } + ], + "_interactable": true, + "_transition": 2, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 113 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "61w0jxbglArbNBvEWVT+HQ" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "15051raQgZN6J5ICgY2OfSS", + "handler": "onClickGoOnHook", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "61TBvE1Z9A2ZgeXAooCr2A", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -2153,7 +3063,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 129 }, "_contentSize": { "__type__": "cc.Size", @@ -2181,7 +3091,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 131 }, "_alignFlags": 45, "_target": null, @@ -2217,10 +3127,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 95 + "__id__": 133 }, "frameText": { - "__id__": 11 + "__id__": 19 }, "_id": "" }, diff --git a/JisolGameCocos/assets/role.meta b/JisolGameCocos/assets/role.meta deleted file mode 100644 index 4d96eb9e..00000000 --- a/JisolGameCocos/assets/role.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.2.0", - "importer": "directory", - "imported": true, - "uuid": "9db2a905-9153-4912-9a0d-92f388b9c476", - "files": [], - "subMetas": {}, - "userData": { - "isBundle": true, - "bundleConfigID": "auto_feCy2hNdtIxZdsUHEU82Zv" - } -} diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index 45e2793b..0b9346b1 100644 --- a/JisolGameCocos/assets/script/App.ts +++ b/JisolGameCocos/assets/script/App.ts @@ -24,6 +24,7 @@ import { TableGRoleAttackBullet } from "../resources/config/ts/TableGRoleAttackB import { TableGRoleAttackEffect } from "../resources/config/ts/TableGRoleAttackEffect"; import { TableGRoleSkill } from "../resources/config/ts/TableGRoleSkill"; import { TableGRoleSkillEffect } from "../resources/config/ts/TableGRoleSkillEffect"; +import { TableGMap } from "../resources/config/ts/TableGMap"; let IP = "kyu.jisol.cn"; @@ -113,6 +114,7 @@ export class JNGConfig extends SystemBase{ {name:TableGRoleAttackEffect.TableName}, //角色攻击特效 {name:TableGRoleSkill.TableName}, //角色技能 {name:TableGRoleSkillEffect.TableName}, //角色技能特效 + {name:TableGMap.TableName}, //游戏地图 ].map((table) => { return { name:table.name, @@ -133,9 +135,10 @@ export class JNGConfig extends SystemBase{ //角色初始器 export class JLoaderRole extends JLoaderSystem{ - skData:{[id:number]:sp.SkeletonData} = {}; + skData:{[id:number]:sp.SkeletonData} = {}; //角色Spine bullets:{[id:number]:SpriteFrame} = {}; - effects:{[id:number]:sp.SkeletonData} = {}; + effects:{[id:number]:sp.SkeletonData} = {}; //Spine特效 + maps:{[id:number]:SpriteFrame[]} = {}; //地图 async onInit(): Promise { await super.onInit(); @@ -175,6 +178,21 @@ export class JLoaderRole extends JLoaderSystem{ }) })) } + + //读取地图 + for (const info of Object.values(TableGMap.getAllConfig())) { + + this.maps[info.id] = await (Promise.all(["1","2","3"].map(index => `map${index}`).map(key => { + return new Promise(r => { + if(info[key]){ + this.bundle.load(info[key],SpriteFrame,(err,data) => { + r(data); + }) + } + }) + }))) + + } } @@ -191,5 +209,5 @@ export const app = { }), //请求 battle : GBattleModeManager.getIns(), //战斗 config : new JNGConfig(), - role : new JLoaderRole("role"), //role包 + battleRes : new JLoaderRole("battle"), //battle包 } \ No newline at end of file diff --git a/JisolGameCocos/assets/script/WorldCanvas.ts b/JisolGameCocos/assets/script/WorldCanvas.ts index 18a20d57..9e0a9ff0 100644 --- a/JisolGameCocos/assets/script/WorldCanvas.ts +++ b/JisolGameCocos/assets/script/WorldCanvas.ts @@ -3,6 +3,7 @@ import { JNFrameInfo, JNSyncFrameEvent } from '../../extensions/ngame/assets/nga import { app } from './App'; import { JNSyncAction } from '../../extensions/ngame/assets/ngame/sync/JNSyncAction'; import { Camera } from 'cc'; +import GBaseMode from './battle/GBaseMode'; const { ccclass, property } = _decorator; @ccclass('WorldCanvas') @@ -13,8 +14,10 @@ export class WorldCanvas extends Component { @property(Camera) camera:Camera = null; - @property(Prefab) - prefab:Prefab = null; + @property([Prefab]) + prefabs:Prefab[] = []; + + index:number = 0; async onLoad(){ @@ -40,7 +43,9 @@ export class WorldCanvas extends Component { //创建世界 create(){ - this.root.addChild(instantiate(this.prefab)) + let world = instantiate(this.prefabs[this.index]); + world.getComponent(GBaseMode).camera = this.camera; + this.root.addChild(world) this.scheduleOnce(() => { app.sync.onStart(); }); diff --git a/JisolGameCocos/assets/script/battle/GBaseMode.ts b/JisolGameCocos/assets/script/battle/GBaseMode.ts index 10f9b639..9c05e600 100644 --- a/JisolGameCocos/assets/script/battle/GBaseMode.ts +++ b/JisolGameCocos/assets/script/battle/GBaseMode.ts @@ -4,10 +4,14 @@ import { v3 } from "cc"; import { JNFrameInfo } from "../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame"; import { Node } from "cc"; import { Vec3 } from "cc"; +import { Camera } from "cc"; export default class GBaseMode extends GObject { + //场景相机 + camera:Camera; + get scene():Node{ return this.node; } diff --git a/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts b/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts index 295bcdcb..494b3c3a 100644 --- a/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts +++ b/JisolGameCocos/assets/script/battle/base/attack/GAttack.ts @@ -8,13 +8,14 @@ import GButtleBase from "../bullet/GButtleBase"; import { GFSMAnimBase } from "../fsm/GFSMAnimBase"; import GFSMBase from "../fsm/GFSMBase"; import GRoleDefault from "../role/GRoleDefault"; +import GNode from "../common/GNode"; //攻击子弹类 export class GAttackBullet{ //创建子弹 static create>(GClass:{new():T},data:{}):T{ - let bulletNode = new Node(); + let bulletNode = GNode.create(); bulletNode.addComponent(UITransform); let bullet = bulletNode.addComponent(GClass); bullet.setData(data); diff --git a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts index 1bf03f1c..8490d93f 100644 --- a/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts +++ b/JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts @@ -8,7 +8,7 @@ import { v3 } from "cc"; import { bezier } from "cc"; import { v2 } from "cc"; import { Vec2 } from "cc"; -import GEffectUtil from "../../effect/GEffectUtil"; +import GEffectUtil from "../common/GEffectUtil"; import { TableGRoleAttackEffect } from "../../../../resources/config/ts/TableGRoleAttackEffect"; import GDetection from "../common/GDetection"; import { rect } from "cc"; @@ -25,9 +25,9 @@ export default class GAttackParabolicRemote implements GAttackBase{ let enemy = role.fsm.enemy; if(!enemy) return; - let image:SpriteFrame = app.role.bullets[info.attackArgs[0]]; + let image:SpriteFrame = app.battleRes.bullets[info.attackArgs[0]]; let bang = { - ske: app.role.effects[info.attackArgs[1]], + ske: app.battleRes.effects[info.attackArgs[1]], info: TableGRoleAttackEffect.getConfig(info.attackArgs[1]) }; let bone = role.spine.findBone(info.attackArgs[2]); diff --git a/JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts b/JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts similarity index 74% rename from JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts rename to JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts index d8bf960b..bd1ac717 100644 --- a/JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts +++ b/JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts @@ -1,15 +1,15 @@ import { UITransform } from "cc"; import { Node } from "cc"; import { sp } from "cc"; -import JNSkeleton from "../../../../extensions/ngame/assets/ngame/sync/frame/game/spine/JNFrameSkeleton"; -import { GData } from "../../GData"; +import JNSkeleton from "../../../../../extensions/ngame/assets/ngame/sync/frame/game/spine/JNFrameSkeleton"; +import { GData } from "../../../GData"; +import GNode from "./GNode"; export default class GEffectUtil { //创建一个Spine特效 static create(spine:sp.SkeletonData):JNSkeleton{ - let effectNode = new Node(); - effectNode.layer = GData.layer.World; + let effectNode = GNode.create(); effectNode.addComponent(UITransform); let ske = effectNode.addComponent(JNSkeleton); ske.skeletonData = spine; diff --git a/JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts.meta b/JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts.meta similarity index 70% rename from JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts.meta rename to JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts.meta index fd6643ed..a6b69543 100644 --- a/JisolGameCocos/assets/script/battle/effect/GEffectUtil.ts.meta +++ b/JisolGameCocos/assets/script/battle/base/common/GEffectUtil.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "2935c359-6cdd-4449-adae-57fc390c9e45", + "uuid": "c0673372-37f9-453a-b439-11234bc2d8a7", "files": [], "subMetas": {}, "userData": {} diff --git a/JisolGameCocos/assets/script/battle/base/common/GNode.ts b/JisolGameCocos/assets/script/battle/base/common/GNode.ts new file mode 100644 index 00000000..8ebbff08 --- /dev/null +++ b/JisolGameCocos/assets/script/battle/base/common/GNode.ts @@ -0,0 +1,14 @@ +import { Node } from "cc"; +import { GData } from "../../../GData"; +import { UITransform } from "cc"; + + +//Node 工具 +export default class GNode{ + static create():Node{ + let mapNode = new Node(); + mapNode.layer = GData.layer.World; + return mapNode; + } +} + diff --git a/JisolGameCocos/assets/script/battle/base/common/GNode.ts.meta b/JisolGameCocos/assets/script/battle/base/common/GNode.ts.meta new file mode 100644 index 00000000..f8d0c6df --- /dev/null +++ b/JisolGameCocos/assets/script/battle/base/common/GNode.ts.meta @@ -0,0 +1,9 @@ +{ + "ver": "4.0.23", + "importer": "typescript", + "imported": true, + "uuid": "4ab3e098-02a1-4274-8c17-bc2ac08f643b", + "files": [], + "subMetas": {}, + "userData": {} +} diff --git a/JisolGameCocos/assets/script/battle/base/common/GSpine.ts b/JisolGameCocos/assets/script/battle/base/common/GSpine.ts index a9f9d5d7..c3c02ff6 100644 --- a/JisolGameCocos/assets/script/battle/base/common/GSpine.ts +++ b/JisolGameCocos/assets/script/battle/base/common/GSpine.ts @@ -4,6 +4,7 @@ import JNSkeleton from "../../../../../extensions/ngame/assets/ngame/sync/frame/ import { Node } from "cc"; import GBaseMode from "../../GBaseMode"; import { Vec2 } from "cc"; +import GNode from "./GNode"; //Spine 工具 @@ -18,7 +19,7 @@ export default class GSpine{ //关闭当前角色原本的Spine role.spine.enabled = false; //添加新的spine - let spineNode = new Node(); + let spineNode = GNode.create(); role.node.addChild(spineNode); let another = spineNode.addComponent(JNSkeleton); another.skeletonData = spine; @@ -38,7 +39,7 @@ export default class GSpine{ //创建一个Spine static onCreateSpine(spine:sp.SkeletonData):JNSkeleton{ - let spineNode = new Node(); + let spineNode = GNode.create(); let another = spineNode.addComponent(JNSkeleton); another.premultipliedAlpha = false; another.skeletonData = spine; diff --git a/JisolGameCocos/assets/script/battle/base/common/map/GMapLoop.ts b/JisolGameCocos/assets/script/battle/base/common/map/GMapLoop.ts index 38176063..d8885500 100644 --- a/JisolGameCocos/assets/script/battle/base/common/map/GMapLoop.ts +++ b/JisolGameCocos/assets/script/battle/base/common/map/GMapLoop.ts @@ -1,7 +1,13 @@ import { _decorator, Component, Node } from 'cc'; -import { JNGSyncBase } from '../../../../App'; +import { app, JNGSyncBase } from '../../../../App'; import { SpriteFrame } from 'cc'; -import { Camera } from 'cc'; +import { TableGMap } from '../../../../../resources/config/ts/TableGMap'; +import { Sprite } from 'cc'; +import { UITransform } from 'cc'; +import { v3 } from 'cc'; +import { Vec2 } from 'cc'; +import { size } from 'cc'; +import GNode from '../GNode'; const { ccclass, property } = _decorator; /** @@ -16,25 +22,74 @@ export class GMapLoop extends JNGSyncBase<{}> { repeat:number = 1; //一块的地图宽度 mapWidth:number = 100; + //一块的地图高度 + mapHeight:number = 100; //是否初始化 isInit:boolean = false; //世界坐标Y轴 worldY:number = 0; + //创建的地图列表{开始区块:地图图片} + createMaps:Map = new Map(); + - init(map:SpriteFrame,repeat:number){ + init(map:SpriteFrame,repeat:number = 1,width:number = 0,height:number = 0){ this.map = map; this.isInit = true; this.repeat = repeat; - this.mapWidth = map.width; + this.mapWidth = width || this.map.width; + this.mapHeight = height || this.map.height; } //更新地图(世界坐标X) - UpdateMap(x:number){ + UpdateMap(x:number,offsetX:number = 0,offsetY:number = 0){ + //计算x在第几个区块 + let blockIndex = Math.floor((x + offsetX) / this.mapWidth); + //生成区块的列表 + let maps:number[] = []; + for (let index = 0; index < 1 + (this.repeat * 2); index++) { + maps.push(blockIndex + (index - this.repeat)); + } + //生成 + maps.forEach((blockIndex) => { + this.createMap(blockIndex,offsetX,offsetY); + }) + + //销毁其他地图 + let keys = Array.from(this.createMaps.keys()); + keys.forEach(key => { + if(maps.indexOf(key) < 0){ + this.createMaps.get(key).destroy(); + this.createMaps.delete(key); + } + }) + + } + + //生成区块地图 + createMap(blockIndex:number,offsetX:number = 0,offsetY:number = 0){ + //计算区块开始位置 + let start = (blockIndex * this.mapWidth) - offsetX; + + if(!this.createMaps.get(blockIndex)){ + //生成地图 + let mapNode = GNode.create(); + let uiTransform = mapNode.addComponent(UITransform); + uiTransform.anchorX = 0; + this.node.addChild(mapNode); + mapNode.worldPosition = v3(start,offsetY,0) + let mapImage = mapNode.addComponent(Sprite); + mapImage.spriteFrame = this.map; + mapImage.sizeMode = Sprite.SizeMode.CUSTOM; + uiTransform.contentSize = size(this.mapWidth,this.mapHeight); + this.createMaps.set(blockIndex,mapNode); + }else{ + this.createMaps.get(blockIndex).worldPosition = v3(start,offsetY,0) + } } } diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts index edee0ad2..75cf6d90 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleBase.ts @@ -82,7 +82,7 @@ export default abstract class GRoleBase extends GObject{ //初始化 protected init(role:TableGRole){ if(this.spine) - this.spine.skeletonData = app.role.skData[role.id]; + this.spine.skeletonData = app.battleRes.skData[role.id]; } //创建一个状态机 diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts index 9efa53d2..8d3a39ac 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts @@ -27,7 +27,6 @@ export default class GRoleDefault extends GRoleBase<{}>{ //能量条 @property(ProgressBar) energyVolume:ProgressBar; - //状态机 fsm:GFSMDefault; @@ -43,10 +42,6 @@ export default class GRoleDefault extends GRoleBase<{}>{ if(this.isDie){ //死亡回调 this.killBack.forEach(fun => fun(this)); - //死亡销毁 - JNFrameTime.getInstance().setTimeout(() => { - this.node.destroy() - },3000) } } diff --git a/JisolGameCocos/assets/script/battle/effect.meta b/JisolGameCocos/assets/script/battle/effect.meta deleted file mode 100644 index c2f27a0f..00000000 --- a/JisolGameCocos/assets/script/battle/effect.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.2.0", - "importer": "directory", - "imported": true, - "uuid": "82abb7d2-2e71-4d33-9853-644778b2abc3", - "files": [], - "subMetas": {}, - "userData": { - "compressionType": {}, - "isRemoteBundle": {} - } -} diff --git a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts index 1402c5bb..22d154c2 100644 --- a/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts +++ b/JisolGameCocos/assets/script/battle/modes/GOnHookMode.ts @@ -9,6 +9,12 @@ import { _decorator } from "cc"; import { instantiate } from "cc"; import { GPVPModePlayerEnum } from "./GPVPMode"; import { JNFrameInfo } from "../../../../extensions/ngame/assets/ngame/sync/frame/JNSyncFrame"; +import { GMapLoop } from "../base/common/map/GMapLoop"; +import { Node } from "cc"; +import JNFrameTime from "../../../../extensions/ngame/assets/ngame/sync/frame/game/time/JNFrameTime"; +import { TableGMap } from "../../../resources/config/ts/TableGMap"; +import { app } from "../../App"; +import { v3 } from "cc"; const { ccclass, property } = _decorator; @@ -34,6 +40,21 @@ export default class GOnHookMode extends GBaseMode<{}>{ @property(Prefab) rolePrefab: Prefab = null; + + //场景地图 + @property(GMapLoop) + map1:GMapLoop; + @property(GMapLoop) + map2:GMapLoop; + @property(GMapLoop) + map3:GMapLoop; + + @property(Node) + objects: Node = null; + + get scene():Node{ + return this.objects; + } //玩家信息 playerInfo:GOnHookInfo; @@ -49,12 +70,30 @@ export default class GOnHookMode extends GBaseMode<{}>{ playerRoles: GRoleDefault[] = []; //敌方宠物 enemyRoles: GRoleDefault[] = []; + + offsetX:number = 0; + + //地图信息 + mapInfo:TableGMap; onSyncInitSuccess():void{ //初始化战斗 console.log("GOnHookMode 模式初始化"); + //调整相机 + let camreaPos = this.camera.node.worldPosition; + this.camera.node.worldPosition = v3(0,100,camreaPos.z) + + //初始化地图 + this.mapInfo = TableGMap.getConfig(60001); + this.map1.init(app.battleRes.maps[60001][0],1); + this.map1.UpdateMap(0,this.camera.node.worldPosition.x,this.mapInfo.map1OffsetY); + this.map2.init(app.battleRes.maps[60001][1],1); + this.map2.UpdateMap(0,this.camera.node.worldPosition.x,this.mapInfo.map2OffsetY); + this.map3.init(app.battleRes.maps[60001][2],1,app.battleRes.maps[60001][1].width,app.battleRes.maps[60001][1].height); + this.map3.UpdateMap(0,this.camera.node.worldPosition.x,this.mapInfo.map3OffsetY); + this.playerInfo = { tactical: GTactical.getTactical().setOffset(this.playerPos), roles: GRoleUtil.getGRoles([10004,10004,10004,10004,10003,10003]) }; this.enemyInfo = { tactical: GTactical.getTactical(true).setOffset(this.enemyPos), roles: GRoleUtil.getGRoles([10002]) }; @@ -67,8 +106,6 @@ export default class GOnHookMode extends GBaseMode<{}>{ onSyncUpdate(dt: number,frame:JNFrameInfo, input?: {}){ - - } //生成宠物 @@ -139,6 +176,11 @@ export default class GOnHookMode extends GBaseMode<{}>{ //角色死亡回调 onRoleKillBack(role:GRoleDefault){ + //死亡销毁 + JNFrameTime.getInstance().setTimeout(() => { + if(role.isValid) + role.node.destroy() + },3000) //如果没有敌人则生成敌人 if(this.getOnesRole(GOnHookModePlayerEnum.ENEMY).filter(role => !!role.get()).length <= 0){ //生成敌人 diff --git a/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts b/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts index e8d2aa82..e0062b71 100644 --- a/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts +++ b/JisolGameCocos/assets/script/battle/skill/RoleSkill/疯狂松鼠/GSkillCrazySquirrel.ts @@ -40,14 +40,14 @@ export default class GSkillCrazySquirrel extends GSkillCDBase{ let ah = parseInt(this.info.skillArgs[2]); //出现松鼠丢炸弹 - GSpine.onPlayAnotherSpine(this.role,app.role.effects[50001],"skill",{ + GSpine.onPlayAnotherSpine(this.role,app.battleRes.effects[50001],"skill",{ end:() => { //从天而降 let pos = enemy.v2World.add(v2(0,1000)); let end = enemy.v2World; //生成火球 - let spine = GSpine.onCreateSpine(app.role.effects[50002]); + let spine = GSpine.onCreateSpine(app.battleRes.effects[50002]); this.role.mode.addGNode(spine.node,pos); spine.setAnimation(0,"animation",true); spine.node.angle = 90; @@ -59,7 +59,7 @@ export default class GSkillCrazySquirrel extends GSkillCDBase{ .onComplete(() => { let world = spine.node.worldPosition; spine.node.destroy(); - GSpine.onPlaySceneSpine(scene,v2(world.x,world.y),app.role.effects[50003],"animation"); + GSpine.onPlaySceneSpine(scene,v2(world.x,world.y),app.battleRes.effects[50003],"animation"); console.log(GDetection.testAABBRole(rect(world.x,world.y,aw,ah)).length) GDetection.testAABBRole(rect(world.x,world.y,aw,ah)).forEach(role =>{ role.onHit(); diff --git a/JisolGameCocos/assets/script/ui/Home/HomeView.ts b/JisolGameCocos/assets/script/ui/Home/HomeView.ts index 6a0cc12f..f1657eb6 100644 --- a/JisolGameCocos/assets/script/ui/Home/HomeView.ts +++ b/JisolGameCocos/assets/script/ui/Home/HomeView.ts @@ -2,6 +2,8 @@ import { _decorator, Component, Label, Node } from 'cc'; import { app, JNGLayerBase } from '../../App'; import { Toggle } from 'cc'; import { JNSyncAction } from '../../../../extensions/ngame/assets/ngame/sync/JNSyncAction'; +import { director } from 'cc'; +import { WorldCanvas } from '../../WorldCanvas'; const { ccclass, property } = _decorator; @ccclass('HomeView') @@ -34,6 +36,15 @@ export class HomeView extends JNGLayerBase { app.socket.Send(JNSyncAction.NSyncFrameReset); } + //前往PVP + onClickGoPVP(){ + director.getScene().getComponentInChildren(WorldCanvas).index = 0; + } + //前往无尽 + onClickGoOnHook(){ + director.getScene().getComponentInChildren(WorldCanvas).index = 1; + } + } diff --git a/JisolGameCocos/config/GMap.xlsx b/JisolGameCocos/config/GMap.xlsx new file mode 100644 index 00000000..f8ab06b7 Binary files /dev/null and b/JisolGameCocos/config/GMap.xlsx differ diff --git a/JisolGameCocos/config/Id Info.txt b/JisolGameCocos/config/Id Info.txt index 1dba568b..4c89e144 100644 --- a/JisolGameCocos/config/Id Info.txt +++ b/JisolGameCocos/config/Id Info.txt @@ -2,4 +2,5 @@ 2**** 角色普攻子弹 3**** 角色攻击特效 4**** 角色技能ID -5**** 角色技能SpineId \ No newline at end of file +5**** 角色技能SpineId +6**** 地图Id \ No newline at end of file diff --git a/JisolGameCocos/config/Table Info.txt b/JisolGameCocos/config/Table Info.txt index 92f6d8cc..d40a9407 100644 --- a/JisolGameCocos/config/Table Info.txt +++ b/JisolGameCocos/config/Table Info.txt @@ -2,4 +2,6 @@ GRole - 角色表 GRoleAttack - 角色普攻表 GRoleAttackBullet - 角色普攻子弹表 GRoleAttackEffect - 角色普攻特效表 -GRoleSkill - 角色技能表 \ No newline at end of file +GRoleSkill - 角色技能表 +GRoleSkillEffect - 角色技能特效 +GMap - 游戏地图 \ No newline at end of file diff --git a/JisolGameCocos/settings/v2/packages/builder.json b/JisolGameCocos/settings/v2/packages/builder.json index f72a1629..effd6aff 100644 --- a/JisolGameCocos/settings/v2/packages/builder.json +++ b/JisolGameCocos/settings/v2/packages/builder.json @@ -1,155 +1,6 @@ { "__version__": "1.3.7", "bundleConfig": { - "custom": { - "auto_3377KfQWdKf734+ESsBHJH": { - "displayName": "ngame", - "configs": { - "native": { - "preferredOptions": { - "compressionType": "merge_dep", - "isRemote": false - } - }, - "miniGame": { - "configMode": "overwrite", - "overwriteSettings": { - "alipay-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "taobao-creative-app": { - "compressionType": "merge_dep", - "isRemote": false - }, - "taobao-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "bytedance-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "oppo-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "huawei-quick-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "vivo-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "xiaomi-quick-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "baidu-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "wechatgame": { - "compressionType": "merge_dep", - "isRemote": false - }, - "link-sure": { - "compressionType": "merge_dep", - "isRemote": false - }, - "qtt": { - "compressionType": "merge_dep", - "isRemote": false - }, - "cocos-play": { - "compressionType": "merge_dep", - "isRemote": false - } - } - }, - "web": { - "preferredOptions": { - "compressionType": "merge_dep", - "isRemote": false - } - } - } - }, - "auto_feCy2hNdtIxZdsUHEU82Zv": { - "displayName": "role", - "configs": { - "native": { - "preferredOptions": { - "compressionType": "merge_dep", - "isRemote": false - } - }, - "miniGame": { - "configMode": "overwrite", - "overwriteSettings": { - "alipay-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "taobao-creative-app": { - "compressionType": "merge_dep", - "isRemote": false - }, - "taobao-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "bytedance-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "oppo-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "huawei-quick-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "vivo-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "xiaomi-quick-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "baidu-mini-game": { - "compressionType": "merge_dep", - "isRemote": false - }, - "wechatgame": { - "compressionType": "merge_dep", - "isRemote": false - }, - "link-sure": { - "compressionType": "merge_dep", - "isRemote": false - }, - "qtt": { - "compressionType": "merge_dep", - "isRemote": false - }, - "cocos-play": { - "compressionType": "merge_dep", - "isRemote": false - } - } - }, - "web": { - "preferredOptions": { - "compressionType": "merge_dep", - "isRemote": false - } - } - } - } - } + "custom": {} } }