diff --git a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs index 5e629dd42..8b4798c49 100644 --- a/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs +++ b/Assets/Editor/BFResourceTools/FontTools/TMPTools.cs @@ -27,6 +27,7 @@ namespace BFEditor.Resource private const string AssetDefaultName = "font_sdf.asset"; private const string AssetNumberName = "font_number_sdf.asset"; private const string AssetBattleName = "font_battle_sdf.asset"; + private const string AssetThaiName = "font_thai_sdf.asset"; private const string DevStrPath = "Assets/Editor/BFResourceTools/FontTools/cn_3900.txt"; private const string CommonCNWordsPath = "Assets/Editor/BFResourceTools/FontTools/cn_1200.txt"; @@ -153,6 +154,10 @@ namespace BFEditor.Resource var defaultNumberFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/default/tmpfont/font_number.TTF"); GenTMPFontAsset(defaultNumberFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/default/tmpfont", "Assets/arts/fonts/tmpfonts/default/tmpfont", 256, new List()), AssetNumberName, isdevelop); + // 泰语 + var thaiFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf"); + GenTMPFontAsset(thaiFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/default/tmpfont", "Assets/arts/fonts/tmpfonts/default/tmpfont", 512, new List()), AssetThaiName, isdevelop); + // 战斗用 // var battleFont = AssetDatabase.LoadAssetAtPath("Assets/arts/fonts/tmpfonts/battle/font_battle.ttf"); // GenTMPFontAsset(battleFont, new TTFInfo("cn", "Assets/arts/fonts/tmpfonts/battle", "Assets/arts/fonts/tmpfonts/battle", 1024, new List()), AssetBattleName, isdevelop); diff --git a/Assets/arts/atlas/icon/item.asset b/Assets/arts/atlas/icon/item.asset index 27a0c41e6..912e47484 100644 --- a/Assets/arts/atlas/icon/item.asset +++ b/Assets/arts/atlas/icon/item.asset @@ -26,6 +26,7 @@ MonoBehaviour: - {fileID: 21300000, guid: ba1761b9d0cc0ef459a097b85aa5fb0e, type: 3} - {fileID: 21300000, guid: 52da05fc5df88be4d8a092e24ccfa7fb, type: 3} - {fileID: 21300000, guid: aa7c9f96716003c4485ce5ca09f9d43c, type: 3} + - {fileID: 21300000, guid: 058b4d8ac288fb449832a5f2c857a3d0, type: 3} - {fileID: 21300000, guid: 47ae10e0dd6dda049902d8d63f6efb57, type: 3} - {fileID: 21300000, guid: 3c09c3571cc8aff4fbaee4765d7f856f, type: 3} - {fileID: 21300000, guid: fea4f86213a880344bcffd2308591e61, type: 3} @@ -41,4 +42,4 @@ MonoBehaviour: - {fileID: 21300000, guid: 899882c0d56e96d4caf5d82d2b469729, type: 3} - {fileID: 21300000, guid: 91e9e926c6246844aba4b734caefb6f9, type: 3} - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} - spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600004006000033000000340000003500000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 + spriteNameList: 310000001f060000200600002106000022060000230600002406000025060000260600002706000028060000320000003e0600003f0600004006000033000000340000003500000036000000370000003800000039000000df0dcedbe00dcedbe10dcedbe20dcedbe30dcedb7ef2dcef0e84dc76 diff --git a/Assets/arts/atlas/icon/item.spriteatlas b/Assets/arts/atlas/icon/item.spriteatlas index 84a63e014..b232be09b 100644 --- a/Assets/arts/atlas/icon/item.spriteatlas +++ b/Assets/arts/atlas/icon/item.spriteatlas @@ -81,6 +81,7 @@ SpriteAtlas: - {fileID: 21300000, guid: 722f59a716d237e4e819cfee2def9297, type: 3} - {fileID: 21300000, guid: ba1761b9d0cc0ef459a097b85aa5fb0e, type: 3} - {fileID: 21300000, guid: 5ed6e17a993d25c41954d1945fd860da, type: 3} + - {fileID: 21300000, guid: 058b4d8ac288fb449832a5f2c857a3d0, type: 3} - {fileID: 21300000, guid: ca105ffa7d9ffc347a89f665c9e3c5e5, type: 3} - {fileID: 21300000, guid: d4b21efb128aa8f4093adba3d467d268, type: 3} - {fileID: 21300000, guid: 236fd81c35a9c1a4ca098eeeddd1821b, type: 3} @@ -110,6 +111,7 @@ SpriteAtlas: - 13 - 19 - 16 + - 21 - 1 - frame_select - frame_2 diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset index 9347a1e8a..77c886364 100644 --- a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset @@ -113,7 +113,8 @@ MonoBehaviour: m_FontFeatureTable: m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] - m_FallbackFontAssetTable: [] + m_FallbackFontAssetTable: + - {fileID: 11400000, guid: fb372181bb5896149b689946854b5451, type: 2} m_CreationSettings: sourceFontFileName: sourceFontFileGUID: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf new file mode 100644 index 000000000..576d3b976 Binary files /dev/null and b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf differ diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta new file mode 100644 index 000000000..c203a8dd2 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai.ttf.meta @@ -0,0 +1,21 @@ +fileFormatVersion: 2 +guid: adf03298474858443a8a36a21a9a0d7d +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontNames: + - Mitr + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset new file mode 100644 index 000000000..31b451d37 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset @@ -0,0 +1,135 @@ +%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: 71c1514a6bd24e1e882cebbe1904ce04, type: 3} + m_Name: font_thai_sdf + m_EditorClassIdentifier: + hashCode: 0 + material: {fileID: 0} + materialHashCode: -2006316128 + m_Version: 1.1.0 + m_SourceFontFileGUID: adf03298474858443a8a36a21a9a0d7d + m_SourceFontFile_EditorRef: {fileID: 12800000, guid: adf03298474858443a8a36a21a9a0d7d, type: 3} + m_SourceFontFile: {fileID: 12800000, guid: adf03298474858443a8a36a21a9a0d7d, type: 3} + m_AtlasPopulationMode: 1 + m_FaceInfo: + m_FaceIndex: 0 + m_FamilyName: Mitr + m_StyleName: Regular + m_PointSize: 32 + m_Scale: 1 + m_LineHeight: 50.24 + m_AscentLine: 36.8 + m_CapLine: 22 + m_MeanLine: 16 + m_Baseline: 0 + m_DescentLine: -13.44 + m_SuperscriptOffset: 36.8 + m_SuperscriptSize: 0.5 + m_SubscriptOffset: -13.44 + m_SubscriptSize: 0.5 + m_UnderlineOffset: -3.2 + m_UnderlineThickness: 1.6 + m_StrikethroughOffset: 6.4 + m_StrikethroughThickness: 1.6 + m_TabWidth: 12 + m_GlyphTable: [] + m_CharacterTable: [] + m_AtlasTextures: + - {fileID: 0} + m_AtlasTextureIndex: 0 + m_IsMultiAtlasTexturesEnabled: 1 + m_ClearDynamicDataOnBuild: 0 + m_UsedGlyphRects: [] + m_FreeGlyphRects: + - m_X: 0 + m_Y: 0 + m_Width: 511 + m_Height: 511 + m_fontInfo: + Name: + PointSize: 0 + Scale: 0 + CharacterCount: 0 + LineHeight: 0 + Baseline: 0 + Ascender: 0 + CapHeight: 0 + Descender: 0 + CenterLine: 0 + SuperscriptOffset: 0 + SubscriptOffset: 0 + SubSize: 0 + Underline: 0 + UnderlineThickness: 0 + strikethrough: 0 + strikethroughThickness: 0 + TabWidth: 0 + Padding: 0 + AtlasWidth: 0 + AtlasHeight: 0 + atlas: {fileID: 0} + m_AtlasWidth: 512 + m_AtlasHeight: 512 + m_AtlasPadding: 4 + m_AtlasRenderMode: 4165 + m_glyphInfoList: [] + m_KerningTable: + kerningPairs: [] + m_FontFeatureTable: + m_GlyphPairAdjustmentRecords: [] + fallbackFontAssets: [] + m_FallbackFontAssetTable: [] + m_CreationSettings: + sourceFontFileName: + sourceFontFileGUID: + pointSizeSamplingMode: 0 + pointSize: 0 + padding: 0 + packingMode: 0 + atlasWidth: 0 + atlasHeight: 0 + characterSetSelectionMode: 0 + characterSequence: + referencedFontAssetGUID: + referencedTextAssetGUID: + fontStyle: 0 + fontStyleModifier: 0 + renderMode: 0 + includeFontFeatures: 0 + m_FontWeightTable: + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + - regularTypeface: {fileID: 0} + italicTypeface: {fileID: 0} + fontWeights: [] + normalStyle: 0 + normalSpacingOffset: 0 + boldStyle: 0.75 + boldSpacing: 7 + italicStyle: 35 + tabSize: 10 diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta new file mode 100644 index 000000000..9a579dcef --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fb372181bb5896149b689946854b5451 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat new file mode 100644 index 000000000..8ed75587d --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat @@ -0,0 +1,63 @@ +%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: font_thai_sdf + m_Shader: {fileID: 4800000, guid: fe393ace9b354375a9cb14cdbbc28be4, type: 3} + m_ShaderKeywords: + 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: ad77093c9c58b98478cfc65f8d51fb75, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _ColorMask: 15 + - _CullMode: 0 + - _FaceDilate: 0 + - _GradientScale: 5 + - _MaskSoftnessX: 0 + - _MaskSoftnessY: 0 + - _OutlineSoftness: 0 + - _OutlineWidth: 0 + - _PerspectiveFilter: 0.875 + - _ScaleRatioA: 1 + - _ScaleRatioB: 1 + - _ScaleRatioC: 1 + - _ScaleX: 1 + - _ScaleY: 1 + - _ShaderFlags: 0 + - _Sharpness: 0 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _TextureHeight: 512 + - _TextureWidth: 512 + - _UnderlayDilate: 0 + - _UnderlayOffsetX: 0 + - _UnderlayOffsetY: 0 + - _UnderlaySoftness: 0 + - _VertexOffsetX: 0 + - _VertexOffsetY: 0 + - _WeightBold: 0.75 + - _WeightNormal: 0 + m_Colors: + - _ClipRect: {r: -32767, g: -32767, b: 32767, a: 32767} + - _FaceColor: {r: 1, g: 1, b: 1, a: 1} + - _OutlineColor: {r: 0, g: 0, b: 0, a: 1} + - _UnderlayColor: {r: 0, g: 0, b: 0, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta new file mode 100644 index 000000000..ae15916ec --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f0d1f997c8424a47a8c1568cc71c466 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset new file mode 100644 index 000000000..0d9c2a019 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset @@ -0,0 +1,49 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!28 &2800000 +Texture2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: font_thai_sdf_atlas + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 2 + m_Width: 0 + m_Height: 0 + m_CompleteImageSize: 0 + m_MipsStripped: 0 + m_TextureFormat: 1 + m_MipCount: 1 + m_IsReadable: 1 + m_IsPreProcessed: 0 + m_IgnoreMasterTextureLimit: 0 + m_StreamingMipmaps: 0 + m_StreamingMipmapsPriority: 0 + m_VTOnly: 0 + m_AlphaIsTransparency: 0 + m_ImageCount: 1 + m_TextureDimension: 2 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 1 + m_MipBias: 0 + m_WrapU: 0 + m_WrapV: 0 + m_WrapW: 0 + m_LightmapFormat: 0 + m_ColorSpace: 0 + m_PlatformBlob: + image data: 0 + _typelessdata: + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta new file mode 100644 index 000000000..5b791dc88 --- /dev/null +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_thai_sdf_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad77093c9c58b98478cfc65f8d51fb75 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2800000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner.meta new file mode 100644 index 000000000..0fc033321 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0bac39f4e7aef724eb723d5108009d28 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt new file mode 100644 index 000000000..e9e973f25 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt @@ -0,0 +1,159 @@ +ui_arena_bounty_banner.png +size:2048,2048 +filter:Linear,Linear +bj +bounds:2,1679,1315,359 +offsets:1,1,1317,361 +dian +bounds:2026,2026,12,12 +offsets:1,1,13,13 +dian2 +bounds:1301,1665,12,12 +offsets:1,1,13,13 +heimei_1 +bounds:2,4,23,21 +offsets:1,1,26,23 +heimei_10 +bounds:648,1189,42,38 +offsets:0,0,45,45 +rotate:90 +heimei_11 +bounds:670,1388,114,134 +offsets:1,1,116,136 +rotate:90 +heimei_12 +bounds:336,995,50,34 +offsets:1,1,52,36 +rotate:90 +heimei_13 +bounds:91,564,89,70 +offsets:1,1,91,72 +heimei_14 +bounds:1977,1804,100,45 +rotate:90 +heimei_15 +bounds:627,1233,65,56 +rotate:90 +heimei_16 +bounds:95,709,80,114 +rotate:90 +heimei_2 +bounds:806,1397,23,21 +offsets:1,1,26,23 +heimei_3 +bounds:91,523,39,50 +rotate:90 +heimei_4 +bounds:812,1501,130,100 +offsets:1,1,132,102 +heimei_5 +bounds:2,178,162,115 +rotate:90 +heimei_6 +bounds:939,1424,71,87 +rotate:90 +heimei_7 +bounds:107,478,43,34 +offsets:1,1,45,36 +rotate:90 +heimei_8 +bounds:670,1309,80,77 +offsets:1,1,82,79 +heimei_9 +bounds:944,1540,131,74 +vs +bounds:91,636,104,71 +offsets:1,1,106,73 +x1 +bounds:920,1616,379,61 +offsets:0,1,379,63 +x2 +bounds:1670,1809,305,95 +x3 +bounds:447,1504,363,97 +x4 +bounds:1670,1906,354,132 +x5 +bounds:1319,1683,342,123 +x6 +bounds:447,1603,471,74 +x7 +bounds:2,738,404,91 +rotate:90 +xian10 +bounds:448,1184,198,47 +offsets:3,2,207,51 +xian11 +bounds:2,1350,443,327 +offsets:1,1,445,329 +xian12 +bounds:1319,1808,349,230 +offsets:1,1,351,232 +xian13 +bounds:2,1144,368,204 +offsets:1,1,370,206 +xian14 +bounds:2,342,178,103 +offsets:2,2,185,107 +rotate:90 +xian3 +bounds:95,978,239,164 +offsets:1,1,241,166 +xian4 +bounds:448,1296,170,85 +offsets:4,4,175,90 +xian5 +bounds:448,1233,177,61 +offsets:5,3,184,65 +xian6 +bounds:447,1383,221,119 +offsets:6,4,228,125 +xian7 +bounds:240,796,180,105 +offsets:1,1,186,108 +rotate:90 +xian8 +bounds:240,796,180,105 +offsets:1,1,186,108 +rotate:90 +xian9 +bounds:806,1420,131,79 +offsets:3,2,137,83 +yangcong_1 +bounds:2,522,214,87 +offsets:1,1,216,89 +rotate:90 +yangcong_10 +bounds:944,1497,41,110 +offsets:1,1,43,112 +rotate:90 +yangcong_11 +bounds:752,1305,81,42 +rotate:90 +yangcong_12 +bounds:2,27,149,138 +rotate:90 +yangcong_2 +bounds:746,1258,43,45 +offsets:1,1,45,47 +yangcong_3 +bounds:336,1047,95,36 +offsets:1,1,97,38 +rotate:90 +yangcong_4 +bounds:620,1300,81,48 +rotate:90 +yangcong_5 +bounds:685,1253,59,54 +offsets:1,1,61,56 +yangcong_6 +bounds:95,791,143,185 +yangcong_7 +bounds:1235,1560,61,54 +offsets:1,1,63,56 +yangcong_8 +bounds:1077,1565,156,49 +offsets:1,1,158,51 +yangcong_9 +bounds:372,1168,180,74 +rotate:90 diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt.meta new file mode 100644 index 000000000..7d67cb9d4 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.atlas.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 546625d9a359bd549aa1ddab7483e2c0 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png new file mode 100644 index 000000000..9f8347137 Binary files /dev/null and b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png differ diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png.meta new file mode 100644 index 000000000..79b5e99bd --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.png.meta @@ -0,0 +1,120 @@ +fileFormatVersion: 2 +guid: 5e4ae24adcb4f5e499cdf3af1363dc08 +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_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes new file mode 100644 index 000000000..28f4858db Binary files /dev/null and b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes differ diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes.meta new file mode 100644 index 000000000..613f385ee --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner.skel.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 946ca3fd30647e64b936ae5d97a240ee +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_atlas.asset b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_atlas.asset new file mode 100644 index 000000000..9628a6114 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_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: ui_arena_bounty_banner_atlas + m_EditorClassIdentifier: + atlasFile: {fileID: 4900000, guid: 546625d9a359bd549aa1ddab7483e2c0, type: 3} + materials: + - {fileID: 2100000, guid: 5475847199a6d124685d97c4fae2bba9, type: 2} diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_atlas.asset.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_atlas.asset.meta new file mode 100644 index 000000000..4e3061e15 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_atlas.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65b6d2c4bb2fe6b4f9609841e367343c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_material.mat b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_material.mat new file mode 100644 index 000000000..ce005943d --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_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: ui_arena_bounty_banner_material + m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} + m_ShaderKeywords: _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: 5e4ae24adcb4f5e499cdf3af1363dc08, 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: 0 + - _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_arena_bounty_banner/ui_arena_bounty_banner_material.mat.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_material.mat.meta new file mode 100644 index 000000000..47839cf92 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_material.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5475847199a6d124685d97c4fae2bba9 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_skeletondata.asset b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_skeletondata.asset new file mode 100644 index 000000000..843334c58 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_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: ui_arena_bounty_banner_skeletondata + m_EditorClassIdentifier: + atlasAssets: + - {fileID: 11400000, guid: 65b6d2c4bb2fe6b4f9609841e367343c, type: 2} + scale: 0.01 + skeletonJSON: {fileID: 4900000, guid: 946ca3fd30647e64b936ae5d97a240ee, 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_arena_bounty_banner/ui_arena_bounty_banner_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_skeletondata.asset.meta new file mode 100644 index 000000000..cd575af29 --- /dev/null +++ b/Assets/arts/spines/ui/ui_arena_bounty_banner/ui_arena_bounty_banner_skeletondata.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7acac897ef5034e408401c9d24a0cd01 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/arts/textures/icon/item/21.png b/Assets/arts/textures/icon/item/21.png new file mode 100644 index 000000000..0b31b02bc Binary files /dev/null and b/Assets/arts/textures/icon/item/21.png differ diff --git a/Assets/arts/textures/icon/item/21.png.meta b/Assets/arts/textures/icon/item/21.png.meta new file mode 100644 index 000000000..3214c5946 --- /dev/null +++ b/Assets/arts/textures/icon/item/21.png.meta @@ -0,0 +1,132 @@ +fileFormatVersion: 2 +guid: 058b4d8ac288fb449832a5f2c857a3d0 +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: 1 + 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: 8 + 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 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 12 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/prefabs/ui/arena/bounty_main_ui.prefab b/Assets/prefabs/ui/arena/bounty_main_ui.prefab index e82de997a..2123c523a 100644 --- a/Assets/prefabs/ui/arena/bounty_main_ui.prefab +++ b/Assets/prefabs/ui/arena/bounty_main_ui.prefab @@ -2474,7 +2474,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -235} + m_AnchoredPosition: {x: 0, y: -150} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2382309514596048512 @@ -2505,7 +2505,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - skeletonDataAsset: {fileID: 11400000, guid: c131780bfdc98154ba12a567d7d1033c, type: 2} + skeletonDataAsset: {fileID: 11400000, guid: 7acac897ef5034e408401c9d24a0cd01, type: 2} additiveMaterial: {fileID: 0} multiplyMaterial: {fileID: 0} screenMaterial: {fileID: 0} @@ -3826,7 +3826,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 514.9996} + m_AnchoredPosition: {x: 0, y: 564.9992} m_SizeDelta: {x: 1280, y: 200} m_Pivot: {x: 0.5, y: 1} --- !u!1 &7899316638467391510