背景更改中

lua_probject/base_project/Game/View/Family/FamilyChatRoom.lua

@@ -127,6 +127,10 @@ end
 -- 新战绩推到时刷新一条
 function FamilyChatRoom:OnNewChatRefalsh(arg)
 
+    if self.group == nil then
+        return
+    end
+
     self.list_chat.numItems = #self.group.records or 0
 
     --[[

lua_probject/base_project/Game/View/MainView.lua

@@ -737,7 +737,7 @@ function M:EventInit()
 
     _gamectr:AddEventListener(GameEvent.AddScore, handler(self, self.OnAddScoreAnimation))
 
-    _gamectr:AddEventListener(GameEvent.MISSILE, handler(self, self.OnMissile))
+    --_gamectr:AddEventListener(GameEvent.MISSILE, handler(self, self.OnMissile))
 
     _gamectr:AddEventListener(
         GameEvent.DeskBreak,
@@ -1083,6 +1083,7 @@ function M:OnAddScoreAnimation(...)
     end
 end
 
+--[[
 function M:OnMissile(...)
     local arg = {...}
     print("OnMissile 有人发表情了")
@@ -1090,6 +1091,7 @@ function M:OnMissile(...)
     
     --self:Missile()
 end
+]]
 
 function M:OnUpdateInfo(...)
     local arg = { ... }

lua_probject/base_project/Game/View/PlayerInfoView.lua

@@ -400,7 +400,7 @@ function M:ScoreAnimation(score)
         self._list_scoreAnimation.xy = Rxy
         self.cScore.selectedIndex = 0
     end)
-    self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function()
+    self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function()
         self._list_scoreAnimation:TweenFade(1, 0)
     end)
 end

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -399,7 +399,7 @@ function M:ScoreAnimation(score)
         self._list_scoreAnimation.xy = Rxy
         self.cScore.selectedIndex = 0
     end)
-    self._list_scoreAnimation:TweenFade(0, 3):OnComplete(function()
+    self._list_scoreAnimation:TweenFade(0, 6):OnComplete(function()
         self._list_scoreAnimation:TweenFade(1, 0)
     end)
 end

lua_probject/extend_project/extend/majiang/fuzhou/EXMainView.lua

@@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
 local M = {}
 
-
-local bg_config = {
-    { id = 1, url = "extend/majiang/fuzhou/bg/bg1", thumb = "ui://Extend_MJ_FuZhou/bg1" },
-    { id = 2, url = "extend/majiang/fuzhou/bg/bg2", thumb = "ui://Extend_MJ_FuZhou/bg2" },
-    { id = 3, url = "extend/majiang/fuzhou/bg/bg3", thumb = "ui://Extend_MJ_FuZhou/bg3" },
-    { id = 4, url = "extend/majiang/fuzhou/bg/bg4", thumb = "ui://Extend_MJ_FuZhou/bg4" }
-}
 --- Create a new ZZ_MainView
 function M.new()
     setmetatable(M, { __index = MJMainView })
@@ -31,19 +24,16 @@ function M:InitView(url)
     local room = self._room
     self._style = 1
     self._gps_style = 1
-    self._full = true
+    --self._full = true
+    self._scale = true
     UIPackage.AddPackage("extend/majiang/fuzhou/ui/Extend_MJ_FuZhou")
     -- if self._room.room_config.people_num == 2 then
     --     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)
     -- else
     --     MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
     -- 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, bg_config)
+        true, nil)
-    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')
@@ -54,6 +44,7 @@ function M:InitView(url)
     self.Laizi2Btn.visible = true
     self.bugangnum = self._view:GetChild("bugangnum")
 
+    self.com_logocType.selectedIndex = 0
     --lingmeng
     --[[
     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)

lua_probject/extend_project/extend/majiang/fuzhou/EXWitnessView.lua

@@ -10,11 +10,6 @@ local WitnessView = require("Game.View.WitnessView")
 
 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 = {}
 
@@ -51,6 +46,7 @@ function M:InitView(url)
     BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
     self:EventInit()
     UpdateBeat:Add(self.OnUpdate, self)
+    WitnessView.InitView(self)
 
     local centerBox = self._view:GetChild("Comp_ConterBox")
     self._ctr_cardbox = centerBox:GetController("seat")
@@ -60,13 +56,6 @@ function M:InitView(url)
     self._anchor = self._view:GetChild("mask_tips")
 
     ------------------渲染桌面信息--------------------------
-
-    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))
@@ -102,15 +91,6 @@ function M:InitView(url)
         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()

lua_probject/extend_project/extend/majiang/jinxi/EXMainView.lua

@@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
 local M = {}
 
-
-local bg_config = {
-    { id = 1, url = "extend/majiang/jinxi/bg/bg1", thumb = "ui://Extend_MJ_JinXi/bg1" },
-    { id = 2, url = "extend/majiang/jinxi/bg/bg2", thumb = "ui://Extend_MJ_JinXi/bg2" },
-    { id = 3, url = "extend/majiang/jinxi/bg/bg3", thumb = "ui://Extend_MJ_JinXi/bg3" },
-    { id = 4, url = "extend/majiang/jinxi/bg/bg4", thumb = "ui://Extend_MJ_JinXi/bg4" }
-}
 --- Create a new ZZ_MainView
 function M.new()
     setmetatable(M, { __index = MJMainView })
@@ -40,7 +33,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, bg_config)
+        use_custom_bg, nil)
     self._hu_tip = HuTipView.new(self)
 
     self.selectLaiziBtn = self._view:GetChild('selectlaizi')
@@ -51,6 +44,7 @@ function M:InitView(url)
     self.Laizi2Btn.visible = true
     self.bugangnum = self._view:GetChild("bugangnum")
 
+    self.com_logocType.selectedIndex = 3
     --lingmeng
     --[[
     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)

lua_probject/extend_project/extend/majiang/jinxi/EXWitnessView.lua

@@ -10,12 +10,6 @@ local WitnessView = require("Game.View.WitnessView")
 
 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 = {}
 
 --- Create a new
@@ -51,6 +45,7 @@ function M:InitView(url)
     BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
     self:EventInit()
     UpdateBeat:Add(self.OnUpdate, self)
+    WitnessView.InitView(self)
 
     local centerBox = self._view:GetChild("Comp_ConterBox")
     self._ctr_cardbox = centerBox:GetController("seat")
@@ -60,13 +55,6 @@ function M:InitView(url)
     self._anchor = self._view:GetChild("mask_tips")
 
     ------------------渲染桌面信息--------------------------
-
-    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))
@@ -102,15 +90,6 @@ function M:InitView(url)
         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()

lua_probject/extend_project/extend/majiang/lichuan/EXMainView.lua

@@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
 local M = {}
 
-
-local bg_config = {
-    { id = 1, url = "extend/majiang/lichuan/bg/bg1", thumb = "ui://Extend_MJ_LiChuan/bg1" },
-    { id = 2, url = "extend/majiang/lichuan/bg/bg2", thumb = "ui://Extend_MJ_LiChuan/bg2" },
-    { id = 3, url = "extend/majiang/lichuan/bg/bg3", thumb = "ui://Extend_MJ_LiChuan/bg3" },
-    { id = 4, url = "extend/majiang/lichuan/bg/bg4", thumb = "ui://Extend_MJ_LiChuan/bg4" }
-}
 --- Create a new ZZ_MainView
 function M.new()
     setmetatable(M, { __index = MJMainView })
@@ -38,9 +31,8 @@ function M:InitView(url)
     -- else
     --     MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
     -- 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, bg_config)
+        true, nil)
     self._hu_tip = HuTipView.new(self)
 
     self.selectLaiziBtn = self._view:GetChild('selectlaizi')
@@ -51,6 +43,8 @@ function M:InitView(url)
     self.Laizi2Btn.visible = true
     self.bugangnum = self._view:GetChild("bugangnum")
 
+    self.com_logocType.selectedIndex = 2
+
     --lingmeng
     --[[
     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)

lua_probject/extend_project/extend/majiang/lichuan/EXWitnessView.lua

@@ -11,12 +11,6 @@ local WitnessView = require("Game.View.WitnessView")
 
 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 = {}
 
 --- Create a new
@@ -52,6 +46,8 @@ function M:InitView(url)
     BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
     self:EventInit()
     UpdateBeat:Add(self.OnUpdate, self)
+    WitnessView.InitView(self)
+
 
     local centerBox = self._view:GetChild("Comp_ConterBox")
     self._ctr_cardbox = centerBox:GetController("seat")
@@ -61,13 +57,6 @@ function M:InitView(url)
     self._anchor = self._view:GetChild("mask_tips")
 
     ------------------渲染桌面信息--------------------------
-
-    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))
@@ -103,15 +92,6 @@ function M:InitView(url)
         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()

lua_probject/extend_project/extend/majiang/nancheng/EXMainView.lua

@@ -9,13 +9,6 @@ local SettingView = import(".EXSettingView")
 local PlayerInfoView = import(".EXPlayerInfoView")
 local M = {}
 
-
-local bg_config = {
-    { id = 1, url = "extend/majiang/nancheng/bg/bg1", thumb = "ui://Extend_MJ_NanCheng/bg1" },
-    { id = 2, url = "extend/majiang/nancheng/bg/bg2", thumb = "ui://Extend_MJ_NanCheng/bg2" },
-    { id = 3, url = "extend/majiang/nancheng/bg/bg3", thumb = "ui://Extend_MJ_NanCheng/bg3" },
-    { id = 4, url = "extend/majiang/nancheng/bg/bg4", thumb = "ui://Extend_MJ_NanCheng/bg4" }
-}
 --- Create a new ZZ_MainView
 function M.new()
     setmetatable(M, { __index = MJMainView })
@@ -38,12 +31,8 @@ function M:InitView(url)
     -- else
     --     MJMainView.InitView(self, "ui://Main_Majiang/Main_" .. room.room_config.people_num .. "_s2")
     -- 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, bg_config)
+        true, nil)
-    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')
@@ -54,6 +43,7 @@ function M:InitView(url)
     self.Laizi2Btn.visible = true
     self.bugangnum = self._view:GetChild("bugangnum")
 
+    self.com_logocType.selectedIndex = 1
     --lingmeng
     --[[
     MJMainView.InitView(self, "ui://Main_Majiang/Main_new_" .. room.room_config.people_num)

lua_probject/extend_project/extend/majiang/nancheng/EXWitnessView.lua

@@ -10,12 +10,6 @@ local WitnessView = require("Game.View.WitnessView")
 
 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 = {}
 
 --- Create a new
@@ -51,6 +45,7 @@ function M:InitView(url)
     BaseView.InitView(self, string.format("ui://Main_Majiang/Main_new_%d_jiangxi", room.room_config.people_num))
     self:EventInit()
     UpdateBeat:Add(self.OnUpdate, self)
+    WitnessView.InitView(self)
 
     local centerBox = self._view:GetChild("Comp_ConterBox")
     self._ctr_cardbox = centerBox:GetController("seat")
@@ -60,13 +55,6 @@ function M:InitView(url)
     self._anchor = self._view:GetChild("mask_tips")
 
     ------------------渲染桌面信息--------------------------
-
-    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))
@@ -102,15 +90,6 @@ function M:InitView(url)
         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()

lua_probject/main_project/main/majiang/MJCheckG.lua

@@ -29,11 +29,17 @@ function M:init(url)
     self.coroutine = coroutine.start(function(...)
         self.valueTemp = 0
         while self.valueTemp < 100 do
+
+            -- 让他在72的时候卡顿一下
+            if self.valueTemp > 72 and self.valueTemp < 80 then
+                
+            end
+
             self.valueTemp = self.valueTemp + math.random(4)
             self.silder.value = self.valueTemp
             coroutine.wait(0.1)
         end
-        showText.text = "检测完成，没有外挂痕迹"
+        showText.text = "检测完毕,环境安全"
         coroutine.wait(2)
         self:Destroy()
     end)

lua_probject/main_project/main/majiang/MJMainView.lua

@@ -57,6 +57,8 @@ function M:InitView(url, use_custom_bg, custom_bg_config)
     self._ctr_cardbox = centerBox:GetController("seat")
     self._tex_leftTime = centerBox:GetChild("Text_Time")
 
+    self.com_logocType = _view:GetChild("com_logo"):GetController("cType")
+
     if self._room.card_type == 2 then
         self:Change3d(true)
     else

lua_probject/main_project/main/poker/PKCheckG.lua

@@ -33,7 +33,7 @@ function M:init(url)
             self.silder.value = self.valueTemp
             coroutine.wait(0.1)
         end
-        showText.text = "检测完成，没有外挂痕迹"
+        showText.text = "检测完毕,环境安全"
         coroutine.wait(2)
         self:Destroy()
     end)

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_2_jiangxi.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="1"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态,4,观战状态" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <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"/>
   <controller name="witness" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <displayList>
@@ -88,15 +88,15 @@
     <component id="n132_swus" name="jing" src="ckvb11l" fileName="Main_new/Main/Component/Comp_jing.xml" xy="313,40" size="113,124" visible="false" touchable="false">
       <relation target="n155_gi99" sidePair="left-left"/>
     </component>
-    <text id="n134_lu84" name="text_time" xy="119,0" size="96,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="22:20"/>
+    <text id="n134_lu84" name="text_time" xy="129,10" 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="5,4" group="n135_lu84">
+    <component id="n133_lu84" name="ProgressBar_jiangxi" src="lu84tv" fileName="Main_new/Main/ProgressBar_jiangxi.xml" xy="15,14" group="n135_lu84">
       <ProgressBar value="50" max="100"/>
     </component>
-    <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="3,105" pivot="0.5,0.5" size="219,63" group="n135_lu84">
+    <component id="n175_gmbn" name="btn_check" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="13,115" pivot="0.5,0.5" size="219,63" group="n135_lu84">
       <Button checked="true" icon="ui://v0j9abjygmbn13u"/>
     </component>
-    <text id="n136_lu84" name="text_roomId" xy="0,53" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
+    <text id="n136_lu84" name="text_roomId" xy="10,63" size="228,49" group="n135_lu84" font="ui://27vd145bh35o7ika" fontSize="36" color="#ffffff" text="房间：123456"/>
-    <group id="n135_lu84" name="top_left" xy="0,0" size="228,168"/>
+    <group id="n135_lu84" name="top_left" xy="10,10" size="228,168"/>
     <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,25" size="58,75" scale="2,2">
       <gearDisplay controller="state" pages="3"/>
     </component>
@@ -124,23 +124,23 @@
     <group id="n179_eqmd" name="center_text" xy="418,489" size="1696,172" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="100,808" size="153,120">
+    <component id="n115_pkx5" name="player_info1_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,921" size="153,120">
       <gearDisplay controller="state" pages="0,2"/>
       <gearXY controller="state" pages="0,1,2" values="1189,921|100,808|1183,921" default="1183,921"/>
       <gearSize controller="state" pages="0,1" values="153,120,1,1|153,120,1,1" default="144,144,1,1"/>
       <relation target="" sidePair="center-center,bottom-bottom"/>
     </component>
-    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="56,796" size="153,132">
+    <component id="n141_lu84" name="player_info1_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="739,916" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="1,3,4" values="56,796|73,784|71,774" default="739,916"/>
       <relation target="n118_pkx5" sidePair="right-left,top-top"/>
     </component>
-    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1834,63" size="153,132">
+    <component id="n150_kxhm" name="player_info2_1" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1189,223" size="153,132">
       <gearDisplay controller="state" pages="0,2"/>
-      <gearXY controller="state" pages="0,1,2" values="1189,274|1834,63|1188,274" default="1188,909"/>
+      <gearXY controller="state" pages="0,1,2" values="1189,223|1834,63|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1819,37" size="153,132">
+    <component id="n152_kxhm" name="player_info2_2" src="o8k813y" fileName="Main_new/Main_new_2/PlayerHead2_2.xml" xy="1886,538" size="153,132">
       <gearDisplay controller="state" pages="1,3,4"/>
       <gearXY controller="state" pages="0,1,3,4" values="1886,538|1819,37|1740,46|1752,62" default="1192,928"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -156,9 +156,9 @@
       <Button icon="ui://v0j9abjyu63319u"/>
     </component>
     <component id="n137_lu84" name="btn_setting" src="t6zvw5" fileName="Main_new/Main/Component/btn_setting.xml" xy="2172,12" size="141,117" group="n138_lu84"/>
-    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84">
+    <component id="n170_gmbn" name="btn_more" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2412,18" pivot="0.5,0.5" size="108,96" group="n138_lu84" rotation="180">
       <gearLook controller="more" pages="1" values="1,180,0,1" default="1,0,0,1"/>
-      <Button icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
+      <Button checked="true" icon="ui://v0j9abjyu63319w" controller="more" page="1"/>
     </component>
     <component id="n171_gmbn" name="btn_change" src="gmbn13s" fileName="Main_new/Main/Component/btn_normol.xml" xy="2031,47" pivot="0.5,0.5" size="102,91" group="n138_lu84">
       <gearDisplay controller="more" pages="1"/>
@@ -176,7 +176,9 @@
       <gearDisplay controller="more" pages="1"/>
       <Button icon="ui://v0j9abjyu6331a3"/>
     </component>
-    <group id="n138_lu84" name="top_right" xy="2031,12" size="489,467"/>
+    <group id="n138_lu84" name="top_right" xy="2031,12" size="489,467" advanced="true">
+      <relation target="" sidePair="right-right,top-top"/>
+    </group>
     <graph id="n146_l15a" name="btn_showNext" xy="1121,423" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
     </graph>
@@ -242,7 +244,9 @@
       <gearDisplay controller="witness" pages="1"/>
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
-    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123"/>
+    <component id="n187_pbp6" name="btn_sendTalk" src="pbp614i" fileName="Main_new/Chat/Component/Btn_MessageTalk.xml" xy="2322,519" size="144,123">
+      <relation target="" sidePair="right-right"/>
+    </component>
     <graph id="n188_pbp6" name="n188" xy="0,0" size="2532,1170" group="n191_pbp6" type="rect" lineSize="0" fillColor="#73000000"/>
     <image id="n189_pbp6" name="n189" pkg="v0j9abjy" src="pbp614k" fileName="Group 205(1).png" xy="1203,522" group="n191_pbp6"/>
     <text id="n190_pbp6" name="n190" xy="1024,667" size="484,79" group="n191_pbp6" fontSize="60" color="#ffffff" text="松开按钮发送语音"/>
@@ -256,5 +260,6 @@
       <relation target="" sidePair="center-center"/>
     </component>
     <group id="n59_v38k" name="huifang" xy="0,848" size="2532,165"/>
+    <component id="n193_o4nh" name="com_logo" src="o4nh1ei" fileName="Main_new/Component/com_logo.xml" xy="1219,384" size="435,73"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1477,6 +1477,15 @@
     <component id="qi561e3" name="btn_vedio.xml" path="/component/setting/Component/"/>
     <image id="qi561e8" name="Group 207.png" path="/Main_new/Main/Image/"/>
     <image id="qi561e9" name="Group 346.png" path="/Main_new/Main/Image/"/>
+    <image id="o4nh1ea" name="132.png" path="/Main_new/Image/"/>
+    <image id="o4nh1eb" name="121.png" path="/Main_new/Image/"/>
+    <image id="o4nh1ec" name="122.png" path="/Main_new/Image/"/>
+    <image id="o4nh1ed" name="123.png" path="/Main_new/Image/"/>
+    <image id="o4nh1ee" name="124.png" path="/Main_new/Image/"/>
+    <image id="o4nh1ef" name="125.png" path="/Main_new/Image/"/>
+    <image id="o4nh1eg" name="126.png" path="/Main_new/Image/"/>
+    <image id="o4nh1eh" name="127.png" path="/Main_new/Image/"/>
+    <component id="o4nh1ei" name="com_logo.xml" path="/Main_new/Component/"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg1.png.meta

@@ -6,8 +6,8 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -31,13 +31,13 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 2
     aniso: -1
     mipBias: -100
-    wrapU: 1
+    wrapU: -1
-    wrapV: 1
+    wrapV: -1
-    wrapW: 1
+    wrapW: -1
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -48,7 +48,7 @@ TextureImporter:
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
@@ -57,56 +57,56 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/de3462a6bae19a6c7308e43e0192028f
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg2.png.meta

@@ -6,8 +6,8 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
-    sRGBTexture: 0
+    sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
     borderMipMap: 0
@@ -31,13 +31,13 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 2
     aniso: -1
     mipBias: -100
-    wrapU: 1
+    wrapU: -1
-    wrapV: 1
+    wrapV: -1
-    wrapW: 1
+    wrapW: -1
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -48,7 +48,7 @@ TextureImporter:
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
@@ -57,56 +57,56 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
+    maxTextureSize: 8192
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
-    maxTextureSize: 2048
+    maxTextureSize: 8192
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
-    maxTextureSize: 2048
+    maxTextureSize: 8192
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
-    maxTextureSize: 2048
+    maxTextureSize: 8192
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/436191dfae4c9988ef8cf1effa8b6742
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/bg/bg3.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -31,13 +31,13 @@ TextureImporter:
   maxTextureSize: 2048
   textureSettings:
     serializedVersion: 2
-    filterMode: -1
+    filterMode: 2
     aniso: -1
     mipBias: -100
     wrapU: -1
     wrapV: -1
     wrapW: -1
-  nPOTScale: 0
+  nPOTScale: 1
   lightmap: 0
   compressionQuality: 50
   spriteMode: 0
@@ -48,7 +48,7 @@ TextureImporter:
   spritePixelsToUnits: 100
   spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 0
+  alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
@@ -57,56 +57,56 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 2048
     resizeAlgorithm: 0
-    textureFormat: -1
+    textureFormat: 3
-    textureCompression: 0
+    textureCompression: 1
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -124,5 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/main_majiang/703f4bfe3ba7f8e7e0643a2f1694170f
+  assetBundleName: 
   assetBundleVariant: