diff --git a/lua_probject/main_project/main/majiang/MJPlayBackView.lua b/lua_probject/main_project/main/majiang/MJPlayBackView.lua index 7ffeaf53..dba8c333 100644 --- a/lua_probject/main_project/main/majiang/MJPlayBackView.lua +++ b/lua_probject/main_project/main/majiang/MJPlayBackView.lua @@ -68,7 +68,7 @@ function M:NextRecordPlay() self:RemoveCursor() local result = PlayBackView.NextRecordPlay(self) if not result then return end - self:ChangePlayState(false) + self:ChangePlayState(true) self._speed = 1 self._playFoward = true self:ChangeTextSpeed() @@ -78,7 +78,7 @@ function M:LastRecordPlay() self:RemoveCursor() local result = PlayBackView.LastRecordPlay(self) if not result then return end - self:ChangePlayState(false) + self:ChangePlayState(true) self._speed = 1 self._playFoward = true self:ChangeTextSpeed() diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_101.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_101.png new file mode 100644 index 00000000..88fc756a Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_101.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_102.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_102.png new file mode 100644 index 00000000..6b63e20e Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_102.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_103.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_103.png new file mode 100644 index 00000000..074fb1eb Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_103.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_104.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_104.png new file mode 100644 index 00000000..73bb0d35 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_104.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_105.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_105.png new file mode 100644 index 00000000..1a32a0d2 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_105.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_106.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_106.png new file mode 100644 index 00000000..00d2b04a Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_106.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_107.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_107.png new file mode 100644 index 00000000..47e60a56 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_107.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_108.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_108.png new file mode 100644 index 00000000..0d913f5f Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_108.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_109.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_109.png new file mode 100644 index 00000000..9074213f Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_109.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_201.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_201.png new file mode 100644 index 00000000..2815db4e Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_201.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_202.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_202.png new file mode 100644 index 00000000..28de8672 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_202.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_203.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_203.png new file mode 100644 index 00000000..c9dc7d8d Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_203.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_204.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_204.png new file mode 100644 index 00000000..4d30a356 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_204.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_205.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_205.png new file mode 100644 index 00000000..d7ddf4cc Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_205.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_206.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_206.png new file mode 100644 index 00000000..d9c2dff4 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_206.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_207.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_207.png new file mode 100644 index 00000000..5e9569b1 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_207.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_208.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_208.png new file mode 100644 index 00000000..2b630c3d Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_208.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_209.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_209.png new file mode 100644 index 00000000..641bb969 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_209.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_301.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_301.png new file mode 100644 index 00000000..6ff6bb7d Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_301.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_302.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_302.png new file mode 100644 index 00000000..fd72621f Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_302.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_303.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_303.png new file mode 100644 index 00000000..fbaf49b1 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_303.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_304.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_304.png new file mode 100644 index 00000000..00452382 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_304.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_305.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_305.png new file mode 100644 index 00000000..d40aca87 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_305.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_306.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_306.png new file mode 100644 index 00000000..6559e035 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_306.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_307.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_307.png new file mode 100644 index 00000000..a3dc4dd3 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_307.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_308.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_308.png new file mode 100644 index 00000000..7d582cf9 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_308.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_309.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_309.png new file mode 100644 index 00000000..0e116c2b Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_309.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_401.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_401.png new file mode 100644 index 00000000..6b8e4ced Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_401.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_402.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_402.png new file mode 100644 index 00000000..f049908d Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_402.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_403.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_403.png new file mode 100644 index 00000000..1c7ebace Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_403.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_404.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_404.png new file mode 100644 index 00000000..830c75b4 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_404.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_501.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_501.png new file mode 100644 index 00000000..99b230c8 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_501.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_502.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_502.png new file mode 100644 index 00000000..50b982c5 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_502.png differ diff --git a/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_503.png b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_503.png new file mode 100644 index 00000000..22823cf1 Binary files /dev/null and b/wb_new_ui/assets/Main_Majiang/images/cards3/3/b203_503.png differ diff --git a/wb_new_ui/assets/Main_Majiang/package.xml b/wb_new_ui/assets/Main_Majiang/package.xml index 68bf6e9c..bbee4a9b 100644 --- a/wb_new_ui/assets/Main_Majiang/package.xml +++ b/wb_new_ui/assets/Main_Majiang/package.xml @@ -1362,6 +1362,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 index 00298671..7a66e823 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas0_5.png 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.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png index f7803a9f..b5159e25 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0.png 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 index 6c794133..da6f9158 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_atlas0_2.png b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png index 88135b88..77445029 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_2.png 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 index e99dd34a..f2a488ae 100644 Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_atlas0_3.png 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_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/main_majiang_fui.bytes index 55498ddc..286bf19c 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