diff --git a/lua_probject/base_project/Main.lua b/lua_probject/base_project/Main.lua index c456ef52..a74dadc9 100644 --- a/lua_probject/base_project/Main.lua +++ b/lua_probject/base_project/Main.lua @@ -63,7 +63,16 @@ function Main() FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正胖娃_GBK", "base/static/fonts/方正胖娃_GBK.ttf"), null) FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("方正粗圆_GBK", "base/static/fonts/方正粗圆_GBK.ttf"), null) FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("FZCuYuan-M03","base/static/fonts/FZCuYuan-M03.TTF"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-35-Thin","base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-45-Light","base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-55-Regular","base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-55-RegularL3","base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf"),null) FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-65-Medium","base/static/fonts/AlibabaPuHuiTi-3-65-Medium.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-75-SemiBold","base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-85-Bold","base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-95-ExtraBold","base/static/fonts/AlibabaPuHuiTi-3-95-ExtraBold.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-105-Heavy","base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf"),null) + FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("AlibabaPuHuiTi-3-115-Black","base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf"),null) --FairyGUI.FontManager.RegisterFont(FairyGUI.DynamicFont.New("HYFangLiJ","base/static/fonts/HYFangLiJ.ttf"),null) _game_info = json.decode(GameApplication.Instance.GameInfo) --_game_info["login_url"]="http://8.134.59.224:8101/" diff --git a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml index 7a7a77a4..c9318ecb 100644 --- a/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml +++ b/wb_new_ui/assets/Family/Main/Component/c_familyMember.xml @@ -4,7 +4,7 @@ - + diff --git a/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml b/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml index e23bf785..d7d1eac7 100644 --- a/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml +++ b/wb_new_ui/assets/Family/NumberList/Component/c_numberChild.xml @@ -4,6 +4,7 @@ + @@ -26,7 +27,6 @@ - diff --git a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes index ca923263..b9166610 100644 Binary files a/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes and b/wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png index a70ed4fa..d11be825 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_1.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes index cadea613..e5f2e903 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf new file mode 100644 index 00000000..3d865c29 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta new file mode 100644 index 00000000..33478232 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-105-Heavy.ttf.meta @@ -0,0 +1,31 @@ +fileFormatVersion: 2 +guid: c3ea0071b89d4694d8b2bfc90e6c9df3 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: bccbf1f0c63a3fb469c064339927e589, type: 3} + - {fileID: 12800000, guid: eb85871611151194787c0f700f37a320, type: 3} + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: b7a802383cc6ebb499d2db6e3acb1c5d, type: 3} + - {fileID: 12800000, guid: cbf9453b439e5964ba382d3b1755b6f0, type: 3} + - {fileID: 12800000, guid: d4dafaecb09cf1d428bc0ca8ef5667ed, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + - {fileID: 12800000, guid: 3d48b57fcc2d5f74ca0db1eeb1488866, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf new file mode 100644 index 00000000..2a8d6125 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta new file mode 100644 index 00000000..6d4883de --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-115-Black.ttf.meta @@ -0,0 +1,32 @@ +fileFormatVersion: 2 +guid: 42c25a0f32ec9e343bbeda2de42b7536 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: bccbf1f0c63a3fb469c064339927e589, type: 3} + - {fileID: 12800000, guid: c3ea0071b89d4694d8b2bfc90e6c9df3, type: 3} + - {fileID: 12800000, guid: eb85871611151194787c0f700f37a320, type: 3} + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: b7a802383cc6ebb499d2db6e3acb1c5d, type: 3} + - {fileID: 12800000, guid: cbf9453b439e5964ba382d3b1755b6f0, type: 3} + - {fileID: 12800000, guid: d4dafaecb09cf1d428bc0ca8ef5667ed, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + - {fileID: 12800000, guid: 3d48b57fcc2d5f74ca0db1eeb1488866, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf new file mode 100644 index 00000000..04b8f80a Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta new file mode 100644 index 00000000..b4893be4 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-35-Thin.ttf.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 7e3c30de3b3d50a4bb53748987f149d9 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf new file mode 100644 index 00000000..f6e45c77 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta new file mode 100644 index 00000000..85006a3b --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-45-Light.ttf.meta @@ -0,0 +1,24 @@ +fileFormatVersion: 2 +guid: b2c9d40f1a8029940b936f531397b2cb +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf new file mode 100644 index 00000000..a6eaf361 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta new file mode 100644 index 00000000..dec1d3ad --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-Regular.ttf.meta @@ -0,0 +1,25 @@ +fileFormatVersion: 2 +guid: 3d48b57fcc2d5f74ca0db1eeb1488866 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf new file mode 100644 index 00000000..3c82b62b Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta new file mode 100644 index 00000000..d7995def --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-55-RegularL3.ttf.meta @@ -0,0 +1,27 @@ +fileFormatVersion: 2 +guid: b7a802383cc6ebb499d2db6e3acb1c5d +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: eb85871611151194787c0f700f37a320, type: 3} + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + - {fileID: 12800000, guid: 3d48b57fcc2d5f74ca0db1eeb1488866, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf new file mode 100644 index 00000000..92532c4a Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta new file mode 100644 index 00000000..1f24801b --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-75-SemiBold.ttf.meta @@ -0,0 +1,29 @@ +fileFormatVersion: 2 +guid: cbf9453b439e5964ba382d3b1755b6f0 +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: bccbf1f0c63a3fb469c064339927e589, type: 3} + - {fileID: 12800000, guid: eb85871611151194787c0f700f37a320, type: 3} + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: b7a802383cc6ebb499d2db6e3acb1c5d, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + - {fileID: 12800000, guid: 3d48b57fcc2d5f74ca0db1eeb1488866, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf new file mode 100644 index 00000000..7edd4e55 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf differ diff --git a/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta new file mode 100644 index 00000000..57b0d108 --- /dev/null +++ b/wb_unity_pro/Assets/ART/base/static/fonts/AlibabaPuHuiTi-3-85-Bold.ttf.meta @@ -0,0 +1,30 @@ +fileFormatVersion: 2 +guid: d4dafaecb09cf1d428bc0ca8ef5667ed +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Alibaba PuHuiTi 3.0 + fontNames: + - Alibaba PuHuiTi 3.0 + fallbackFontReferences: + - {fileID: 12800000, guid: bccbf1f0c63a3fb469c064339927e589, type: 3} + - {fileID: 12800000, guid: eb85871611151194787c0f700f37a320, type: 3} + - {fileID: 12800000, guid: 1027a6c6a4e2a204a949b2409f290d04, type: 3} + - {fileID: 12800000, guid: b7a802383cc6ebb499d2db6e3acb1c5d, type: 3} + - {fileID: 12800000, guid: cbf9453b439e5964ba382d3b1755b6f0, type: 3} + - {fileID: 12800000, guid: 7e3c30de3b3d50a4bb53748987f149d9, type: 3} + - {fileID: 12800000, guid: b2c9d40f1a8029940b936f531397b2cb, type: 3} + - {fileID: 12800000, guid: 3d48b57fcc2d5f74ca0db1eeb1488866, type: 3} + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: