From 5b92d350e68311b1283c8f8b5cca638e51b166c2 Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 2 Jun 2023 22:14:35 +0800 Subject: [PATCH] =?UTF-8?q?=E7=89=B9=E6=95=88=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ui/{ui_level up.meta => ui_level_up.meta} | 0 .../ui_level_up.atlas.txt} | 2 +- .../ui_level_up.atlas.txt.meta} | 4 ++-- .../ui_level_up.png} | Bin .../ui_level_up.png.meta} | 4 ++-- .../ui_level_up.skel.bytes} | Bin 21055 -> 20998 bytes .../ui_level_up.skel.bytes.meta} | 4 ++-- .../ui_level_up_atlas.asset} | 6 +++--- .../ui_level_up_atlas.asset.meta} | 4 ++-- .../ui_level_up_material.mat} | 4 ++-- .../ui_level_up_material.mat.meta} | 4 ++-- .../ui_level_up_skeletondata.asset} | 6 +++--- .../ui_level_up_skeletondata.asset.meta} | 4 ++-- .../ui/player/player_level_up_ui.prefab | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) rename Assets/arts/spines/ui/{ui_level up.meta => ui_level_up.meta} (100%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.atlas.txt => ui_level_up/ui_level_up.atlas.txt} (93%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.skel.bytes.meta => ui_level_up/ui_level_up.atlas.txt.meta} (52%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.png => ui_level_up/ui_level_up.png} (100%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.png.meta => ui_level_up/ui_level_up.png.meta} (96%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.skel.bytes => ui_level_up/ui_level_up.skel.bytes} (89%) rename Assets/arts/spines/ui/{ui_level up/ui_level up.atlas.txt.meta => ui_level_up/ui_level_up.skel.bytes.meta} (52%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_atlas.asset => ui_level_up/ui_level_up_atlas.asset} (69%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_skeletondata.asset.meta => ui_level_up/ui_level_up_atlas.asset.meta} (59%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_material.mat => ui_level_up/ui_level_up_material.mat} (89%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_material.mat.meta => ui_level_up/ui_level_up_material.mat.meta} (59%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_skeletondata.asset => ui_level_up/ui_level_up_skeletondata.asset} (80%) rename Assets/arts/spines/ui/{ui_level up/ui_level up_atlas.asset.meta => ui_level_up/ui_level_up_skeletondata.asset.meta} (59%) diff --git a/Assets/arts/spines/ui/ui_level up.meta b/Assets/arts/spines/ui/ui_level_up.meta similarity index 100% rename from Assets/arts/spines/ui/ui_level up.meta rename to Assets/arts/spines/ui/ui_level_up.meta diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt b/Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt similarity index 93% rename from Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt index fd92c9fda..bb15f39e9 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt @@ -1,4 +1,4 @@ -ui_level up.png +ui_level_up.png size:1024,1024 filter:Linear,Linear scale:1.17 diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.skel.bytes.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt.meta similarity index 52% rename from Assets/arts/spines/ui/ui_level up/ui_level up.skel.bytes.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt.meta index 1a798eecb..30bdcb07a 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up.skel.bytes.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up.atlas.txt.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: c5f7d1ce9b963f54ab7e67cfee8056da +guid: fff65b955bc226a48918724f367f6af4 TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.png b/Assets/arts/spines/ui/ui_level_up/ui_level_up.png similarity index 100% rename from Assets/arts/spines/ui/ui_level up/ui_level up.png rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.png diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.png.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up.png.meta similarity index 96% rename from Assets/arts/spines/ui/ui_level up/ui_level up.png.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.png.meta index f32b635fc..888a03b34 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up.png.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 5d08184250d416745b2882e04e91dbeb +guid: 9588feaf51024bc4d95877eb4bbf2921 TextureImporter: internalIDToNameTable: [] externalObjects: {} @@ -116,5 +116,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.skel.bytes b/Assets/arts/spines/ui/ui_level_up/ui_level_up.skel.bytes similarity index 89% rename from Assets/arts/spines/ui/ui_level up/ui_level up.skel.bytes rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.skel.bytes index 64bcc21876ae2bcd1fd2215d70bffcf49b19b544..fc34a4f8a749a745dd54eb952c513f462d7ae9db 100644 GIT binary patch delta 1447 zcmeH`O;%b#5QQ%Y2_UGT;vZ;8d>O2_z7Ti;07{DM%l%iWu7hMumO(?$Sk|a zUh-APP2`-=r*7S z*RU99I}74h@T5{iDP>%4iBD-0%z$Y{6qS9Vd}o2*z&_{(T;O*=tK5cdi~qs>bpZmZ2VYu6I}o3&4QQ5}A_TQuv-|4A!w4*w6^9gJbN})t>5%>M_wsMX*Ht zMosxtH^7lv8WJ}_pLL=F=7%mUvh9;7s;yfJTi{Ta8W6X^TX-KogdJl8aEP6dJt7)_ z$EeWL6{}D66}->t=@2^rJLqJ&Luw}|(_`foIe1QPMl<2xtJ?L?UWBmYTWlBe+}S+% zIa+#X=($T)@E7hJ1!VHjx8P1<|4~3Jk8BO*xf2v%HJJAzV;)||YHEaBv+f>vAGC+F z2hP(LdGa~OTIkqBnl}EDY@18gVI9yeZIWf-9oJGF1noP)OgMWfQ{4pcX|5hHi!4 L<8S!8@}>F*`Nn32AcPMCG0KJy0}CXEuq>Of`4T;O@a9QhLQi|K)Upc1gEudh zsgjGO7UhMq^c8#nuLK^$-z@qNR#{X1?|=97%=Aq6JnKe&bR+S5&7~1{BE2nF^p}ejur6CO~38u8AjHc97TH|UUSKx-#@o#BQ6Pg4kvFhlIS{fs^g*4?8 zJpoQI(}4SOmDQZ8n%0bVVe@$AVA}zXSte$*O$r_pc_hcwJk}0#SLHA_3wOX#QXAoz zHadwIJ<8Ez_)@B|Ca(o_o+~YY38LDv@GR&S$@mhHO;wNv7&LGzbd;Ig!}3+;P?rN; zbXIF2+aSqpts{;$LT1BuWFu?%9axdHJ(YNoEyfhLt)i#dwT`!pE@_orcfnnv*W?D! zO@gXmm5odAO~o{zLG_b)ODnobsHFmTh%1Ue%KRX6ac^VWv~F&z$Nq|7%80mO!lRM%hhI0gw=P${i5io?t~aaCuxoZ!{m_&cTC{%!iE_p z{?g_&!lJ@*GeH%iO1f)W8l{2TkL2khaZ zOreeCF>6Zi!Cgj~+PO#ttniF(_^hTPF4ZyBbHN=}q}gYjo=r1~@U(&q#58$^5L4C? z_9nJzaMR3_SViiy0j^W(b?UYX7U8QDvPij2oy@1P!kT5Vr@|&MEE{?)Ufl}Y-+Y8D z!*oABk5ZUc&!Q~~vj`TDdD_;(JBK#k!u-|0t!)}TclmQq4rU(wui-yl!|u|<<==V0 Bpcw!F diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up.skel.bytes.meta similarity index 52% rename from Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up.skel.bytes.meta index 5448f64c7..de02a890f 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up.atlas.txt.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up.skel.bytes.meta @@ -1,7 +1,7 @@ fileFormatVersion: 2 -guid: e9fd1376cdb3834499772d260c0b8355 +guid: a8673eabf0e8f6e41ab1118322cb62ab TextScriptImporter: externalObjects: {} userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset b/Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset similarity index 69% rename from Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset index 589b7e9b1..1ede71792 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset @@ -10,8 +10,8 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} - m_Name: ui_level up_atlas + m_Name: ui_level_up_atlas m_EditorClassIdentifier: - atlasFile: {fileID: 4900000, guid: e9fd1376cdb3834499772d260c0b8355, type: 3} + atlasFile: {fileID: 4900000, guid: fff65b955bc226a48918724f367f6af4, type: 3} materials: - - {fileID: 2100000, guid: 4af516bd47be79a4b92e0e66b4f0c521, type: 2} + - {fileID: 2100000, guid: c8ee681fb2d775a469896d7d293fbc6d, type: 2} diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset.meta similarity index 59% rename from Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset.meta index ee47b6d92..fcf35e25d 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_atlas.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 030238a8c975d0148bb770c66465043a +guid: a130d5112c4bb024b970965d2789c8b8 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_material.mat b/Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat similarity index 89% rename from Assets/arts/spines/ui/ui_level up/ui_level up_material.mat rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat index 93edbc162..1b2bea310 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_material.mat +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: ui_level up_material + m_Name: ui_level_up_material m_Shader: {fileID: 4800000, guid: b2f91ac81daca8e4392188a2ba68c1e3, type: 3} m_ShaderKeywords: _STRAIGHT_ALPHA_INPUT _USE8NEIGHBOURHOOD_ON m_LightmapFlags: 4 @@ -20,7 +20,7 @@ Material: serializedVersion: 3 m_TexEnvs: - _MainTex: - m_Texture: {fileID: 2800000, guid: 5d08184250d416745b2882e04e91dbeb, type: 3} + m_Texture: {fileID: 2800000, guid: 9588feaf51024bc4d95877eb4bbf2921, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_material.mat.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat.meta similarity index 59% rename from Assets/arts/spines/ui/ui_level up/ui_level up_material.mat.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat.meta index a160298b5..68c9b53e4 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_material.mat.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_material.mat.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 4af516bd47be79a4b92e0e66b4f0c521 +guid: c8ee681fb2d775a469896d7d293fbc6d NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset b/Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset similarity index 80% rename from Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset index f1c543265..b91e6dde4 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_skeletondata.asset +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset @@ -10,12 +10,12 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f1b3b4b945939a54ea0b23d3396115fb, type: 3} - m_Name: ui_level up_skeletondata + m_Name: ui_level_up_skeletondata m_EditorClassIdentifier: atlasAssets: - - {fileID: 11400000, guid: 47f81bdee22ee8a40a39433006e2f43f, type: 2} + - {fileID: 11400000, guid: a130d5112c4bb024b970965d2789c8b8, type: 2} scale: 0.01 - skeletonJSON: {fileID: 4900000, guid: c5f7d1ce9b963f54ab7e67cfee8056da, type: 3} + skeletonJSON: {fileID: 4900000, guid: a8673eabf0e8f6e41ab1118322cb62ab, type: 3} isUpgradingBlendModeMaterials: 0 blendModeMaterials: requiresBlendModeMaterials: 0 diff --git a/Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset.meta b/Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset.meta similarity index 59% rename from Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset.meta rename to Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset.meta index 8ea5dc6a9..d5a86ae34 100644 --- a/Assets/arts/spines/ui/ui_level up/ui_level up_atlas.asset.meta +++ b/Assets/arts/spines/ui/ui_level_up/ui_level_up_skeletondata.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 47f81bdee22ee8a40a39433006e2f43f +guid: 2863acf908db4d247abf2cf145a99731 NativeFormatImporter: externalObjects: {} mainObjectFileID: 11400000 userData: - assetBundleName: arts/spines/ui/ui_level up.ab + assetBundleName: assetBundleVariant: diff --git a/Assets/prefabs/ui/player/player_level_up_ui.prefab b/Assets/prefabs/ui/player/player_level_up_ui.prefab index 0b44d8ab8..77356868b 100644 --- a/Assets/prefabs/ui/player/player_level_up_ui.prefab +++ b/Assets/prefabs/ui/player/player_level_up_ui.prefab @@ -1527,7 +1527,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 030238a8c975d0148bb770c66465043a, type: 2} + objectReference: {fileID: 11400000, guid: 2863acf908db4d247abf2cf145a99731, type: 2} - target: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: m_Pivot.x value: 0.5