diff --git a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes b/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes index dc4cd73cd..cd12bb7db 100644 Binary files a/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes and b/Assets/arts/spines/ui/ui_main_button/ui_main_buttn_1.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_main_button_2.meta b/Assets/arts/spines/ui/ui_main_button_2.meta new file mode 100644 index 000000000..357c35a17 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 770bbe23857c9f141a69bb82964ed1ad +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/common_dec_2.atlas.txt new file mode 100644 index 000000000..2995ad83d --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt @@ -0,0 +1,19 @@ +common_dec_2.png +size:256,256 +filter:Linear,Linear +1 +bounds:79,94,37,57 +offsets:0,0,37,59 +2 +bounds:2,2,84,33 +offsets:1,1,86,35 +rotate:90 +3 +bounds:79,153,67,70 +offsets:1,1,69,72 +4 +bounds:2,154,75,69 +offsets:1,1,77,71 +5 +bounds:2,88,75,64 +offsets:1,1,77,66 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/common_dec_2.atlas.txt.meta new file mode 100644 index 000000000..8f1040c2d --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 149c435b7dfa73f4b87fab5d1c136342 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png new file mode 100644 index 000000000..c0d1a0492 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png differ 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/common_dec_2.png.meta new file mode 100644 index 000000000..9777caa13 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 10a12a062925f724fb56eea31c7557f9 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 47 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: 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 new file mode 100644 index 000000000..c7d2ce117 Binary files /dev/null and b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes differ 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/common_dec_2.skel.bytes.meta new file mode 100644 index 000000000..6fe394ffb --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ac53dcec7ccde62429bdb02cb9cd966e +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/common_dec_2_atlas.asset new file mode 100644 index 000000000..9c0c770e7 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset @@ -0,0 +1,17 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} + m_Name: common_dec_2_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 149c435b7dfa73f4b87fab5d1c136342, type: 3} + materials: + - {fileID: 2100000, guid: 6cc0c9a6b6902dd4190972a0bbc44dc5, type: 2} 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/common_dec_2_atlas.asset.meta new file mode 100644 index 000000000..0c6cfab6b --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9548220e18f7da74b9814a09dd4cf6b7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: 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/common_dec_2_material.mat new file mode 100644 index 000000000..2cb8d447a --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat @@ -0,0 +1,40 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: common_dec_2_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 2800000, guid: 10a12a062925f724fb56eea31c7557f9, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Cutoff: 0.1 + - _OutlineMipLevel: 0 + - _OutlineOpaqueAlpha: 1 + - _OutlineReferenceTexWidth: 1024 + - _OutlineSmoothness: 1 + - _OutlineWidth: 3 + - _StencilComp: 8 + - _StencilRef: 1 + - _StraightAlphaInput: 1 + - _ThresholdEnd: 0.25 + - _Use8Neighbourhood: 1 + m_Colors: + - _OutlineColor: {r: 1, g: 1, b: 0, a: 1} + m_BuildTextureStacks: [] 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/common_dec_2_material.mat.meta new file mode 100644 index 000000000..de640f923 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6cc0c9a6b6902dd4190972a0bbc44dc5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: 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/common_dec_2_skeletondata.asset new file mode 100644 index 000000000..32a93f2f5 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset @@ -0,0 +1,31 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} + m_Name: common_dec_2_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 9548220e18f7da74b9814a09dd4cf6b7, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: ac53dcec7ccde62429bdb02cb9cd966e, type: 3} + isUpgradingBlendModeMaterials: 0 + blendModeMaterials: + requiresBlendModeMaterials: 0 + applyAdditiveMaterial: 0 + additiveMaterials: [] + multiplyMaterials: [] + screenMaterials: [] + skeletonDataModifiers: [] + fromAnimation: [] + toAnimation: [] + duration: [] + defaultMix: 0.2 + controller: {fileID: 0} 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/common_dec_2_skeletondata.asset.meta new file mode 100644 index 000000000..e3b4c4044 --- /dev/null +++ b/Assets/arts/spines/ui/ui_main_button_2/common_dec_2_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2250f0115fc09047a40c1698e86bf56 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.atlas.txt b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.atlas.txt index ca21dc3bd..617dc0925 100644 --- a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.atlas.txt +++ b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.atlas.txt @@ -2,24 +2,17 @@ ui_reward_1.png size:2048,2048 filter:Linear,Linear 16 -bounds:543,972,104,120 +bounds:543,737,104,120 offsets:12,0,128,128 17 -bounds:2,769,539,566 +bounds:2,534,539,566 g -bounds:504,474,293,28 +bounds:2,2,293,28 offsets:18,2,327,32 -rotate:90 g31 -bounds:543,1094,256,241 +bounds:543,859,256,241 offsets:22,30,300,300 -guangdian -bounds:2,2,14,19 -offsets:0,0,15,20 -guanghuan -bounds:2,23,253,242 -offsets:1,3,256,256 quan -bounds:2,267,500,500 +bounds:2,32,500,500 xx1 -bounds:801,1312,17,23 +bounds:504,509,17,23 diff --git a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.png b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.png index e99c454b1..4a11b87dd 100644 Binary files a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.png and b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.png differ diff --git a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.skel.bytes b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.skel.bytes index 043ba1bc5..603c53c39 100644 Binary files a/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.skel.bytes and b/Assets/arts/spines/ui/ui_reward_get/ui_reward_1.skel.bytes differ diff --git a/Assets/lua/app/config/chapter.lua.bytes b/Assets/lua/app/config/chapter.lua.bytes index f8e5de22b..b18fa46bc 100644 Binary files a/Assets/lua/app/config/chapter.lua.bytes and b/Assets/lua/app/config/chapter.lua.bytes differ diff --git a/Assets/lua/app/module/battle/battle_const.lua.bytes b/Assets/lua/app/module/battle/battle_const.lua.bytes index 85a9a06de..32876b810 100644 Binary files a/Assets/lua/app/module/battle/battle_const.lua.bytes and b/Assets/lua/app/module/battle/battle_const.lua.bytes differ diff --git a/Assets/lua/app/ui/battle/battle_ui.lua.bytes b/Assets/lua/app/ui/battle/battle_ui.lua.bytes index 02171e4ef..5c863c16d 100644 Binary files a/Assets/lua/app/ui/battle/battle_ui.lua.bytes and b/Assets/lua/app/ui/battle/battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index d24bfd4bf..10dbc8635 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index a7c928202..99a1178d6 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: 2ca4456d9bff9a045a7ecc78c6fdd076, type: 2} + objectReference: {fileID: 11400000, guid: e2250f0115fc09047a40c1698e86bf56, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5