From c3da0a2df8d206c69c928de2131bfbe5b1cbdb69 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 15 Jul 2021 11:14:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E4=B9=BE=E5=9D=A4=E5=AE=9D=E7=9B=92]=3D=3D=3D?= =?UTF-8?q?=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=E4=BC=98=E5=8C=96=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../QianKunBox/ArtFont.meta | 8 + .../ArtFont/q_qiankun__icondi_ghwj_zh.png | Bin 0 -> 7988 bytes .../q_qiankun__icondi_ghwj_zh.png.meta | 110 + ...8zi.png => x_xinjiangzhaohuan_28zi_zh.png} | Bin ...ta => x_xinjiangzhaohuan_28zi_zh.png.meta} | 0 ...lv.png => x_xinjiangzhaohuan_gailv_zh.png} | Bin ...a => x_xinjiangzhaohuan_gailv_zh.png.meta} | 0 .../Prefabs/UI/DynamicActicity/page4.prefab | 64 +- .../Prefabs/UI/Popup/GeneralPopup.prefab | 9446 ++++++++++++++++- .../Modules/DynamicActivity/QianKunBox.lua | 4 +- .../DynamicActivity/TimeLimitUpHero.lua | 4 +- .../View/GeneralBigPopup_RecrutDetail.lua | 29 +- .../Popup/View/GeneralPopup_ChooseUpSoul.lua | 5 +- 13 files changed, 9630 insertions(+), 40 deletions(-) create mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta create mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont/q_qiankun__icondi_ghwj_zh.png create mode 100644 Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont/q_qiankun__icondi_ghwj_zh.png.meta rename Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/{x_xinjiangzhaohuan_28zi.png => x_xinjiangzhaohuan_28zi_zh.png} (100%) rename Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/{x_xinjiangzhaohuan_28zi.png.meta => x_xinjiangzhaohuan_28zi_zh.png.meta} (100%) rename Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/{x_xinjiangzhaohuan_gailv.png => x_xinjiangzhaohuan_gailv_zh.png} (100%) rename Assets/ManagedResources/Atlas/TimeLimitUpHero/ArtFont/{x_xinjiangzhaohuan_gailv.png.meta => x_xinjiangzhaohuan_gailv_zh.png.meta} (100%) diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta new file mode 100644 index 0000000000..641989ad4e --- /dev/null +++ b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6bdbd7bc353b72a479746188ff5ad788 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont/q_qiankun__icondi_ghwj_zh.png b/Assets/ManagedResources/Atlas/DynamicActivityAtlas/QianKunBox/ArtFont/q_qiankun__icondi_ghwj_zh.png new file mode 100644 index 0000000000000000000000000000000000000000..205cfbca7a858f72daff3b0ab2bd1bcea5162e32 GIT binary patch literal 7988 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