同步

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)
+        use_custom_bg, bg_config)
-    if use_custom_bg then
-        TableBG.LoadTableBG(1, self._room.game_id, self._root_view, bg_config)
-    end
     self._hu_tip = HuTipView.new(self)
 
     self.selectLaiziBtn = self._view:GetChild('selectlaizi')

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

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

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

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -6,7 +6,7 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="showNext" pages="0,不展示,1,展示" selected="0"/>
   <controller name="showNextConfrim" pages="0,不展示,1,展示" selected="0"/>
-  <controller name="more" pages="0,,1," selected="0"/>
+  <controller name="more" pages="0,,1," selected="1"/>
   <displayList>
     <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1188,897" size="144,144">
       <gearDisplay controller="state" pages="0,2"/>
@@ -116,28 +116,6 @@
       <relation target="" sidePair="center-center,middle-middle"/>
     </group>
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="550,33" size="64,90" visible="false" touchable="false"/>
-    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84">
-      <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
-    </component>
-    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
-      <gearDisplay controller="more" pages="1"/>
-      <Button checked="true" icon="ui://v0j9abjygmbn13p"/>
-    </component>
-    <component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
-      <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13o"/>
-    </component>
-    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,309" pivot="0.5,0.5" size="126,126" group="n138_lu84">
-      <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13q"/>
-    </component>
-    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,360" pivot="0.5,0.5" size="126,126" group="n138_lu84">
-      <gearDisplay controller="more" pages="1"/>
-      <Button icon="ui://v0j9abjygmbn13r"/>
-    </component>
-    <group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
     <text id="n134_lu84" name="text_time" xy="162,44" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
     <component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="48,48" group="n135_lu84">
       <ProgressBar value="50" max="100"/>
@@ -174,6 +152,28 @@
       <gearDisplay controller="state" pages="1,3,4"/>
     </component>
     <group id="n169_gmbn" name="conter_box" xy="1136,375" size="258,258"/>
+    <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2232,36" group="n138_lu84"/>
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,60" pivot="0.5,0.5" size="72,72" group="n138_lu84" rotation="180">
+      <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
+      <Button checked="true" icon="ui://v0j9abjygmbn13t" controller="more" page="1"/>
+    </component>
+    <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,33" pivot="0.5,0.5" size="102,119" group="n138_lu84">
+      <gearDisplay controller="more" pages="1"/>
+      <Button checked="true" icon="ui://v0j9abjygmbn13p"/>
+    </component>
+    <component id="n172_gmbn" name="btn_rule" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2094,198" pivot="0.5,0.5" size="150,78" group="n138_lu84">
+      <gearDisplay controller="more" pages="1"/>
+      <Button icon="ui://v0j9abjygmbn13o"/>
+    </component>
+    <component id="n173_gmbn" name="btn_sendText" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2208,309" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+      <gearDisplay controller="more" pages="1"/>
+      <Button icon="ui://v0j9abjygmbn13q"/>
+    </component>
+    <component id="n174_gmbn" name="btn_pangGuang" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2373,360" pivot="0.5,0.5" size="126,126" group="n138_lu84">
+      <gearDisplay controller="more" pages="1"/>
+      <Button icon="ui://v0j9abjygmbn13r"/>
+    </component>
+    <group id="n138_lu84" name="top_right" xy="2031,33" size="468,453"/>
     <graph id="n146_l15a" name="btn_showNext" xy="1121,424" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
     </graph>