diff --git a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
index e5a0fbe6..271fb8f7 100644
--- a/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
+++ b/lua_probject/base_project/Game/View/NewGroup/MngView/GroupGameSettingView_jaingxi.lua
@@ -15,7 +15,6 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
self._animation = false
--self._full = true
self._full_offset = false
- self.selectedIndex = index
self._close_destroy = true
self._put_map = false
self._new_hide = false
@@ -30,8 +29,6 @@ function GroupGameSettingView.new(blur_view, gid, pid, room_config, callback)
self.room_config_config = json.decode(room_config.config)
end
-
-
self.rewards_data = {}
self.callback = callback
--self._full = true
@@ -585,6 +582,7 @@ function M:FillFagData()
play.xipai_rewardValueType = self.hpData.xipai_rewardValueType
play.anchou_rewardValueType = 1
_data.maxPlayers = res.Data.maxPlayers
+ _data.gameType = res.Data.gameType
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
@@ -626,6 +624,7 @@ function M:FillFagData()
play.xipai_rewardValueType = self.hpData.xipai_rewardValueType
play.anchou_rewardValueType = 1
_data.maxPlayers = res.Data.maxPlayers
+ _data.gameType = res.Data.gameType
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
@@ -1085,6 +1084,7 @@ function M:FillFagData_jiangxi()
play.xipai_rewardValueType = self.hpData.xipai_rewardValueType
play.anchou_rewardValueType = 1
_data.maxPlayers = res.Data.maxPlayers
+ play.gameType = res.Data.gameType
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
@@ -1126,6 +1126,7 @@ function M:FillFagData_jiangxi()
play.xipai_rewardValueType = self.hpData.xipai_rewardValueType
play.anchou_rewardValueType = 1
_data.maxPlayers = res.Data.maxPlayers
+ play.gameType = res.Data.gameType
play.config = json.encode(_data)
play.hp_times = self.hpData.times
play.maxPlayers = _data.maxPlayers
diff --git a/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml b/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml
index a0614755..df9d0631 100644
--- a/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml
+++ b/wb_new_ui/assets/Lobby/NumberRecord/Component/comp_numberRecordDetailChild.xml
@@ -11,20 +11,21 @@
-
+
-
+
-
+
-
+
+
@@ -35,6 +36,7 @@
+
\ No newline at end of file
diff --git a/wb_new_ui/assets/Lobby/Record.xml b/wb_new_ui/assets/Lobby/Record.xml
index 4272cce1..6c456082 100644
--- a/wb_new_ui/assets/Lobby/Record.xml
+++ b/wb_new_ui/assets/Lobby/Record.xml
@@ -23,13 +23,27 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -45,10 +59,15 @@
-
-
+
+
+
+
+
+
+
diff --git a/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml b/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml
index 8d735109..1e69f634 100644
--- a/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml
+++ b/wb_new_ui/assets/Lobby/component/Record/Component/listChild_detailMain.xml
@@ -6,18 +6,21 @@
-
+
-
+
+
+
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
index 0324649e..7b84b09b 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2/Component/NewHandCard/Player_card_info_S.xml
@@ -3,7 +3,7 @@
-
+
@@ -14,7 +14,7 @@
-
+
@@ -75,7 +75,7 @@
-
+
diff --git a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
index ac4b43b8..4446f6ec 100644
--- a/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
+++ b/wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4/Component/Btn_HandCard.xml
@@ -4,7 +4,7 @@
-
+
diff --git a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes
index bc5d31c1..1304ff40 100644
Binary files a/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes and b/wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_fui.bytes 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 82722054..1dbfce79 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_fui.bytes b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes
index bead9677..b048cef4 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/main_majiang/ui/Main_Majiang_r8cy1k6.mp3 b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3
deleted file mode 100644
index cc46bc74..00000000
Binary files a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3 and /dev/null differ
diff --git a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3.meta b/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3.meta
deleted file mode 100644
index e05f201c..00000000
--- a/wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_r8cy1k6.mp3.meta
+++ /dev/null
@@ -1,22 +0,0 @@
-fileFormatVersion: 2
-guid: baf4390005ea1484faee99cb1d3f3d98
-AudioImporter:
- externalObjects: {}
- serializedVersion: 6
- defaultSettings:
- loadType: 0
- sampleRateSetting: 0
- sampleRateOverride: 44100
- compressionFormat: 1
- quality: 1
- conversionMode: 0
- platformSettingOverrides: {}
- forceToMono: 0
- normalize: 1
- preloadAudioData: 1
- loadInBackground: 0
- ambisonic: 0
- 3D: 1
- userData:
- assetBundleName:
- assetBundleVariant: