diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas index 7bbcaa19..2ab4e54d 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_弹窗.spriteatlas @@ -81,55 +81,17 @@ SpriteAtlas: - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3} - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3} - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3} + - {fileID: 21300000, guid: fd93931e86ca40445a92b4f2074f37ac, type: 3} - {fileID: 21300000, guid: c5d12f560ea2ef24b863f3329fe54030, type: 3} - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3} - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - e2f0e310f699dd1499e93cb07a0a3198: 21300000 - - 3b8788a5800321a4498485a85c170fc0: 21300000 - - 1ae1cec5530a6cd44b0d31ea027ebcf1: 21300000 - - c5d12f560ea2ef24b863f3329fe54030: 21300000 - - e0932649c675784419f71913a849d5f2: 21300000 - - 2cfbfa89505825949b3cec3b48d323a6: 21300000 - - 9c5e0e9bd6ee88c4597788568c620662: 21300000 - - 321bf3fcbdc862a46bc384367d7fbe90: 21300000 - - 0f15acdd90c87fe47beedadca47e7010: 21300000 - - d54d40edf100af147a5223de2f881ca3: 21300000 - - af50fc7eee516a645b09aa8f79017aaa: 21300000 - - 464e18bfd9c3d5e4b927c13ec9def492: 21300000 - - d2ee8cbf34c48214688c60c2fadf0e8e: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: e2f0e310f699dd1499e93cb07a0a3198, type: 3} - - {fileID: 21300000, guid: 3b8788a5800321a4498485a85c170fc0, type: 3} - - {fileID: 21300000, guid: 1ae1cec5530a6cd44b0d31ea027ebcf1, type: 3} - - {fileID: 21300000, guid: c5d12f560ea2ef24b863f3329fe54030, type: 3} - - {fileID: 21300000, guid: e0932649c675784419f71913a849d5f2, type: 3} - - {fileID: 21300000, guid: 2cfbfa89505825949b3cec3b48d323a6, type: 3} - - {fileID: 21300000, guid: 9c5e0e9bd6ee88c4597788568c620662, type: 3} - - {fileID: 21300000, guid: 321bf3fcbdc862a46bc384367d7fbe90, type: 3} - - {fileID: 21300000, guid: 0f15acdd90c87fe47beedadca47e7010, type: 3} - - {fileID: 21300000, guid: d54d40edf100af147a5223de2f881ca3, type: 3} - - {fileID: 21300000, guid: af50fc7eee516a645b09aa8f79017aaa, type: 3} - - {fileID: 21300000, guid: 464e18bfd9c3d5e4b927c13ec9def492, type: 3} - - {fileID: 21300000, guid: d2ee8cbf34c48214688c60c2fadf0e8e, type: 3} - m_PackedSpriteNamesToIndex: - - xs_k - - MC - - DZ_icon - - jinshouzhi - - NL_box 2 - - qz_jr - - NL_box_1 - - gx - - LWTC_d_box - - TXK - - MC_jr - - NL_box - - NL_box 1 + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u5F39\u7A97" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas index 597638e6..199cdeff 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_抖音礼物图_Dy.spriteatlas @@ -74,42 +74,18 @@ SpriteAtlas: - {fileID: 21300000, guid: 6e5fddbf1f5ca3f4c80f68feeac293fa, type: 3} - {fileID: 21300000, guid: 221527fce6ae996489ca2c7e01d0d678, type: 3} - {fileID: 21300000, guid: 9a8f35849df73bf4a8a841de4e70b699, type: 3} - - {fileID: 21300000, guid: 71b615b93291b324ca18162473870d2a, type: 3} - - {fileID: 21300000, guid: f7c47b4f3b4ef04459d62f909f2e12c8, type: 3} - {fileID: 21300000, guid: d4c3de2ca85632b40b3e8d9884a94100, type: 3} + - {fileID: 21300000, guid: f28891cd97d1b1d4c995209dc870e427, type: 3} + - {fileID: 21300000, guid: c0d49da3c50e364499817c8cde4829b7, type: 3} - {fileID: 21300000, guid: 7373de00561941343896c4e69e43436d, type: 3} - {fileID: 21300000, guid: 260213ab1aa2dc34aa3f84761eb07316, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - 7373de00561941343896c4e69e43436d: 21300000 - - 9a8f35849df73bf4a8a841de4e70b699: 21300000 - - 71b615b93291b324ca18162473870d2a: 21300000 - - 260213ab1aa2dc34aa3f84761eb07316: 21300000 - - d4c3de2ca85632b40b3e8d9884a94100: 21300000 - - 221527fce6ae996489ca2c7e01d0d678: 21300000 - - f7c47b4f3b4ef04459d62f909f2e12c8: 21300000 - - 6e5fddbf1f5ca3f4c80f68feeac293fa: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: 7373de00561941343896c4e69e43436d, type: 3} - - {fileID: 21300000, guid: 9a8f35849df73bf4a8a841de4e70b699, type: 3} - - {fileID: 21300000, guid: 71b615b93291b324ca18162473870d2a, type: 3} - - {fileID: 21300000, guid: 260213ab1aa2dc34aa3f84761eb07316, type: 3} - - {fileID: 21300000, guid: d4c3de2ca85632b40b3e8d9884a94100, type: 3} - - {fileID: 21300000, guid: 221527fce6ae996489ca2c7e01d0d678, type: 3} - - {fileID: 21300000, guid: f7c47b4f3b4ef04459d62f909f2e12c8, type: 3} - - {fileID: 21300000, guid: 6e5fddbf1f5ca3f4c80f68feeac293fa, type: 3} - m_PackedSpriteNamesToIndex: - - 1_7 - - 1_3 - - 1_4 - - 1_8 - - 1_6 - - 1_2 - - 1_5 - - 1_1 + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u6296\u97F3\u793C\u7269\u56FE_Dy" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas index 6c47d0b2..b21dc38e 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_新增内容.spriteatlas @@ -74,26 +74,16 @@ SpriteAtlas: - {fileID: 21300000, guid: 2b6f8d50ab114d448b03e8b7c279f230, type: 3} - {fileID: 21300000, guid: 771e7d7731b51d74f99f46460198d153, type: 3} - {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3} + - {fileID: 21300000, guid: 38a120ecc4a4c964fa5d4e7b77e63619, type: 3} - {fileID: 21300000, guid: e0246e23c99b19945b74857ab2afc817, type: 3} + - {fileID: 21300000, guid: 0a4f5c692f81d4d4f955f18051647cb9, type: 3} bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - 2b6f8d50ab114d448b03e8b7c279f230: 21300000 - - e0246e23c99b19945b74857ab2afc817: 21300000 - - 86ab5d2474d50d448a735fb340c904b4: 21300000 - - 771e7d7731b51d74f99f46460198d153: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: 2b6f8d50ab114d448b03e8b7c279f230, type: 3} - - {fileID: 21300000, guid: e0246e23c99b19945b74857ab2afc817, type: 3} - - {fileID: 21300000, guid: 86ab5d2474d50d448a735fb340c904b4, type: 3} - - {fileID: 21300000, guid: 771e7d7731b51d74f99f46460198d153, type: 3} - m_PackedSpriteNamesToIndex: - - 61d19805a4d9deb2bed3110b3b57c82 - - "\u53C2\u8003" - - zjm_tc_wmsp - - 7c55264c27b48fc5bd5eac56ef2c7e0 + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u65B0\u589E\u5185\u5BB9" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜_结算页面.spriteatlas b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜_结算页面.spriteatlas index 517e617d..a8888aaa 100644 --- a/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜_结算页面.spriteatlas +++ b/UnityProject/Assets/AssetArt/Atlas/UIRaw_Atlas_结算榜_结算页面.spriteatlas @@ -72,6 +72,7 @@ SpriteAtlas: variantMultiplier: 1 packables: - {fileID: 21300000, guid: 922779bb63f355341a85c85f3d0a28d5, type: 3} + - {fileID: 21300000, guid: b2673f4cf0d66be429c88a9bd4f7cc5f, type: 3} - {fileID: 21300000, guid: cfcb6bf5266f8d94da65a08fac2238a5, type: 3} - {fileID: 21300000, guid: 448c239bec6e7e6409ca3e2ece8568d4, type: 3} - {fileID: 21300000, guid: 6580d74a13a6e424e819e3b0a05de1ad, type: 3} @@ -87,9 +88,9 @@ SpriteAtlas: - {fileID: 21300000, guid: 0817ca5701cea81468b3fd7d94e37e97, type: 3} - {fileID: 21300000, guid: 3a9e308f2e9c1974b8666e9ae7e79fd3, type: 3} - {fileID: 21300000, guid: b98c37ff06f2e784bb9382aacf39f87f, type: 3} + - {fileID: 21300000, guid: 2cbb93a7d474ab240acaaf6589aae7be, type: 3} - {fileID: 21300000, guid: 3566d437a9a47334da152d1f5dd66fab, type: 3} - {fileID: 21300000, guid: 004297c04262e1a4f8eb2d1518ae532b, type: 3} - - {fileID: 21300000, guid: b2673f4cf0d66be429c88a9bd4f7cc5f, type: 3} - {fileID: 21300000, guid: a13cd031d50dca04d8d264c291083317, type: 3} - {fileID: 21300000, guid: d2cf32534ae448c4c9ce21e2d6e1631f, type: 3} - {fileID: 21300000, guid: 69dd2b8a61fb40d4ba70c7a66fa2ec0c, type: 3} @@ -97,79 +98,10 @@ SpriteAtlas: bindAsDefault: 1 isAtlasV2: 0 cachedData: {fileID: 0} - packedSpriteRenderDataKeys: - - 004297c04262e1a4f8eb2d1518ae532b: 21300000 - - a13cd031d50dca04d8d264c291083317: 21300000 - - 76f9b341dbc47f84b99486db7ca567c5: 21300000 - - 53e0e45115b6374448e9df6fcf9653c1: 21300000 - - 728d13f1256766f44ad6d6b3f7aeea47: 21300000 - - d2cf32534ae448c4c9ce21e2d6e1631f: 21300000 - - cfcb6bf5266f8d94da65a08fac2238a5: 21300000 - - 71580d3651f82514cb74ae33b540d664: 21300000 - - 51bd67564af1c074983a6fad3d052c55: 21300000 - - 3566d437a9a47334da152d1f5dd66fab: 21300000 - - 0817ca5701cea81468b3fd7d94e37e97: 21300000 - - 05c652979e70fd8469d5e9e572c5515d: 21300000 - - b32855f7bb9a25a42a6f3991b2379e10: 21300000 - - 6580d74a13a6e424e819e3b0a05de1ad: 21300000 - - 69dd2b8a61fb40d4ba70c7a66fa2ec0c: 21300000 - - 7f7a75ca6d490f74da4813ce6fe47c45: 21300000 - - 448c239bec6e7e6409ca3e2ece8568d4: 21300000 - - 922779bb63f355341a85c85f3d0a28d5: 21300000 - - cba4c70c4650262459af9c0dfc7d8706: 21300000 - - b2673f4cf0d66be429c88a9bd4f7cc5f: 21300000 - - c7e7d7ed818d7ae42bdadeb0b42458cf: 21300000 - - 3a9e308f2e9c1974b8666e9ae7e79fd3: 21300000 - - b98c37ff06f2e784bb9382aacf39f87f: 21300000 + packedSpriteRenderDataKeys: [] m_MasterAtlas: {fileID: 0} - m_PackedSprites: - - {fileID: 21300000, guid: 004297c04262e1a4f8eb2d1518ae532b, type: 3} - - {fileID: 21300000, guid: a13cd031d50dca04d8d264c291083317, type: 3} - - {fileID: 21300000, guid: 76f9b341dbc47f84b99486db7ca567c5, type: 3} - - {fileID: 21300000, guid: 53e0e45115b6374448e9df6fcf9653c1, type: 3} - - {fileID: 21300000, guid: 728d13f1256766f44ad6d6b3f7aeea47, type: 3} - - {fileID: 21300000, guid: d2cf32534ae448c4c9ce21e2d6e1631f, type: 3} - - {fileID: 21300000, guid: cfcb6bf5266f8d94da65a08fac2238a5, type: 3} - - {fileID: 21300000, guid: 71580d3651f82514cb74ae33b540d664, type: 3} - - {fileID: 21300000, guid: 51bd67564af1c074983a6fad3d052c55, type: 3} - - {fileID: 21300000, guid: 3566d437a9a47334da152d1f5dd66fab, type: 3} - - {fileID: 21300000, guid: 0817ca5701cea81468b3fd7d94e37e97, type: 3} - - {fileID: 21300000, guid: 05c652979e70fd8469d5e9e572c5515d, type: 3} - - {fileID: 21300000, guid: b32855f7bb9a25a42a6f3991b2379e10, type: 3} - - {fileID: 21300000, guid: 6580d74a13a6e424e819e3b0a05de1ad, type: 3} - - {fileID: 21300000, guid: 69dd2b8a61fb40d4ba70c7a66fa2ec0c, type: 3} - - {fileID: 21300000, guid: 7f7a75ca6d490f74da4813ce6fe47c45, type: 3} - - {fileID: 21300000, guid: 448c239bec6e7e6409ca3e2ece8568d4, type: 3} - - {fileID: 21300000, guid: 922779bb63f355341a85c85f3d0a28d5, type: 3} - - {fileID: 21300000, guid: cba4c70c4650262459af9c0dfc7d8706, type: 3} - - {fileID: 21300000, guid: b2673f4cf0d66be429c88a9bd4f7cc5f, type: 3} - - {fileID: 21300000, guid: c7e7d7ed818d7ae42bdadeb0b42458cf, type: 3} - - {fileID: 21300000, guid: 3a9e308f2e9c1974b8666e9ae7e79fd3, type: 3} - - {fileID: 21300000, guid: b98c37ff06f2e784bb9382aacf39f87f, type: 3} - m_PackedSpriteNamesToIndex: - - dzzw_z - - zj_d - - SBYR_z - - JZ_tx_em - - zjgx_z - - zjgx_tx - - JZDS_icon - - QCZJ_z - - SBYR_EM - - dzzw_tx - - TZHS_tx_flash - - SL_box - - SBYR_z_flash - - JZ_tx - - zjgx_tx_flash - - TZHS_tx - - JZ_d - - 02a856d7ee75b85e3016c3e7351dbd0 - - SL_em - - 4444 - - SBYR_tx - - TZHS_z - - d7754d54ebc1a2b771406fffc15c723 + m_PackedSprites: [] + m_PackedSpriteNamesToIndex: [] m_RenderDataMap: {} m_Tag: "UIRaw_Atlas_\u7ED3\u7B97\u699C_\u7ED3\u7B97\u9875\u9762" m_IsVariant: 0 diff --git a/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold(1) SDF.asset b/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold(1) SDF.asset index 620038fc..c89e10a2 100644 --- a/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold(1) SDF.asset +++ b/UnityProject/Assets/AssetRaw/Fonts/SourceHanSansCN-Bold(1) SDF.asset @@ -3334,7 +3334,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.15 + - _OutlineWidth: 0.061 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.9 diff --git a/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 tsettt.asset b/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 tsettt.asset index 25a841b4..c2194552 100644 --- a/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 tsettt.asset +++ b/UnityProject/Assets/AssetRaw/Fonts/douyuFont-2 tsettt.asset @@ -118,7 +118,7 @@ Material: - _OutlineSoftness: 0 - _OutlineUVSpeedX: 0 - _OutlineUVSpeedY: 0 - - _OutlineWidth: 0.14 + - _OutlineWidth: 0 - _PerspectiveFilter: 0.875 - _Reflectivity: 10 - _ScaleRatioA: 0.8333333 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab index 9bdf3bbc..901ae9a6 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameEndForm.prefab @@ -219,8 +219,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -353,8 +353,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -994,6 +994,81 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: [] +--- !u!1 &1920188663557651914 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7241218512612656277} + - component: {fileID: 1466378415236242314} + - component: {fileID: 5281703231525696138} + m_Layer: 5 + m_Name: DK + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7241218512612656277 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1920188663557651914} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 7752074671510801886} + 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: -545} + m_SizeDelta: {x: 963, y: 619} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1466378415236242314 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1920188663557651914} + m_CullTransparentMesh: 1 +--- !u!114 &5281703231525696138 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1920188663557651914} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 2cbb93a7d474ab240acaaf6589aae7be, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &2116892257331728460 GameObject: m_ObjectHideFlags: 0 @@ -1395,8 +1470,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1568,6 +1643,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 3022307874445342585} + - {fileID: 7241218512612656277} - {fileID: 3152446807514931330} - {fileID: 4700954648216750620} - {fileID: 356128460605191968} @@ -1803,8 +1879,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1828,8 +1904,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 25.34 - m_fontSizeBase: 25.34 + m_fontSize: 32.7 + m_fontSizeBase: 32.7 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2164,7 +2240,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 36.8, y: 0} - m_SizeDelta: {x: 671, y: 151} + m_SizeDelta: {x: 628, y: 199} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6065230346718424418 CanvasRenderer: @@ -2388,7 +2464,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.7, y: 498.6} + m_AnchoredPosition: {x: -0.7, y: 480} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3424026210571436217 @@ -2421,8 +2497,8 @@ MonoBehaviour: m_Calls: [] m_text: 12344 m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2446,8 +2522,8 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 46 - m_fontSizeBase: 46 + m_fontSize: 67.89 + m_fontSizeBase: 67.89 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 @@ -2665,14 +2741,14 @@ RectTransform: m_GameObject: {fileID: 7638284467372108283} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalScale: {x: 1.36, y: 1.36, z: 1.36} + m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 7752074671510801886} 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: -215} + m_AnchoredPosition: {x: 0, y: -247} m_SizeDelta: {x: 369, y: 110} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3375807401234392099 @@ -3002,8 +3078,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3293,7 +3369,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: 468} + m_AnchoredPosition: {x: 0, y: 485} m_SizeDelta: {x: 832, y: 491} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2752340064233181849 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab index f9dd7922..7e327291 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameRankForm.prefab @@ -602,7 +602,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000002749069, y: 0.0011273756} + m_AnchoredPosition: {x: 0.0054869163, y: -0.000020495803} m_SizeDelta: {x: 0, y: 1292.4} m_Pivot: {x: 0, y: 1} --- !u!114 &6944785608262845692 @@ -724,7 +724,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &826311576916127066 RectTransform: m_ObjectHideFlags: 0 @@ -739,6 +739,7 @@ RectTransform: m_Children: - {fileID: 4240183033384122430} - {fileID: 869193665477311054} + - {fileID: 6212620462891697411} - {fileID: 7005210993935573834} - {fileID: 6135434651337117702} - {fileID: 7924596172304749232} @@ -2882,8 +2883,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0\u516D\u4F4D" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: f399ac3de3426d44ca427745c660ece7, type: 2} - m_sharedMaterial: {fileID: 287740055413847867, guid: f399ac3de3426d44ca427745c660ece7, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2949,6 +2950,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &9062021819333006359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6212620462891697411} + - component: {fileID: 5581096168614322864} + - component: {fileID: 5772233895306218680} + m_Layer: 5 + m_Name: TXK + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6212620462891697411 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9062021819333006359} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 826311576916127066} + 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: -216.5, y: 2.3} + m_SizeDelta: {x: 138, y: 143} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5581096168614322864 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9062021819333006359} + m_CullTransparentMesh: 1 +--- !u!114 &5772233895306218680 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9062021819333006359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: c7e7d7ed818d7ae42bdadeb0b42458cf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &9208457218029033924 GameObject: m_ObjectHideFlags: 0 diff --git a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab index 9365354d..4172486b 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIGameWorldRankForm.prefab @@ -1636,7 +1636,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.00010880414, y: -0.00044178174} + m_AnchoredPosition: {x: -0.00010880414, y: -0.0021868043} m_SizeDelta: {x: 0, y: 1292.4} m_Pivot: {x: 0, y: 1} --- !u!114 &6944785608262845692 @@ -5412,7 +5412,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 7} + m_AnchoredPosition: {x: 0, y: -202} m_SizeDelta: {x: 454, y: 128} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7419086050736273723 @@ -5596,7 +5596,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -0.000033585555, y: -0.000919627} + m_AnchoredPosition: {x: -0.000033585555, y: -0.004335842} m_SizeDelta: {x: 0, y: 1292.4} m_Pivot: {x: 0, y: 1} --- !u!114 &5343428874745105376 @@ -7895,8 +7895,8 @@ MonoBehaviour: m_fontMaterials: [] m_fontColor32: serializedVersion: 2 - rgba: 4279910005 - m_fontColor: {r: 0.45882356, g: 0.24313727, b: 0.10196079, a: 1} + rgba: 4278526027 + m_fontColor: {r: 0.2924528, g: 0.1265345, b: 0.017933436, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/UnityProject/Assets/AssetRaw/UI/UIVipItem.prefab b/UnityProject/Assets/AssetRaw/UI/UIVipItem.prefab index 4aac340c..115ed97c 100644 --- a/UnityProject/Assets/AssetRaw/UI/UIVipItem.prefab +++ b/UnityProject/Assets/AssetRaw/UI/UIVipItem.prefab @@ -10255,8 +10255,8 @@ MonoBehaviour: m_Calls: [] m_text: "\u73A9\u5BB6\u540D\u79F0" m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 7196058ec69127e4eaec9cbdd26df425, type: 2} - m_sharedMaterial: {fileID: -2706005060043310424, guid: 7196058ec69127e4eaec9cbdd26df425, type: 2} + m_fontAsset: {fileID: 11400000, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} + m_sharedMaterial: {fileID: 1928963831957525247, guid: 61e28618d002ac7488fba94aea6f8607, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/JZ_d.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/JZ_d.png index db84bf53..1b72356d 100644 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/JZ_d.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/JZ_d.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/SL_box.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/SL_box.png index e53c2c92..e50cf6f2 100644 Binary files a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/SL_box.png and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/SL_box.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png new file mode 100644 index 00000000..8b49d2fb Binary files /dev/null and b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png differ diff --git a/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png.meta b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png.meta new file mode 100644 index 00000000..37dae1a5 --- /dev/null +++ b/UnityProject/Assets/AssetRaw/UIRaw/Atlas/结算榜/结算页面/dik_box.png.meta @@ -0,0 +1,114 @@ +fileFormatVersion: 2 +guid: 2cbb93a7d474ab240acaaf6589aae7be +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 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: 0 + 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 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Win_TXK.mat b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Win_TXK.mat index 54497b7e..e68e9781 100644 --- a/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Win_TXK.mat +++ b/UnityProject/Assets/AssetRaw/ZQDN/FX/Maerials/Win_TXK.mat @@ -141,7 +141,7 @@ Material: - _UseMainTex_RGB_A: 0 - _UseMainTex_Ramp_RGB_A: 0 - _UseTur_Mask: 0 - - _Use_Flash: 1 + - _Use_Flash: 0 - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 1}