diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
index 926cc53e..6590e90e 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua
@@ -40,10 +40,7 @@ function M:InitView(url)
-- end
local use_custom_bg = true
MJMainView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num),
- use_custom_bg)
- if use_custom_bg then
- TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
- end
+ use_custom_bg, bg_config)
self._hu_tip = HuTipView.new(self)
self.selectLaiziBtn = self._view:GetChild('selectlaizi')
diff --git a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
index 83717752..682c51a5 100644
--- a/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
+++ b/lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua
@@ -4,9 +4,16 @@ local TX_GameEvent = import(".GameEvent")
local PlayerInfoView = import(".EXPlayerInfoView")
local MJPlayerSelfCardInfoView = import(".MJPlayerSelfCardInfoView")
local MJPlayerCardInfoView = require("main.majiang.MJPlayerCardInfoView")
+local TableBG = require("Game.Data.TableBG")
+
local Record_Event = import(".RecordEvent")
+local bg_config = {
+ { id = 1, url = "base/main_majiang/bg/bg1", thumb = "ui://Main_Majiang/b01" },
+ { id = 2, url = "base/main_majiang/bg/bg2", thumb = "ui://Main_Majiang/b02" },
+ { id = 3, url = "base/main_majiang/bg/bg3", thumb = "ui://Main_Majiang/b03" }
+}
local M = {}
@@ -52,6 +59,12 @@ function M:InitView(url)
------------------渲染桌面信息--------------------------
+ local use_custom_bg = true
+ local default_bg = 1
+ if use_custom_bg then
+ TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+ end
+
local config = ExtendManager.GetExtendConfig(room.game_id)
local mode = config:GetGameInfo()
local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
@@ -84,6 +97,25 @@ function M:InitView(url)
info:FillData(p)
info._view.visible = true
end
+
+ -------------按钮初始化------------------------------
+ local changeTable = self._view:GetChild('btn_change')
+ if changeTable then
+ changeTable.onClick:Set(function()
+ default_bg = default_bg + 1 > #bg_config and 1 or default_bg + 1
+ TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
+ end)
+ end
+
+ local btn_rule = self._view:GetChild('btn_rule')
+ if btn_rule ~= nil then
+ btn_rule.onClick:Set(function()
+ if self.RuleView == nil or self.RuleView._is_destroy then
+ self.RuleView = RoomInfoView.new(self._room)
+ end
+ self.RuleView:Show()
+ end)
+ end
-------------------------------------------------------
self._ctr_state.selectedIndex = 4
diff --git a/lua_probject/main_project/main/majiang/MJMainView.lua b/lua_probject/main_project/main/majiang/MJMainView.lua
index 8e71c46c..5af169f2 100644
--- a/lua_probject/main_project/main/majiang/MJMainView.lua
+++ b/lua_probject/main_project/main/majiang/MJMainView.lua
@@ -15,7 +15,7 @@ local M = {}
setmetatable(M, { __index = MainView })
local default_bg = 1
-function M:InitView(url, use_custom_bg)
+function M:InitView(url, use_custom_bg, custom_bg_config)
-- 加载牌型数据
if not DataManager.CardTypeList then
local json_data = Utils.LoadLocalFile("CardTypeData")
@@ -31,6 +31,7 @@ function M:InitView(url, use_custom_bg)
MainView.InitView(self, url)
local _view = self._view
self._cursor = UIPackage.CreateObjectFromURL("ui://Main_Majiang/Ani_play_bj")
+ bg_config = custom_bg_config == nil and bg_config or custom_bg_config
if not use_custom_bg then
TableBG.LoadTableBG(default_bg, self._room.game_id, self._root_view, bg_config)
end
diff --git a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
index 369dbb66..5addd5a5 100644
--- a/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
+++ b/lua_probject/main_project/main/majiang/MJPlayerCardInfoView.lua
@@ -215,7 +215,7 @@ function M:UpdateOutCardList(outcard, card_item, cursor)
for i = 0, #outlist - 1 do
local outcard = self._view_outCardList:AddItemFromPool()
self:fillCard2(outcard, outCardName, outlist[i + 1])
- if not cursor and i == #outlist - 1 then
+ if cursor and i == #outlist - 1 then
outcard:AddChild(cursor)
cursor:Center()
end
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 e82d5872..ceedf375 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
@@ -6,7 +6,7 @@
-
+
@@ -116,28 +116,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -174,6 +152,28 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+