diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab index a8a65a4d9b..5dece759fa 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &89243130255385257 +--- !u!1 &3682772328956979133 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2174688939603908941} - - component: {fileID: 7469979320189928875} - - component: {fileID: 6759772556053112342} + - component: {fileID: 4685190284664069852} + - component: {fileID: 8312084064240846387} + - component: {fileID: 2355959082676110137} m_Layer: 0 m_Name: npc_map_boy m_TagString: Untagged @@ -18,13 +18,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2174688939603908941 +--- !u!224 &4685190284664069852 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89243130255385257} + m_GameObject: {fileID: 3682772328956979133} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -37,21 +37,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7469979320189928875 +--- !u!222 &8312084064240846387 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89243130255385257} + m_GameObject: {fileID: 3682772328956979133} m_CullTransparentMesh: 0 ---- !u!114 &6759772556053112342 +--- !u!114 &2355959082676110137 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 89243130255385257} + m_GameObject: {fileID: 3682772328956979133} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab.meta b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab.meta index 2bf1b065e5..fbbcc88a47 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab.meta +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_boy.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 903d0a23fb5988849b3ae2a2d860e764 +guid: f7a3527c4b8281c46bd0244798a3005e PrefabImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab index ac99f2f1f2..8e10ae30df 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &1491821065408660376 +--- !u!1 &4363154486544996248 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,23 +8,23 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6099875916605848844} - - component: {fileID: 7771554262164715917} - - component: {fileID: 7038560494115443806} - m_Layer: 5 - m_Name: live2d_npc_map_nv + - component: {fileID: 3994000794241502130} + - component: {fileID: 8787171502648070941} + - component: {fileID: 10347609316450741} + m_Layer: 0 + m_Name: npc_map_nv m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6099875916605848844 +--- !u!224 &3994000794241502130 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491821065408660376} + m_GameObject: {fileID: 4363154486544996248} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} @@ -37,21 +37,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7771554262164715917 +--- !u!222 &8787171502648070941 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491821065408660376} + m_GameObject: {fileID: 4363154486544996248} m_CullTransparentMesh: 0 ---- !u!114 &7038560494115443806 +--- !u!114 &10347609316450741 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1491821065408660376} + m_GameObject: {fileID: 4363154486544996248} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d85b887af7e6c3f45a2e2d2920d641bc, type: 3} diff --git a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab.meta b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab.meta index 447076cd6f..cfe6cfaedd 100644 --- a/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab.meta +++ b/Assets/ManagedResources/Prefabs/Live2d/live2d_npc_map_nv.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fc6dea0abfced404c95b37a30c6ddfb1 +guid: 701e02fbe2a7ef944b98f18e8d8f0957 PrefabImporter: externalObjects: {} userData: diff --git a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png.meta b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png.meta index 73529723d6..666c222743 100644 --- a/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png.meta +++ b/Assets/ManagedResources/Spine/npc_map_boy/npc_map_boy.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: bfdd412c6c06a1c4186542b1b360d165 + spriteID: 18845b4f517a6bd41839737ec31433fe vertices: [] indices: edges: [] 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 300014d885..461bb35354 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.meta b/Assets/ManagedResources/Spine/npc_map_nv.meta index d90009cdc1..77a920bff6 100644 --- a/Assets/ManagedResources/Spine/npc_map_nv.meta +++ b/Assets/ManagedResources/Spine/npc_map_nv.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: lz4/spine/npc_map_nv - assetBundleVariant: unity3d + assetBundleName: + assetBundleVariant: 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 2dc8b52e27..fb237161e7 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: true - xy: 178, 18 + rotate: false + xy: 399, 335 size: 186, 146 orig: 186, 146 offset: 0, 0 @@ -20,140 +20,140 @@ b_toufa_5 index: -1 b_tui_19 rotate: true - xy: 652, 762 + xy: 197, 2 size: 76, 186 orig: 76, 186 offset: 0, 0 index: -1 b_yifu_8 - rotate: true - xy: 652, 840 - size: 182, 230 - orig: 182, 230 + rotate: false + xy: 674, 763 + size: 242, 259 + orig: 242, 259 offset: 0, 0 index: -1 biaoqing_1 - rotate: false - xy: 66, 2 + rotate: true + xy: 796, 217 size: 52, 50 orig: 52, 50 offset: 0, 0 index: -1 biaoqing_3 - rotate: false - xy: 397, 810 + rotate: true + xy: 178, 465 size: 253, 212 orig: 253, 212 offset: 0, 0 index: -1 biaoqing_6 rotate: true - xy: 751, 343 + xy: 781, 335 size: 139, 68 orig: 139, 68 offset: 0, 0 index: -1 biaoqing_7 rotate: true - xy: 883, 347 + xy: 810, 69 size: 58, 80 orig: 58, 80 offset: 0, 0 index: -1 biaoqing_8 rotate: false - xy: 646, 69 + xy: 661, 609 size: 135, 78 orig: 135, 78 offset: 0, 0 index: -1 f_biyan_14 - rotate: false - xy: 2, 2 + rotate: true + xy: 796, 271 size: 62, 50 orig: 62, 50 offset: 0, 0 index: -1 f_fashi_1 rotate: true - xy: 967, 518 + xy: 967, 114 size: 45, 55 orig: 45, 55 offset: 0, 0 index: -1 f_fashi_10 rotate: false - xy: 751, 261 + xy: 848, 252 size: 74, 80 orig: 74, 80 offset: 0, 0 index: -1 f_fashi_12 rotate: false - xy: 949, 565 + xy: 892, 84 size: 73, 75 orig: 73, 75 offset: 0, 0 index: -1 f_fashi_3 rotate: false - xy: 431, 72 + xy: 797, 13 size: 45, 54 orig: 45, 54 offset: 0, 0 index: -1 f_fashi_6 - rotate: true - xy: 559, 2 + rotate: false + xy: 726, 490 size: 64, 117 orig: 64, 117 offset: 0, 0 index: -1 f_fashi_7 rotate: false - xy: 783, 50 + xy: 734, 215 size: 60, 118 orig: 60, 118 offset: 0, 0 index: -1 f_piaodai_24 - rotate: true - xy: 529, 490 + rotate: false + xy: 392, 483 size: 186, 123 orig: 186, 123 offset: 0, 0 index: -1 f_shou_33 - rotate: false - xy: 120, 17 + rotate: true + xy: 844, 15 size: 52, 35 orig: 52, 35 offset: 0, 0 index: -1 f_shou_37 - rotate: false - xy: 356, 479 + rotate: true + xy: 568, 45 size: 45, 25 orig: 45, 25 offset: 0, 0 index: -1 f_tou_15 - rotate: false - xy: 356, 506 + rotate: true + xy: 417, 162 size: 171, 170 orig: 171, 170 offset: 0, 0 index: -1 f_toufa_11 rotate: false - xy: 853, 559 + xy: 832, 680 size: 94, 81 orig: 94, 81 offset: 0, 0 index: -1 f_toufa_13 rotate: true - xy: 883, 407 + xy: 810, 129 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: false - xy: 397, 678 + rotate: true + xy: 180, 80 size: 247, 130 orig: 247, 130 offset: 0, 0 index: -1 f_toufa_8 - rotate: true - xy: 654, 484 + rotate: false + xy: 748, 92 size: 60, 121 orig: 60, 121 offset: 0, 0 index: -1 f_toufa_9 rotate: true - xy: 853, 495 + xy: 603, 43 size: 62, 112 orig: 62, 112 offset: 0, 0 index: -1 f_tui_29 - rotate: false - xy: 429, 311 + rotate: true + xy: 2, 2 size: 70, 193 orig: 70, 193 offset: 0, 0 index: -1 f_tui_30 rotate: true - xy: 646, 692 + xy: 417, 92 size: 68, 184 orig: 68, 184 offset: 0, 0 index: -1 f_xiong_16 - rotate: false - xy: 654, 546 + rotate: true + xy: 580, 483 size: 123, 144 orig: 123, 144 offset: 0, 0 index: -1 f_yifu_20 rotate: false - xy: 178, 470 + xy: 2, 74 size: 176, 248 orig: 176, 248 offset: 0, 0 index: -1 f_yifu_40 - rotate: false - xy: 779, 534 + rotate: true + xy: 674, 689 size: 72, 156 orig: 72, 156 offset: 0, 0 index: -1 f_yifu_41 rotate: false - xy: 821, 364 + xy: 916, 343 size: 60, 129 orig: 60, 129 offset: 0, 0 index: -1 f_yixiu_31 rotate: false - xy: 748, 170 + xy: 920, 474 size: 83, 89 orig: 83, 89 offset: 0, 0 index: -1 f_yixiu_32 - rotate: false - xy: 649, 345 + rotate: true + xy: 798, 578 size: 100, 137 orig: 100, 137 offset: 0, 0 index: -1 f_yixiu_35 rotate: false - xy: 827, 267 + xy: 892, 161 size: 78, 78 orig: 78, 78 offset: 0, 0 index: -1 f_yixiu_36 rotate: true - xy: 501, 68 + xy: 603, 107 size: 106, 143 orig: 106, 143 offset: 0, 0 index: -1 l_biyan_23 - rotate: false - xy: 982, 760 + rotate: true + xy: 967, 72 size: 40, 41 orig: 40, 41 offset: 0, 0 index: -1 l_fashi_1 - rotate: true - xy: 840, 738 + rotate: false + xy: 851, 334 size: 63, 140 orig: 63, 140 offset: 0, 0 index: -1 l_fashi_20 rotate: true - xy: 678, 2 + xy: 717, 2 size: 65, 78 orig: 65, 78 offset: 0, 0 index: -1 l_piaodai_14 - rotate: true - xy: 884, 803 + rotate: false + xy: 178, 329 size: 219, 134 orig: 219, 134 offset: 0, 0 index: -1 l_tou_24 - rotate: false - xy: 501, 296 + rotate: true + xy: 587, 335 size: 146, 192 orig: 146, 192 offset: 0, 0 index: -1 l_toufa_21 - rotate: false - xy: 178, 206 + rotate: true + xy: 397, 608 size: 144, 262 orig: 144, 262 offset: 0, 0 index: -1 l_toufa_22 - rotate: false - xy: 853, 642 + rotate: true + xy: 928, 693 size: 102, 94 orig: 102, 94 offset: 0, 0 index: -1 l_toufa_25 - rotate: true - xy: 649, 277 + rotate: false + xy: 924, 241 size: 66, 100 orig: 66, 100 offset: 0, 0 index: -1 l_toufa_3 rotate: false - xy: 501, 176 + xy: 589, 215 size: 143, 118 orig: 143, 118 offset: 0, 0 index: -1 l_toufa_4 - rotate: true - xy: 431, 2 + rotate: false + xy: 937, 565 size: 64, 126 orig: 64, 126 offset: 0, 0 index: -1 l_tui_17 - rotate: false - xy: 431, 128 + rotate: true + xy: 385, 22 size: 68, 181 orig: 68, 181 offset: 0, 0 index: -1 l_xiong_5 - rotate: false - xy: 646, 149 + rotate: true + xy: 792, 476 size: 100, 126 orig: 100, 126 offset: 0, 0 index: -1 l_yifu_12 rotate: false - xy: 2, 54 - size: 174, 268 - orig: 174, 268 + xy: 397, 754 + size: 275, 268 + orig: 275, 268 offset: 0, 0 index: -1 l_yixiu_8 rotate: false - xy: 324, 243 + xy: 918, 797 size: 103, 225 orig: 103, 225 offset: 0, 0 index: -1 l_yixiu_8b rotate: false - xy: 326, 16 + xy: 312, 102 size: 103, 225 orig: 103, 225 offset: 0, 0 index: -1 shadow rotate: false - xy: 174, 2 + xy: 312, 86 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 0ea756cc0c..54dc38e078 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.png.meta b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png.meta index 0ba790ffce..81047a7e22 100644 --- a/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png.meta +++ b/Assets/ManagedResources/Spine/npc_map_nv/npc_map_nv.png.meta @@ -75,7 +75,7 @@ TextureImporter: outline: [] physicsShape: [] bones: [] - spriteID: 94fe645ff37aaeb43a497845132a47e6 + spriteID: 4cd24335dcb670b41bed4d6eba6b23cd vertices: [] indices: edges: [] 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 6a6c0672d8..1170b94976 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