diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.anim b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_anim.anim similarity index 99% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.anim rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_anim.anim index 1683fed06e..c022688e26 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.anim +++ b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_ChuFaEffect_01 + m_Name: UI_Effect_ChuFaEffect_01_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.anim.meta b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_anim.anim.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.anim.meta rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_anim.anim.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.controller b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_ctr.controller similarity index 98% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.controller rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_ctr.controller index da611868f3..40df56af8a 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.controller +++ b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_ctr.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_ChuFaEffect_01 + m_Name: UI_Effect_ChuFaEffect_01_ctr serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.controller.meta b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_ctr.controller.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01.controller.meta rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_01_ctr.controller.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.anim b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_anim.anim similarity index 99% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.anim rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_anim.anim index 4c8783de73..f40f4f7387 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.anim +++ b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_anim.anim @@ -6,7 +6,7 @@ AnimationClip: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_ChuFaEffect_02 + m_Name: UI_Effect_ChuFaEffect_02_anim serializedVersion: 6 m_Legacy: 0 m_Compressed: 0 diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.anim.meta b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_anim.anim.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.anim.meta rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_anim.anim.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.controller b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_ctr.controller similarity index 98% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.controller rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_ctr.controller index efe1bb69f1..6ddedf7fb1 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.controller +++ b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_ctr.controller @@ -6,7 +6,7 @@ AnimatorController: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_Effect_ChuFaEffect_02 + m_Name: UI_Effect_ChuFaEffect_02_ctr serializedVersion: 5 m_AnimatorParameters: [] m_AnimatorLayers: diff --git a/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.controller.meta b/Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_ctr.controller.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02.controller.meta rename to Assets/ManagedResources/EffectResUI/Story/Animation/UI_Effect_ChuFaEffect_02_ctr.controller.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029_mat.mat similarity index 97% rename from Assets/ManagedResources/EffectResUI/Story/Materials/Flare029.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/Flare029_mat.mat index f7c7834e8b..d47e64d48f 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Flare029 + m_Name: Flare029_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/Flare029_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/Flare029.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/Flare029_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216_mat.mat index 2ffc3a753a..224c444dd3 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: H_tirl_216 + m_Name: H_tirl_216_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/H_tirl_216_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182_mat.mat similarity index 97% rename from Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182_mat.mat index 4d575da426..63259f0122 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Matrix182 + m_Name: Matrix182_mat m_Shader: {fileID: 4800000, guid: 8a2b842cc5f3c414ca13c6df98e8e718, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/Matrix182_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01_mat.mat index f5acd57e2b..b4992fbd14 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: UI_fuzhou_01 + m_Name: UI_fuzhou_01_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/UI_fuzhou_01_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2_mat.mat similarity index 96% rename from Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2_mat.mat index 4af465fa4e..a449f58255 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: c_ax_0067_2 + m_Name: c_ax_0067_2_mat m_Shader: {fileID: 4800000, guid: 5a335d9deda6b7441bcb6311537b7dec, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/c_ax_0067_2_mat.mat.meta diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022.mat b/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022_mat.mat similarity index 97% rename from Assets/ManagedResources/EffectResUI/Story/Materials/xl_022.mat rename to Assets/ManagedResources/EffectResUI/Story/Materials/xl_022_mat.mat index 1ab6967a4e..9e737d69fe 100644 --- a/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022.mat +++ b/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022_mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: xl_022 + m_Name: xl_022_mat m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022.mat.meta b/Assets/ManagedResources/EffectResUI/Story/Materials/xl_022_mat.mat.meta similarity index 100% rename from Assets/ManagedResources/EffectResUI/Story/Materials/xl_022.mat.meta rename to Assets/ManagedResources/EffectResUI/Story/Materials/xl_022_mat.mat.meta diff --git a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.atlas.txt b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.atlas.txt index 11a58549ed..20776eb19c 100644 --- a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.atlas.txt +++ b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.atlas.txt @@ -6,344 +6,344 @@ filter: Linear,Linear repeat: none Btou rotate: false - xy: 692, 492 - size: 192, 192 - orig: 192, 192 + xy: 807, 858 + size: 164, 164 + orig: 164, 164 offset: 0, 0 index: -1 Btoufa02 rotate: true - xy: 2, 2 - size: 143, 174 - orig: 143, 174 + xy: 162, 240 + size: 122, 149 + orig: 122, 149 offset: 0, 0 index: -1 Byifi03 rotate: false - xy: 188, 254 - size: 174, 188 - orig: 174, 188 + xy: 162, 364 + size: 149, 161 + orig: 149, 161 offset: 0, 0 index: -1 Byifi04 rotate: false - xy: 2, 722 - size: 335, 300 - orig: 335, 300 + xy: 2, 765 + size: 287, 257 + orig: 287, 257 offset: 0, 0 index: -1 Byifi04a rotate: false - xy: 2, 444 - size: 244, 276 - orig: 244, 276 + xy: 2, 527 + size: 209, 236 + orig: 209, 236 offset: 0, 0 index: -1 Byifi05 rotate: true - xy: 941, 843 - size: 36, 81 - orig: 36, 81 + xy: 451, 274 + size: 31, 69 + orig: 31, 69 offset: 0, 0 index: -1 Fbiyan - rotate: false - xy: 369, 73 - size: 121, 34 - orig: 121, 34 + rotate: true + xy: 973, 918 + size: 104, 29 + orig: 104, 29 offset: 0, 0 index: -1 Fjiao01 rotate: false - xy: 692, 721 - size: 18, 20 - orig: 18, 20 + xy: 545, 515 + size: 16, 17 + orig: 16, 17 offset: 0, 0 index: -1 Fjiao02 rotate: false - xy: 692, 699 - size: 18, 20 - orig: 18, 20 + xy: 563, 515 + size: 16, 17 + orig: 16, 17 offset: 0, 0 index: -1 Fkuzi01 rotate: false - xy: 188, 97 - size: 179, 155 - orig: 179, 155 + xy: 595, 515 + size: 153, 133 + orig: 153, 133 offset: 0, 0 index: -1 Fshou01 rotate: false - xy: 544, 62 - size: 70, 31 - orig: 70, 31 + xy: 807, 830 + size: 60, 26 + orig: 60, 26 offset: 0, 0 index: -1 Fshou02 rotate: false - xy: 653, 95 - size: 58, 67 - orig: 58, 67 + xy: 750, 519 + size: 50, 58 + orig: 50, 58 offset: 0, 0 index: -1 Ftou - rotate: true - xy: 369, 109 - size: 162, 176 - orig: 162, 176 + rotate: false + xy: 157, 87 + size: 139, 151 + orig: 139, 151 offset: 0, 0 index: -1 Ftoufa01 rotate: false - xy: 712, 808 - size: 227, 214 - orig: 227, 214 + xy: 611, 839 + size: 194, 183 + orig: 194, 183 offset: 0, 0 index: -1 Ftoufa02 rotate: false - xy: 886, 519 - size: 109, 165 - orig: 109, 165 + xy: 449, 390 + size: 94, 142 + orig: 94, 142 offset: 0, 0 index: -1 Ftui01 rotate: true - xy: 886, 492 - size: 25, 65 - orig: 25, 65 + xy: 869, 834 + size: 22, 56 + orig: 22, 56 offset: 0, 0 index: -1 Ftui02 - rotate: true - xy: 941, 809 - size: 32, 70 - orig: 32, 70 + rotate: false + xy: 125, 21 + size: 28, 60 + orig: 28, 60 offset: 0, 0 index: -1 Fyifu01 rotate: false - xy: 492, 53 - size: 50, 54 - orig: 50, 54 + xy: 927, 810 + size: 43, 46 + orig: 43, 46 offset: 0, 0 index: -1 Fyifu02 rotate: true - xy: 616, 52 - size: 41, 50 - orig: 41, 50 + xy: 806, 734 + size: 35, 43 + orig: 35, 43 offset: 0, 0 index: -1 Fyifu03 rotate: false - xy: 547, 164 - size: 132, 53 - orig: 132, 53 + xy: 324, 521 + size: 113, 46 + orig: 113, 46 offset: 0, 0 index: -1 Fyifu04 rotate: false - xy: 558, 499 - size: 132, 242 - orig: 132, 242 + xy: 324, 569 + size: 113, 208 + orig: 113, 208 offset: 0, 0 index: -1 Fyifu05 rotate: false - xy: 248, 471 - size: 127, 249 - orig: 127, 249 + xy: 213, 549 + size: 109, 214 + orig: 109, 214 offset: 0, 0 index: -1 Fyifu06 rotate: false - xy: 543, 743 - size: 167, 279 - orig: 167, 279 + xy: 466, 783 + size: 143, 239 + orig: 143, 239 offset: 0, 0 index: -1 Fyixiu01 - rotate: false - xy: 941, 881 - size: 75, 141 - orig: 75, 141 + rotate: true + xy: 2, 17 + size: 64, 121 + orig: 64, 121 offset: 0, 0 index: -1 Fyixiu03 - rotate: true - xy: 547, 95 - size: 67, 104 - orig: 67, 104 + rotate: false + xy: 772, 643 + size: 57, 89 + orig: 57, 89 offset: 0, 0 index: -1 Fyixiu04 rotate: true - xy: 364, 273 - size: 95, 186 - orig: 95, 186 + xy: 611, 650 + size: 82, 159 + orig: 82, 159 offset: 0, 0 index: -1 Fyixiu04a - rotate: true - xy: 369, 21 - size: 50, 101 - orig: 50, 101 + rotate: false + xy: 724, 427 + size: 43, 86 + orig: 43, 86 offset: 0, 0 index: -1 Fzhuangshi rotate: false - xy: 682, 235 - size: 146, 97 - orig: 146, 97 + xy: 157, 2 + size: 125, 83 + orig: 125, 83 offset: 0, 0 index: -1 Rbiyan rotate: false - xy: 668, 59 - size: 46, 34 - orig: 46, 34 + xy: 972, 817 + size: 40, 29 + orig: 40, 29 offset: 0, 0 index: -1 Rjiao - rotate: false - xy: 292, 2 - size: 20, 19 - orig: 20, 19 + rotate: true + xy: 125, 2 + size: 17, 16 + orig: 17, 16 offset: 0, 0 index: -1 Rkuzi rotate: false - xy: 558, 337 - size: 124, 160 - orig: 124, 160 + xy: 313, 246 + size: 106, 137 + orig: 106, 137 offset: 0, 0 index: -1 Rshou01 rotate: true - xy: 927, 242 - size: 79, 44 - orig: 79, 44 + xy: 973, 848 + size: 68, 38 + orig: 68, 38 offset: 0, 0 index: -1 Rtou rotate: false - xy: 377, 518 - size: 179, 218 - orig: 179, 218 + xy: 2, 83 + size: 153, 187 + orig: 153, 187 offset: 0, 0 index: -1 Rtoua - rotate: true - xy: 552, 219 - size: 116, 128 - orig: 116, 128 + rotate: false + xy: 545, 403 + size: 100, 110 + orig: 100, 110 offset: 0, 0 index: -1 Rtoufa01 rotate: true - xy: 377, 370 - size: 146, 179 - orig: 146, 179 + xy: 439, 534 + size: 125, 154 + orig: 125, 154 offset: 0, 0 index: -1 Rtui - rotate: true - xy: 681, 164 - size: 34, 84 - orig: 34, 84 + rotate: false + xy: 769, 445 + size: 29, 72 + orig: 29, 72 offset: 0, 0 index: -1 Ryifu01 rotate: false - xy: 684, 334 - size: 156, 156 - orig: 156, 156 + xy: 313, 385 + size: 134, 134 + orig: 134, 134 offset: 0, 0 index: -1 Ryifu06 rotate: false - xy: 339, 738 - size: 202, 284 - orig: 202, 284 + xy: 291, 779 + size: 173, 243 + orig: 173, 243 offset: 0, 0 index: -1 Ryifu07 rotate: false - xy: 2, 147 - size: 184, 295 - orig: 184, 295 + xy: 2, 272 + size: 158, 253 + orig: 158, 253 offset: 0, 0 index: -1 Ryixiu01 - rotate: true - xy: 178, 7 - size: 88, 112 - orig: 88, 112 + rotate: false + xy: 647, 417 + size: 75, 96 + orig: 75, 96 offset: 0, 0 index: -1 Ryixiu02 - rotate: true - xy: 830, 233 - size: 88, 95 - orig: 88, 95 + rotate: false + xy: 451, 307 + size: 75, 81 + orig: 75, 81 offset: 0, 0 index: -1 biaoqing01 - rotate: false - xy: 682, 200 - size: 116, 33 - orig: 116, 33 + rotate: true + xy: 421, 283 + size: 100, 28 + orig: 100, 28 offset: 0, 0 index: -1 biaoqing02 rotate: true - xy: 800, 200 - size: 33, 21 - orig: 33, 21 + xy: 1004, 960 + size: 28, 18 + orig: 28, 18 offset: 0, 0 index: -1 biaoqing03 rotate: false - xy: 713, 95 - size: 50, 67 - orig: 50, 67 + xy: 806, 771 + size: 43, 57 + orig: 43, 57 offset: 0, 0 index: -1 biaoqing04 rotate: false - xy: 292, 23 - size: 75, 72 - orig: 75, 72 + xy: 750, 579 + size: 64, 62 + orig: 64, 62 offset: 0, 0 index: -1 biaoqing05 - rotate: true - xy: 842, 323 - size: 167, 140 - orig: 167, 140 + rotate: false + xy: 466, 661 + size: 143, 120 + orig: 143, 120 offset: 0, 0 index: -1 biaoqing07 - rotate: false - xy: 953, 496 - size: 37, 21 - orig: 37, 21 + rotate: true + xy: 1004, 990 + size: 32, 18 + orig: 32, 18 offset: 0, 0 index: -1 rs rotate: true - xy: 712, 686 - size: 120, 225 - orig: 120, 225 + xy: 611, 734 + size: 103, 193 + orig: 103, 193 offset: 0, 0 index: -1 shadow - rotate: false - xy: 248, 444 - size: 104, 25 - orig: 104, 25 + rotate: true + xy: 439, 688 + size: 89, 22 + orig: 89, 22 offset: 0, 0 index: -1 diff --git a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png index 2cbac09cb2..1302743063 100644 Binary files a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png and b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png differ diff --git a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.skel.bytes b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.skel.bytes index 461bb35354..e7b6fa97d9 100644 Binary files a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.skel.bytes and b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.skel.bytes differ diff --git a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.atlas.txt b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.atlas.txt index fb237161e7..2dc8b52e27 100644 --- a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.atlas.txt +++ b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.atlas.txt @@ -5,8 +5,8 @@ format: RGBA8888 filter: Linear,Linear repeat: none b_piaodai_12 - rotate: false - xy: 399, 335 + rotate: true + xy: 178, 18 size: 186, 146 orig: 186, 146 offset: 0, 0 @@ -20,140 +20,140 @@ b_toufa_5 index: -1 b_tui_19 rotate: true - xy: 197, 2 + xy: 652, 762 size: 76, 186 orig: 76, 186 offset: 0, 0 index: -1 b_yifu_8 - rotate: false - xy: 674, 763 - size: 242, 259 - orig: 242, 259 + rotate: true + xy: 652, 840 + size: 182, 230 + orig: 182, 230 offset: 0, 0 index: -1 biaoqing_1 - rotate: true - xy: 796, 217 + rotate: false + xy: 66, 2 size: 52, 50 orig: 52, 50 offset: 0, 0 index: -1 biaoqing_3 - rotate: true - xy: 178, 465 + rotate: false + xy: 397, 810 size: 253, 212 orig: 253, 212 offset: 0, 0 index: -1 biaoqing_6 rotate: true - xy: 781, 335 + xy: 751, 343 size: 139, 68 orig: 139, 68 offset: 0, 0 index: -1 biaoqing_7 rotate: true - xy: 810, 69 + xy: 883, 347 size: 58, 80 orig: 58, 80 offset: 0, 0 index: -1 biaoqing_8 rotate: false - xy: 661, 609 + xy: 646, 69 size: 135, 78 orig: 135, 78 offset: 0, 0 index: -1 f_biyan_14 - rotate: true - xy: 796, 271 + rotate: false + xy: 2, 2 size: 62, 50 orig: 62, 50 offset: 0, 0 index: -1 f_fashi_1 rotate: true - xy: 967, 114 + xy: 967, 518 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 f_fashi_10 rotate: false - xy: 848, 252 + xy: 751, 261 size: 74, 80 orig: 74, 80 offset: 0, 0 index: -1 f_fashi_12 rotate: false - xy: 892, 84 + xy: 949, 565 size: 73, 75 orig: 73, 75 offset: 0, 0 index: -1 f_fashi_3 rotate: false - xy: 797, 13 + xy: 431, 72 size: 45, 54 orig: 45, 54 offset: 0, 0 index: -1 f_fashi_6 - rotate: false - xy: 726, 490 + rotate: true + xy: 559, 2 size: 64, 117 orig: 64, 117 offset: 0, 0 index: -1 f_fashi_7 rotate: false - xy: 734, 215 + xy: 783, 50 size: 60, 118 orig: 60, 118 offset: 0, 0 index: -1 f_piaodai_24 - rotate: false - xy: 392, 483 + rotate: true + xy: 529, 490 size: 186, 123 orig: 186, 123 offset: 0, 0 index: -1 f_shou_33 - rotate: true - xy: 844, 15 + rotate: false + xy: 120, 17 size: 52, 35 orig: 52, 35 offset: 0, 0 index: -1 f_shou_37 - rotate: true - xy: 568, 45 + rotate: false + xy: 356, 479 size: 45, 25 orig: 45, 25 offset: 0, 0 index: -1 f_tou_15 - rotate: true - xy: 417, 162 + rotate: false + xy: 356, 506 size: 171, 170 orig: 171, 170 offset: 0, 0 index: -1 f_toufa_11 rotate: false - xy: 832, 680 + xy: 853, 559 size: 94, 81 orig: 94, 81 offset: 0, 0 index: -1 f_toufa_13 rotate: true - xy: 810, 129 + xy: 883, 407 size: 86, 80 orig: 86, 80 offset: 0, 0 @@ -166,204 +166,204 @@ f_toufa_39 offset: 0, 0 index: -1 f_toufa_5 - rotate: true - xy: 180, 80 + rotate: false + xy: 397, 678 size: 247, 130 orig: 247, 130 offset: 0, 0 index: -1 f_toufa_8 - rotate: false - xy: 748, 92 + rotate: true + xy: 654, 484 size: 60, 121 orig: 60, 121 offset: 0, 0 index: -1 f_toufa_9 rotate: true - xy: 603, 43 + xy: 853, 495 size: 62, 112 orig: 62, 112 offset: 0, 0 index: -1 f_tui_29 - rotate: true - xy: 2, 2 + rotate: false + xy: 429, 311 size: 70, 193 orig: 70, 193 offset: 0, 0 index: -1 f_tui_30 rotate: true - xy: 417, 92 + xy: 646, 692 size: 68, 184 orig: 68, 184 offset: 0, 0 index: -1 f_xiong_16 - rotate: true - xy: 580, 483 + rotate: false + xy: 654, 546 size: 123, 144 orig: 123, 144 offset: 0, 0 index: -1 f_yifu_20 rotate: false - xy: 2, 74 + xy: 178, 470 size: 176, 248 orig: 176, 248 offset: 0, 0 index: -1 f_yifu_40 - rotate: true - xy: 674, 689 + rotate: false + xy: 779, 534 size: 72, 156 orig: 72, 156 offset: 0, 0 index: -1 f_yifu_41 rotate: false - xy: 916, 343 + xy: 821, 364 size: 60, 129 orig: 60, 129 offset: 0, 0 index: -1 f_yixiu_31 rotate: false - xy: 920, 474 + xy: 748, 170 size: 83, 89 orig: 83, 89 offset: 0, 0 index: -1 f_yixiu_32 - rotate: true - xy: 798, 578 + rotate: false + xy: 649, 345 size: 100, 137 orig: 100, 137 offset: 0, 0 index: -1 f_yixiu_35 rotate: false - xy: 892, 161 + xy: 827, 267 size: 78, 78 orig: 78, 78 offset: 0, 0 index: -1 f_yixiu_36 rotate: true - xy: 603, 107 + xy: 501, 68 size: 106, 143 orig: 106, 143 offset: 0, 0 index: -1 l_biyan_23 - rotate: true - xy: 967, 72 + rotate: false + xy: 982, 760 size: 40, 41 orig: 40, 41 offset: 0, 0 index: -1 l_fashi_1 - rotate: false - xy: 851, 334 + rotate: true + xy: 840, 738 size: 63, 140 orig: 63, 140 offset: 0, 0 index: -1 l_fashi_20 rotate: true - xy: 717, 2 + xy: 678, 2 size: 65, 78 orig: 65, 78 offset: 0, 0 index: -1 l_piaodai_14 - rotate: false - xy: 178, 329 + rotate: true + xy: 884, 803 size: 219, 134 orig: 219, 134 offset: 0, 0 index: -1 l_tou_24 - rotate: true - xy: 587, 335 + rotate: false + xy: 501, 296 size: 146, 192 orig: 146, 192 offset: 0, 0 index: -1 l_toufa_21 - rotate: true - xy: 397, 608 + rotate: false + xy: 178, 206 size: 144, 262 orig: 144, 262 offset: 0, 0 index: -1 l_toufa_22 - rotate: true - xy: 928, 693 + rotate: false + xy: 853, 642 size: 102, 94 orig: 102, 94 offset: 0, 0 index: -1 l_toufa_25 - rotate: false - xy: 924, 241 + rotate: true + xy: 649, 277 size: 66, 100 orig: 66, 100 offset: 0, 0 index: -1 l_toufa_3 rotate: false - xy: 589, 215 + xy: 501, 176 size: 143, 118 orig: 143, 118 offset: 0, 0 index: -1 l_toufa_4 - rotate: false - xy: 937, 565 + rotate: true + xy: 431, 2 size: 64, 126 orig: 64, 126 offset: 0, 0 index: -1 l_tui_17 - rotate: true - xy: 385, 22 + rotate: false + xy: 431, 128 size: 68, 181 orig: 68, 181 offset: 0, 0 index: -1 l_xiong_5 - rotate: true - xy: 792, 476 + rotate: false + xy: 646, 149 size: 100, 126 orig: 100, 126 offset: 0, 0 index: -1 l_yifu_12 rotate: false - xy: 397, 754 - size: 275, 268 - orig: 275, 268 + xy: 2, 54 + size: 174, 268 + orig: 174, 268 offset: 0, 0 index: -1 l_yixiu_8 rotate: false - xy: 918, 797 + xy: 324, 243 size: 103, 225 orig: 103, 225 offset: 0, 0 index: -1 l_yixiu_8b rotate: false - xy: 312, 102 + xy: 326, 16 size: 103, 225 orig: 103, 225 offset: 0, 0 index: -1 shadow rotate: false - xy: 312, 86 + xy: 174, 2 size: 59, 14 orig: 59, 14 offset: 0, 0 diff --git a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png index 54dc38e078..0ea756cc0c 100644 Binary files a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png and b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png differ diff --git a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.skel.bytes b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.skel.bytes index 1170b94976..e1017b294e 100644 Binary files a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.skel.bytes and b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.skel.bytes differ