diff --git a/.gitignore b/.gitignore
index 32f79366..f67a93f4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,20 +4,9 @@
# 上传两个文件夹
!lua_probject/
!wb_unity_pro/
-wb_unity_pro/*
-!wb_unity_pro/Assets/
-wb_unity_pro/Assets/*
-!wb_unity_pro/Assets/ART/
+!wb_new_ui/
!lua_probject/**
-<<<<<<< HEAD
-!wb_unity_pro/Assets/ART/**
-!.gitignore
-=======
-<<<<<<< HEAD
-!wb_unity_pro/Assets/ART/**
-!.gitignore
-=======
-!wb_unity_pro/Assets/ART/**
->>>>>>> 9cc8415a0cfae87c6dc49e927ee054dfac98e95a
->>>>>>> 0686db8061b2c5c116395dd935e8cfdbaeda16b4
+!wb_unity_pro/**
+!wb_new_ui/**
+!.gitignore
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml b/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml
new file mode 100644
index 00000000..894a09df
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Btn_record_play(1).xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/Btn_record_return(1).xml b/wb_new_ui/assets/Common/component/record/Btn_record_return(1).xml
new file mode 100644
index 00000000..9d8f6fa0
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Btn_record_return(1).xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/Btn_record_speed(1).xml b/wb_new_ui/assets/Common/component/record/Btn_record_speed(1).xml
new file mode 100644
index 00000000..6979b6bf
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Btn_record_speed(1).xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/Component/btn_mul.xml b/wb_new_ui/assets/Common/component/record/Component/btn_mul.xml
new file mode 100644
index 00000000..f01f5a3b
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Component/btn_mul.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4919.png b/wb_new_ui/assets/Common/component/record/Component/font/4919.png
new file mode 100644
index 00000000..7fd60343
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4919.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4920.png b/wb_new_ui/assets/Common/component/record/Component/font/4920.png
new file mode 100644
index 00000000..ee29efea
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4920.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4921.png b/wb_new_ui/assets/Common/component/record/Component/font/4921.png
new file mode 100644
index 00000000..c9db81a0
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4921.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4922.png b/wb_new_ui/assets/Common/component/record/Component/font/4922.png
new file mode 100644
index 00000000..6da7145a
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4922.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4923.png b/wb_new_ui/assets/Common/component/record/Component/font/4923.png
new file mode 100644
index 00000000..c8986b84
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4923.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4924.png b/wb_new_ui/assets/Common/component/record/Component/font/4924.png
new file mode 100644
index 00000000..88747eea
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4924.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4925.png b/wb_new_ui/assets/Common/component/record/Component/font/4925.png
new file mode 100644
index 00000000..52272495
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4925.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4926.png b/wb_new_ui/assets/Common/component/record/Component/font/4926.png
new file mode 100644
index 00000000..21948119
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4926.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4927.png b/wb_new_ui/assets/Common/component/record/Component/font/4927.png
new file mode 100644
index 00000000..26a0ab6b
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4927.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/4928.png b/wb_new_ui/assets/Common/component/record/Component/font/4928.png
new file mode 100644
index 00000000..41f6ff1f
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/4928.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/MJ_recordSpeed.fnt b/wb_new_ui/assets/Common/component/record/Component/font/MJ_recordSpeed.fnt
new file mode 100644
index 00000000..2e1dbcb7
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Component/font/MJ_recordSpeed.fnt
@@ -0,0 +1,11 @@
+info size=20 colored=false
+char id=48 img=lj2n181 xoffset=0 yoffset=0 xadvance=0
+char id=49 img=lj2n182 xoffset=0 yoffset=0 xadvance=0
+char id=50 img=lj2n183 xoffset=0 yoffset=0 xadvance=0
+char id=51 img=lj2n184 xoffset=0 yoffset=0 xadvance=0
+char id=52 img=lj2n185 xoffset=0 yoffset=0 xadvance=0
+char id=53 img=lj2n186 xoffset=0 yoffset=0 xadvance=0
+char id=54 img=lj2n187 xoffset=0 yoffset=0 xadvance=0
+char id=55 img=lj2n188 xoffset=0 yoffset=0 xadvance=0
+char id=56 img=lj2n189 xoffset=0 yoffset=0 xadvance=0
+char id=57 img=lj2n18a xoffset=0 yoffset=0 xadvance=0
diff --git a/wb_new_ui/assets/Common/component/record/Component/font/x.png b/wb_new_ui/assets/Common/component/record/Component/font/x.png
new file mode 100644
index 00000000..4c82e442
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/Component/font/x.png differ
diff --git a/wb_new_ui/assets/Common/component/record/Record_New.xml b/wb_new_ui/assets/Common/component/record/Record_New.xml
new file mode 100644
index 00000000..6b4bd0f6
--- /dev/null
+++ b/wb_new_ui/assets/Common/component/record/Record_New.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Common/component/record/mahj_next_one_btn.png b/wb_new_ui/assets/Common/component/record/mahj_next_one_btn.png
new file mode 100644
index 00000000..733dc22b
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_next_one_btn.png differ
diff --git a/wb_new_ui/assets/Common/component/record/mahj_pause_btn.png b/wb_new_ui/assets/Common/component/record/mahj_pause_btn.png
new file mode 100644
index 00000000..f89d0568
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_pause_btn.png differ
diff --git a/wb_new_ui/assets/Common/component/record/mahj_previous_btn.png b/wb_new_ui/assets/Common/component/record/mahj_previous_btn.png
new file mode 100644
index 00000000..d9e2bc9a
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_previous_btn.png differ
diff --git a/wb_new_ui/assets/Common/component/record/mahj_record_speed_bg.png b/wb_new_ui/assets/Common/component/record/mahj_record_speed_bg.png
new file mode 100644
index 00000000..66d4a8a0
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_record_speed_bg.png differ
diff --git a/wb_new_ui/assets/Common/component/record/mahj_restart_btn.png b/wb_new_ui/assets/Common/component/record/mahj_restart_btn.png
new file mode 100644
index 00000000..783e99ca
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_restart_btn.png differ
diff --git a/wb_new_ui/assets/Common/component/record/mahj_start_btn.png b/wb_new_ui/assets/Common/component/record/mahj_start_btn.png
new file mode 100644
index 00000000..33dac960
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/mahj_start_btn.png differ
diff --git a/wb_new_ui/assets/Common/component/record/record/button02.png b/wb_new_ui/assets/Common/component/record/record/button02.png
new file mode 100644
index 00000000..d8ac1d65
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/record/button02.png differ
diff --git a/wb_new_ui/assets/Common/component/record/stop.png b/wb_new_ui/assets/Common/component/record/stop.png
new file mode 100644
index 00000000..dcfefd71
Binary files /dev/null and b/wb_new_ui/assets/Common/component/record/stop.png differ
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Component/btn_mul.xml b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Component/btn_mul.xml
new file mode 100644
index 00000000..f01f5a3b
--- /dev/null
+++ b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Component/btn_mul.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Image/Record2_08.png b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Image/Record2_08.png
new file mode 100644
index 00000000..edc5d9dc
Binary files /dev/null and b/wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Main/Image/Record2_08.png differ
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard2_Record.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard2_Record.xml
new file mode 100644
index 00000000..788328d4
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3/Component/Comp_3_HandCard2_Record.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml
new file mode 100644
index 00000000..788328d4
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard2_Record.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml
new file mode 100644
index 00000000..7a847110
--- /dev/null
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Comp_HandCard4_Record.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..db3bf26c
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/Family/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..0ad97f33
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/base_script/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..7aa3920e
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/chat/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..3403d6e3
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/common/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..6c73165e
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/embed/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..ce10d063
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/lobby/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..6378704c
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/login/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..c65640c2
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_majiang/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..61a3b1ca
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_pokemajiang/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..89edab4f
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_poker/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..7485b27b
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipai/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..9b37ed12
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/main_zipaimajiang/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..42d297f6
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/newgroup/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..12a32b93
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/rank/asset_pack1.0.7.bytes differ
diff --git a/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes
new file mode 100644
index 00000000..2a107fe5
Binary files /dev/null and b/wb_unity_pro/Pack/Android32/base/static/asset_pack1.0.7.bytes differ