diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Player_card_info_1.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Player_card_info_1.xml index 0666801e..f89cb006 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main/Player_card_info_1.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main/Player_card_info_1.xml @@ -8,8 +8,9 @@ - + + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2.xml index da1aa7f0..3c153cba 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2.xml @@ -44,9 +44,9 @@ - + - + diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml index 52960b61..9ce61b07 100644 --- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml +++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml @@ -107,6 +107,7 @@ + diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png new file mode 100644 index 00000000..7779191b Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0.png 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 new file mode 100644 index 00000000..6101f311 Binary files /dev/null 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_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png new file mode 100644 index 00000000..488430d7 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_2.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png new file mode 100644 index 00000000..f016c8ef Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_3.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png new file mode 100644 index 00000000..83b4181f Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta index c579e2cd..740e2296 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_4.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png new file mode 100644 index 00000000..00298671 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta index 3a673327..7afbaa09 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png new file mode 100644 index 00000000..4ceac699 Binary files /dev/null and b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png differ diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta index 29f6d69a..d883d92a 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas_yry6yx.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: 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 new file mode 100644 index 00000000..4a74fc99 Binary files /dev/null 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/main_majiang/ui/main_majiang_atlas0.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta index 90f0cfab..22410103 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta index c3836016..cfd20695 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_1.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta index 7ab04525..95139500 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta index 195048b9..d1f707d6 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png.meta @@ -88,5 +88,5 @@ TextureImporter: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta index 1a875077..828134b2 100644 --- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta +++ b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes.meta @@ -3,5 +3,5 @@ guid: 326fa64ee0dd8b94aa86fa1978e56fa5 TextScriptImporter: externalObjects: {} userData: - assetBundleName: base/main_majiang/abf0e2af8fb6daf78fa8ebcdd8acc4f0 + assetBundleName: assetBundleVariant: diff --git a/wb_unity_pro/Assets/Scripts/Tool.meta b/wb_unity_pro/Assets/Scripts/Tool.meta new file mode 100644 index 00000000..90c801c2 --- /dev/null +++ b/wb_unity_pro/Assets/Scripts/Tool.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: af5fd386b2b51a24c956d3eb18c7bbc3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: