diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes deleted file mode 100644 index c7d2ce117..000000000 Binary files a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes and /dev/null differ diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt similarity index 92% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt index 2995ad83d..78a752e79 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt @@ -1,4 +1,4 @@ -common_dec_2.png +ui_common_dec_2.png size:256,256 filter:Linear,Linear 1 diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta similarity index 75% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta index 6fe394ffb..c7d4751d4 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.atlas.txt.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: ac53dcec7ccde62429bdb02cb9cd966e +guid: 49bf18802f6c8ba43b054b77095aa57d TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png similarity index 100% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta similarity index 98% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta index 9777caa13..486e405a8 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 10a12a062925f724fb56eea31c7557f9 +guid: 3da4af725c6267044a1e80fb6bf4cff8 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes new file mode 100644 index 000000000..239e4868a Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta similarity index 75% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta index 8f1040c2d..01919c7c8 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2.skel.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 149c435b7dfa73f4b87fab5d1c136342 +guid: 77a9433d7c777af49960f2bfc9a8037d TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset similarity index 69% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset index 9c0c770e7..372d85389 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: common_dec_2_atlas + m_Name: ui_common_dec_2_atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: 149c435b7dfa73f4b87fab5d1c136342, type: 3} + atlasFile: {fileID: 4900000, guid: 49bf18802f6c8ba43b054b77095aa57d, type: 3} materials: - - {fileID: 2100000, guid: 6cc0c9a6b6902dd4190972a0bbc44dc5, type: 2} + - {fileID: 2100000, guid: 049da500b8b3c9145b4a8d3d6b8b3868, type: 2} diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta index e3b4c4044..f38447a12 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_atlas.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e2250f0115fc09047a40c1698e86bf56 +guid: c8061e76cb1ee1445867befd24305153 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat similarity index 81% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat index 2cb8d447a..f917c3958 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat @@ -7,9 +7,9 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: common_dec_2_material + m_Name: ui_common_dec_2_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 10a12a062925f724fb56eea31c7557f9, type: 3} + m_Texture: {fileID: 2800000, guid: 3da4af725c6267044a1e80fb6bf4cff8, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 1 + - _StraightAlphaInput: 0 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta index de640f923..880bf337f 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_material.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 6cc0c9a6b6902dd4190972a0bbc44dc5 +guid: 049da500b8b3c9145b4a8d3d6b8b3868 NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset similarity index 79% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset index 32a93f2f5..4279efad5 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: common_dec_2_skeletondata + m_Name: ui_common_dec_2_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 9548220e18f7da74b9814a09dd4cf6b7, type: 2} + - {fileID: 11400000, guid: c8061e76cb1ee1445867befd24305153, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: ac53dcec7ccde62429bdb02cb9cd966e, type: 3} + skeletonJSON: {fileID: 4900000, guid: 77a9433d7c777af49960f2bfc9a8037d, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset.meta b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta similarity index 79% rename from Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset.meta rename to Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta index 0c6cfab6b..b3cc0fa32 100644 --- a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_main_button_2/ui_common_dec_2_skeletondata.asset.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9548220e18f7da74b9814a09dd4cf6b7 +guid: 04f2fbf456dd7df4f95972fcc8dc69ef NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 diff --git a/Assets/arts/textures/ui/battle/battle_hinder_1.png b/Assets/arts/textures/ui/battle/battle_hinder_1.png index c747bd648..7ccb898bd 100644 Binary files a/Assets/arts/textures/ui/battle/battle_hinder_1.png and b/Assets/arts/textures/ui/battle/battle_hinder_1.png differ diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 711cfec33..052b3ebbf 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -1572,7 +1572,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: e2250f0115fc09047a40c1698e86bf56, type: 2} + objectReference: {fileID: 11400000, guid: 04f2fbf456dd7df4f95972fcc8dc69ef, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5