diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt index 20729924c..dd76cd5da 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt @@ -2,226 +2,218 @@ ui_act_boss_rush_pop.png size:2048,2048 filter:Linear,Linear Combined Powerful Flash FX Pack 28 Color/1_00000 -bounds:196,417,188,120 +bounds:431,826,188,120 offsets:49,26,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00001 -bounds:909,1294,188,120 +bounds:425,704,188,120 offsets:49,26,300,169 Combined Powerful Flash FX Pack 28 Color/1_00002 -bounds:343,656,192,116 +bounds:1090,1780,192,116 offsets:46,28,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00003 -bounds:1385,1797,192,117 +bounds:227,603,192,117 offsets:45,26,300,169 Combined Powerful Flash FX Pack 28 Color/1_00004 -bounds:910,1416,183,123 +bounds:2,4,183,123 offsets:46,25,300,169 rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00005 -bounds:656,1054,177,123 +bounds:852,1412,177,123 offsets:46,22,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00006 -bounds:1581,1832,178,117 +bounds:852,1293,178,117 offsets:46,22,300,169 Combined Powerful Flash FX Pack 28 Color/1_00007 -bounds:1035,1416,183,117 +bounds:868,1537,183,117 offsets:44,23,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00008 -bounds:584,674,187,117 +bounds:421,585,187,117 offsets:45,23,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00009 -bounds:461,672,189,121 +bounds:1713,1925,189,121 offsets:45,22,300,169 -rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00010 -bounds:1385,1916,194,120 +bounds:2,189,194,120 offsets:46,23,300,169 +rotate:90 Combined Powerful Flash FX Pack 28 Color/1_00011 -bounds:431,863,196,136 +bounds:227,722,196,136 offsets:46,23,300,169 -fire -bounds:2,579,186,269 -offsets:2,2,190,272 fu_1 -bounds:656,963,89,109 +bounds:641,954,89,109 offsets:1,1,92,111 -rotate:90 fu_10 -bounds:1858,1996,36,32 +bounds:155,388,36,32 offsets:1,1,38,34 -rotate:90 fu_11 -bounds:907,1197,168,95 +bounds:416,488,168,95 offsets:1,1,170,97 fu_12 -bounds:907,1100,168,95 +bounds:1053,1683,168,95 offsets:1,1,170,97 fu_13 -bounds:2,323,254,148 +bounds:1090,1898,254,148 offsets:1,1,258,151 -rotate:90 fu_14 -bounds:1090,1805,176,231 +bounds:690,1563,176,231 offsets:2,1,196,249 fu_15 -bounds:190,607,151,241 +bounds:2,385,151,241 offsets:2,1,154,247 fu_2 -bounds:1099,1303,90,111 +bounds:1581,1802,90,111 offsets:2,1,93,113 fu_3 -bounds:1729,1748,143,71 +bounds:1284,1753,143,71 offsets:1,1,145,73 +rotate:90 fu_4 -bounds:900,1009,159,89 +bounds:325,442,159,89 offsets:1,1,161,91 +rotate:90 fu_5 -bounds:2,11,138,125 +bounds:1904,1921,138,125 offsets:1,1,140,127 fu_6 -bounds:769,1299,138,125 +bounds:1053,1556,138,125 offsets:1,1,140,127 fu_7 -bounds:152,332,42,39 +bounds:124,189,42,39 offsets:1,1,44,41 fu_8 -bounds:390,453,53,30 +bounds:124,330,53,30 offsets:1,1,55,32 rotate:90 fu_9 -bounds:629,937,26,24 +bounds:681,1217,26,24 offsets:1,1,28,26 -rotate:90 guang_1 -bounds:152,373,204,42 +bounds:155,422,204,42 offsets:5,2,210,45 rotate:90 guang_2 -bounds:2,138,183,138 +bounds:868,1656,183,138 offsets:5,1,189,142 -rotate:90 guang_3 -bounds:1581,1951,259,44 +bounds:806,1302,259,44 offsets:1,1,263,46 +rotate:90 guang_4 -bounds:431,1001,223,230 +bounds:2,628,223,230 offsets:1,1,230,235 guang_5 -bounds:690,1315,291,77 +bounds:690,1270,291,77 offsets:2,1,294,79 rotate:90 lian_1 -bounds:196,361,54,58 +bounds:1844,1869,54,58 rotate:90 lian_1_1 -bounds:420,539,46,46 +bounds:127,141,46,46 lian_2 -bounds:256,361,54,58 -rotate:90 +bounds:1223,1720,54,58 lian_2_1 -bounds:827,960,48,48 +bounds:124,280,48,48 lian_3 -bounds:767,954,54,58 -rotate:90 +bounds:1972,1861,54,58 lian_3_1 -bounds:248,311,48,48 +bounds:124,230,48,48 long_1 -bounds:1892,1997,41,39 +bounds:127,100,41,39 offsets:1,1,43,41 long_10 -bounds:690,1608,248,176 +bounds:431,1065,248,176 long_13 -bounds:1268,1828,115,208 +bounds:431,948,115,208 +rotate:90 long_15 -bounds:2,850,427,381 +bounds:2,860,427,381 long_16 -bounds:1761,1821,103,128 +bounds:1476,1777,103,128 offsets:1,1,105,130 long_18 -bounds:781,1139,124,158 +bounds:199,443,124,158 long_2 -bounds:629,965,25,34 +bounds:690,1243,25,34 offsets:1,1,28,36 +rotate:90 long_20 -bounds:769,1426,180,139 -rotate:90 +bounds:1346,1907,180,139 long_21 -bounds:940,1601,183,131 -rotate:90 +bounds:1528,1915,183,131 long_3 -bounds:758,1273,24,21 +bounds:1357,1755,24,21 offsets:1,1,26,23 -rotate:90 long_4 -bounds:1729,1724,28,22 +bounds:1193,1659,28,22 offsets:1,1,30,24 long_5 -bounds:1579,1724,148,106 +bounds:416,380,148,106 offsets:1,1,150,109 long_6 -bounds:318,508,100,77 +bounds:1742,1846,100,77 offsets:1,1,102,79 long_7 -bounds:318,421,70,85 +bounds:1742,1774,70,85 offsets:1,1,73,87 +rotate:90 long_8 -bounds:781,1010,117,127 +bounds:1357,1778,117,127 offsets:1,1,119,129 long_9 -bounds:343,587,67,104 +bounds:1673,1809,67,104 offsets:1,1,70,106 -rotate:90 pingmu -bounds:690,1786,398,250 +bounds:690,1796,398,250 xian_1 -bounds:2,2,68,7 +bounds:199,434,68,7 offsets:1,1,70,9 xian_10 -bounds:461,667,88,3 +bounds:621,858,88,3 offsets:1,1,90,5 +rotate:90 xian_9 -bounds:461,667,88,3 +bounds:621,858,88,3 offsets:1,1,90,5 +rotate:90 xian_2 -bounds:431,854,28,7 +bounds:769,1277,28,7 offsets:1,1,30,9 xian_3 -bounds:1090,1799,60,4 +bounds:615,764,60,4 offsets:1,1,62,6 +rotate:90 xian_4 -bounds:1268,1819,70,7 +bounds:1031,1465,70,7 offsets:1,1,72,9 +rotate:90 xian_5 -bounds:1729,1826,30,4 +bounds:425,828,30,4 offsets:1,1,32,6 +rotate:90 xian_6 -bounds:1077,1245,47,4 +bounds:586,536,47,4 offsets:1,1,49,6 rotate:90 xian_7 -bounds:142,193,128,2 +bounds:1053,1552,128,2 offsets:1,1,130,4 -rotate:90 xian_8 -bounds:1581,2034,308,2 +bounds:2044,1738,308,2 offsets:1,1,310,4 +rotate:90 xiaoguo_1 -bounds:1581,1997,275,35 +bounds:769,1286,275,35 offsets:1,1,277,37 +rotate:90 yaogan_1 -bounds:690,1247,66,66 +bounds:1904,1853,66,66 offsets:1,1,68,68 yaogan_2 -bounds:196,322,37,50 +bounds:1223,1681,37,50 rotate:90 youxiji -bounds:2,1233,686,803 +bounds:2,1243,686,803 offsets:7,5,700,813 youxiji_1 -bounds:877,982,26,20 -rotate:90 +bounds:199,606,26,20 diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta index 7d1c523cd..bd8de728a 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.atlas.txt.meta @@ -3,5 +3,5 @@ guid: 8f4885c066060b44fa9c2ce5531a7737 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png index 107d2163f..1fbad2c9d 100644 Binary files a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png and b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png differ diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta index 9c664ccd9..6d24363c8 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.png.meta @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes index 400fb517e..4c9577331 100644 Binary files a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes and b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta index 3c942ee6d..40536c14d 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop.skel.bytes.meta @@ -3,5 +3,5 @@ guid: 72694d3419feb50418b8d2e0541edff8 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta index ae6d052c1..2bb823b8d 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_atlas.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat index 14e9dec8d..800f5c5be 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat @@ -9,7 +9,7 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: ui_act_boss_rush_pop_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} - m_ShaderKeywords: _USE8NEIGHBOURHOOD_ON + m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -32,7 +32,7 @@ Material: - _OutlineWidth: 3 - _StencilComp: 8 - _StencilRef: 1 - - _StraightAlphaInput: 0 + - _StraightAlphaInput: 1 - _ThresholdEnd: 0.25 - _Use8Neighbourhood: 1 m_Colors: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta index 912c95fae..3e0393471 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_material.mat.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta index be9138b9c..877f13ab1 100644 --- a/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_act_boss_rush_pop/ui_act_boss_rush_pop_skeletondata.asset.meta @@ -4,5 +4,5 @@ NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_act_boss_rush_pop.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab index 05fae102f..9e1458677 100644 --- a/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab +++ b/Assets/prefabs/ui/activity/act_boss_rush/act_boss_rush_pop_ui.prefab @@ -1089,6 +1089,10 @@ PrefabInstance: propertyPath: m_Name value: ui_spine_obj objectReference: {fileID: 0} + - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + propertyPath: startingLoop + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: