zouweichen 4 days ago
parent
commit
a2559cdc0b

+ 1 - 3
Assets/AssetConfigs/Addressable/CustomSearch.txt

@@ -1,4 +1,4 @@
-626
+624
 Assets/Res/Addressable/Tables/achieveRewardTable.bytes
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF.asset
 Assets/Res/Addressable/Fonts/ALIMAMA_SDF_outline.mat
@@ -7,10 +7,8 @@ Assets/Res/Addressable/Tables/arena_jqrTable.bytes
 Assets/Res/Addressable/Tables/arena_phbTable.bytes
 Assets/Res/Addressable/Tables/arenaTable.bytes
 Assets/Res/Addressable/Tables/artifactBaseTable.bytes
-Assets/Res/Addressable/Tables/artifactBuweiTable.bytes
 Assets/Res/Addressable/Tables/artifactFumoTable.bytes
 Assets/Res/Addressable/Tables/artifactInfoTable.bytes
-Assets/Res/Addressable/Tables/artifactProbTable.bytes
 Assets/Res/Addressable/Tables/artifactStarTable.bytes
 Assets/Res/Addressable/Tables/artifactYuansuTable.bytes
 Assets/Res/Addressable/Map/Effects/atk_007.prefab

+ 3 - 211
Assets/Res/Addressable/UI/Atlas/Partner/atlas_rauap_partner.spriteatlas

@@ -80,220 +80,12 @@ SpriteAtlas:
     bindAsDefault: 1
     isAtlasV2: 0
     cachedData: {fileID: 0}
-    packedSpriteRenderDataKeys:
-    - 7963e680b36428741b28edd9f006d9c9: 21300000
-    - 4e1ed421d3509a2448f2f0fd353fe061: 21300000
-    - be3fca415234a1b4685d1a2573270753: 21300000
-    - fecfa332fbc09b24b98f32c9cc9d421f: 21300000
-    - c6e35a6229056dc4a9a6acd3fc176317: 21300000
-    - 0331f8c29a15a924bbd40992f1db02b0: 21300000
-    - b5ad480345a197643b2a909f75792d20: 21300000
-    - af513c93eea18c542a538ae31fc742cd: 21300000
-    - d00e61b3ec78a25409c3cf7059bd2cd7: 21300000
-    - d75c40140ef5f4847ba7a3d9c3b60fe4: 21300000
-    - d080aa44dd5497c4e8722a9c7ed88ae2: 21300000
-    - 5fb74ab4c6908364fb847afe4bb8ad8a: 21300000
-    - 3e878dc428d246e48bd7d8be197aa2e8: 21300000
-    - 38bd5d155c21afd4bbee617ea6208ddb: 21300000
-    - 62857935cb718254c80306d94a02322c: 21300000
-    - 28e24b65f0c900f47a665b7d05526906: 21300000
-    - d997cfb5985a42e479ee01f698a55f12: 21300000
-    - 24c4f816025819e4f8d8974f9e98d68d: 21300000
-    - 6014f6263903c7e449a4ff273718f898: 21300000
-    - 78a95d26e838c2442a9af4d91cf20d4b: 21300000
-    - 928e7266c93fd9b44ab13c4e72950b4f: 21300000
-    - a489756687ac9bb43a47e99d168c5b81: 21300000
-    - 131aabb6441e4954b9183a33e4f3ca8e: 21300000
-    - 17ecf90731ce6ff4392eeff168cbbf51: 21300000
-    - 24ef1847a11535c419dd65bcca7cabbc: 21300000
-    - b30484c782024804280e6598747ed018: 21300000
-    - c3d88cc7d2d509a49811adbc4a9525c4: 21300000
-    - fd69ead73c6b3124ba67546bbc905594: 21300000
-    - 7e8140f7aafa5ec419b699bf57646c46: 21300000
-    - e7e190f78351d134eaf1408c6eafbe3d: 21300000
-    - 431106185aba18046bee6c24c895b739: 21300000
-    - f517b448493d4524491bf3b483ca7819: 21300000
-    - 0df56f58b15e3074194c5a96db6c4181: 21300000
-    - 1bcaefa8c04acd7419776b6915412804: 21300000
-    - 103cf5198ffe9434f992c85ec0cdb4f7: 21300000
-    - 1cb0b1298af1d0744ad588c352493fdf: 21300000
-    - 46728559ad51d3a47b47707c536655e0: 21300000
-    - 8f7abf694540f0f498e46043d1d151be: 21300000
-    - 0b850ad9f12423f41a855d412e9f29ec: 21300000
-    - 92394c1a1208af644bee54d7e9f73cf3: 21300000
-    - 1303926a12f069640827f2bdcbc0c7c6: 21300000
-    - 3d81a37a927ceb04aa80d928f9794d14: 21300000
-    - 30af1a7abe853734d9eb3e2b062628e6: 21300000
-    - f1b601aa043e7204eb5a34adcc814939: 21300000
-    - 5d1103fa526d54446984e1d8b20d2e8a: 21300000
-    - 626d912bd1d82704da6f14e1a7d36e71: 21300000
-    - 15fb624bff181af4085095606c278112: 21300000
-    - a4f3689b37972234496dd91d79bafdf4: 21300000
-    - 6bc668abf6357a74ca311513ffb36953: 21300000
-    - 838fb90c0e02d454a8442aacba8414e5: 21300000
-    - 30ae4c1c6aad83b4194879ae4e53cffe: 21300000
-    - 820b2ccc16e5fe84bae23af243bfcb60: 21300000
-    - 58e393fc6a6dbf44a99203e46b0a79c6: 21300000
-    - 94fc971df928d6e478bca59d7a236a29: 21300000
-    - 794f7f2d026e2504c8d940726259c269: 21300000
-    - ff78e35de8728a5428e5850a13622edb: 21300000
-    - 46b2b97d5fda8b244a944a99729f4c46: 21300000
-    - 5cc42dadf49af514fbcc4e4003a65f26: 21300000
-    - f3b6079e6d23d5e4b99bd35b91a1d532: 21300000
-    - b9e79cbef0c6aea4ab680a44ac30e9cc: 21300000
-    - 4f3ffcbe3f7219a44a790bae47163632: 21300000
-    - 7f037bcef4637a14d90259f40190a50c: 21300000
-    - ffaafecec25f9d44da7a38472722357e: 21300000
-    - a0e52fce8a7a08b4ab0011094188c4b8: 21300000
-    - 986d0cfe25cbd5a41b1c190cd8b0410e: 21300000
-    - 34ca522fe11e9124eb3e4c75c372ca91: 21300000
-    - b2b9d27f5f31d8141a86896d551c74ec: 21300000
-    - 8e34167fe65877e4299bc86699a11872: 21300000
-    - ed7e619f930a86e4f96668b995953164: 21300000
-    - 4262cecf5fa2e874997471733abc1420: 21300000
+    packedSpriteRenderDataKeys: []
   m_MasterAtlas: {fileID: 0}
   m_PackedSprites:
-  - {fileID: 21300000, guid: 7963e680b36428741b28edd9f006d9c9, type: 3}
-  - {fileID: 21300000, guid: 4e1ed421d3509a2448f2f0fd353fe061, type: 3}
-  - {fileID: 21300000, guid: be3fca415234a1b4685d1a2573270753, type: 3}
-  - {fileID: 21300000, guid: fecfa332fbc09b24b98f32c9cc9d421f, type: 3}
-  - {fileID: 21300000, guid: c6e35a6229056dc4a9a6acd3fc176317, type: 3}
-  - {fileID: 21300000, guid: 0331f8c29a15a924bbd40992f1db02b0, type: 3}
-  - {fileID: 21300000, guid: b5ad480345a197643b2a909f75792d20, type: 3}
-  - {fileID: 21300000, guid: af513c93eea18c542a538ae31fc742cd, type: 3}
-  - {fileID: 21300000, guid: d00e61b3ec78a25409c3cf7059bd2cd7, type: 3}
-  - {fileID: 21300000, guid: d75c40140ef5f4847ba7a3d9c3b60fe4, type: 3}
-  - {fileID: 21300000, guid: d080aa44dd5497c4e8722a9c7ed88ae2, type: 3}
-  - {fileID: 21300000, guid: 5fb74ab4c6908364fb847afe4bb8ad8a, type: 3}
-  - {fileID: 21300000, guid: 3e878dc428d246e48bd7d8be197aa2e8, type: 3}
-  - {fileID: 21300000, guid: 38bd5d155c21afd4bbee617ea6208ddb, type: 3}
-  - {fileID: 21300000, guid: 62857935cb718254c80306d94a02322c, type: 3}
-  - {fileID: 21300000, guid: 28e24b65f0c900f47a665b7d05526906, type: 3}
-  - {fileID: 21300000, guid: d997cfb5985a42e479ee01f698a55f12, type: 3}
-  - {fileID: 21300000, guid: 24c4f816025819e4f8d8974f9e98d68d, type: 3}
-  - {fileID: 21300000, guid: 6014f6263903c7e449a4ff273718f898, type: 3}
-  - {fileID: 21300000, guid: 78a95d26e838c2442a9af4d91cf20d4b, type: 3}
-  - {fileID: 21300000, guid: 928e7266c93fd9b44ab13c4e72950b4f, type: 3}
-  - {fileID: 21300000, guid: a489756687ac9bb43a47e99d168c5b81, type: 3}
-  - {fileID: 21300000, guid: 131aabb6441e4954b9183a33e4f3ca8e, type: 3}
-  - {fileID: 21300000, guid: 17ecf90731ce6ff4392eeff168cbbf51, type: 3}
-  - {fileID: 21300000, guid: 24ef1847a11535c419dd65bcca7cabbc, type: 3}
-  - {fileID: 21300000, guid: b30484c782024804280e6598747ed018, type: 3}
-  - {fileID: 21300000, guid: c3d88cc7d2d509a49811adbc4a9525c4, type: 3}
-  - {fileID: 21300000, guid: fd69ead73c6b3124ba67546bbc905594, type: 3}
-  - {fileID: 21300000, guid: 7e8140f7aafa5ec419b699bf57646c46, type: 3}
-  - {fileID: 21300000, guid: e7e190f78351d134eaf1408c6eafbe3d, type: 3}
-  - {fileID: 21300000, guid: 431106185aba18046bee6c24c895b739, type: 3}
-  - {fileID: 21300000, guid: f517b448493d4524491bf3b483ca7819, type: 3}
-  - {fileID: 21300000, guid: 0df56f58b15e3074194c5a96db6c4181, type: 3}
-  - {fileID: 21300000, guid: 1bcaefa8c04acd7419776b6915412804, type: 3}
-  - {fileID: 21300000, guid: 103cf5198ffe9434f992c85ec0cdb4f7, type: 3}
-  - {fileID: 21300000, guid: 1cb0b1298af1d0744ad588c352493fdf, type: 3}
-  - {fileID: 21300000, guid: 46728559ad51d3a47b47707c536655e0, type: 3}
-  - {fileID: 21300000, guid: 8f7abf694540f0f498e46043d1d151be, type: 3}
-  - {fileID: 21300000, guid: 0b850ad9f12423f41a855d412e9f29ec, type: 3}
-  - {fileID: 21300000, guid: 92394c1a1208af644bee54d7e9f73cf3, type: 3}
-  - {fileID: 21300000, guid: 1303926a12f069640827f2bdcbc0c7c6, type: 3}
-  - {fileID: 21300000, guid: 3d81a37a927ceb04aa80d928f9794d14, type: 3}
-  - {fileID: 21300000, guid: 30af1a7abe853734d9eb3e2b062628e6, type: 3}
-  - {fileID: 21300000, guid: f1b601aa043e7204eb5a34adcc814939, type: 3}
-  - {fileID: 21300000, guid: 5d1103fa526d54446984e1d8b20d2e8a, type: 3}
-  - {fileID: 21300000, guid: 626d912bd1d82704da6f14e1a7d36e71, type: 3}
-  - {fileID: 21300000, guid: 15fb624bff181af4085095606c278112, type: 3}
-  - {fileID: 21300000, guid: a4f3689b37972234496dd91d79bafdf4, type: 3}
-  - {fileID: 21300000, guid: 6bc668abf6357a74ca311513ffb36953, type: 3}
-  - {fileID: 21300000, guid: 838fb90c0e02d454a8442aacba8414e5, type: 3}
-  - {fileID: 21300000, guid: 30ae4c1c6aad83b4194879ae4e53cffe, type: 3}
-  - {fileID: 21300000, guid: 820b2ccc16e5fe84bae23af243bfcb60, type: 3}
-  - {fileID: 21300000, guid: 58e393fc6a6dbf44a99203e46b0a79c6, type: 3}
-  - {fileID: 21300000, guid: 94fc971df928d6e478bca59d7a236a29, type: 3}
-  - {fileID: 21300000, guid: 794f7f2d026e2504c8d940726259c269, type: 3}
-  - {fileID: 21300000, guid: ff78e35de8728a5428e5850a13622edb, type: 3}
-  - {fileID: 21300000, guid: 46b2b97d5fda8b244a944a99729f4c46, type: 3}
-  - {fileID: 21300000, guid: 5cc42dadf49af514fbcc4e4003a65f26, type: 3}
-  - {fileID: 21300000, guid: f3b6079e6d23d5e4b99bd35b91a1d532, type: 3}
-  - {fileID: 21300000, guid: b9e79cbef0c6aea4ab680a44ac30e9cc, type: 3}
-  - {fileID: 21300000, guid: 4f3ffcbe3f7219a44a790bae47163632, type: 3}
-  - {fileID: 21300000, guid: 7f037bcef4637a14d90259f40190a50c, type: 3}
-  - {fileID: 21300000, guid: ffaafecec25f9d44da7a38472722357e, type: 3}
-  - {fileID: 21300000, guid: a0e52fce8a7a08b4ab0011094188c4b8, type: 3}
-  - {fileID: 21300000, guid: 986d0cfe25cbd5a41b1c190cd8b0410e, type: 3}
-  - {fileID: 21300000, guid: 34ca522fe11e9124eb3e4c75c372ca91, type: 3}
-  - {fileID: 21300000, guid: b2b9d27f5f31d8141a86896d551c74ec, type: 3}
-  - {fileID: 21300000, guid: 8e34167fe65877e4299bc86699a11872, type: 3}
-  - {fileID: 21300000, guid: ed7e619f930a86e4f96668b995953164, type: 3}
-  - {fileID: 21300000, guid: 4262cecf5fa2e874997471733abc1420, type: 3}
+  - {fileID: 21300000, guid: 8b6458543cadab045bde92a02b23b600, type: 3}
   m_PackedSpriteNamesToIndex:
-  - sb_pzdi_5
-  - partner_pzdi_5
-  - epigraph_pzempty_7
-  - epigraph_pzempty_5
-  - partner_elementType_3
-  - partner_pzdi_2
-  - sb_elementType_4
-  - partner_elementType_2
-  - sb_pzdi_2
-  - partner_pzdi_8
-  - epigraph_pzempty_2
-  - sb_elementType_2
-  - sb_elementTypeRhombus_2
-  - sb_elementTypeRhombus_1
-  - sb_pzdi_7
-  - epigraph_mwpz_8
-  - partner_jindutiao_7
-  - epigraph_mwpz_1
-  - sb_pzdi_8
-  - epigraph_mwpz_7
-  - sb_type_5
-  - epigraph_pztype_4
-  - partner_jindutiao_5
-  - sb_type_2
-  - sb_type_1
-  - epigraph_pztype_3
-  - sb_elementTypeRhombus_3
-  - epigraph_mwpz_6
-  - epigraph_pztype_6
-  - epigraph_pzempty_8
-  - epigraph_mwpz_2
-  - sb_pzdi_3
-  - epigraph_pztype_8
-  - partner_emptydi
-  - partner_jindutiao_2
-  - epigraph_pztype_5
-  - sb_pzdi_4
-  - sb_elementTypeRhombus_4
-  - sb_pzdi_1
-  - partner_jindutiao_1
-  - partner_pzdi_1
-  - sb_elementType_5
-  - epigraph_pztype_2
-  - sb_elementType_3
-  - epigraph_mwpz_4
-  - partner_jindutiao_4
-  - sb_pzdi_6
-  - epigraph_pztype_1
-  - partner_pzdi_4
-  - epigraph_mwpz_3
-  - partner_pzdi_7
-  - partner_pzdi_6
-  - sb_type_4
-  - epigraph_pzempty_1
-  - epigraph_mwpz_5
-  - epigraph_pzempty_3
-  - partner_jindutiao_3
-  - partner_elementType_5
-  - sb_elementTypeRhombus_5
-  - epigraph_pztype_7
-  - epigraph_pzempty_4
-  - sb_type_3
-  - sb_emptydi
-  - partner_jindutiao_8
-  - sb_elementType_1
-  - partner_elementType_1
-  - partner_elementType_4
-  - epigraph_pzempty_6
-  - partner_pzdi_3
-  - partner_jindutiao_6
+  - vcard_img_mingpian_exhbition_bg
   m_RenderDataMap: {}
   m_Tag: atlas_rauap_partner
   m_IsVariant: 0

+ 0 - 1
Assets/Scripts/Business/Runtime/FGUI/Partner/SbLevelUpBtn/PartnerSbLevelUpBtnCtrl.cs

@@ -4,7 +4,6 @@
 /// 该脚本由模板创建
 /// created by cb 2024
 
-
 using FL.Data;
 using XGame;
 using XGame.Database;