同步重置

lua_probject/base_project/Game/Controller/LoddyController.lua

@@ -434,3 +434,17 @@ function M:SetInvited(on, callback)
 		callback(res)
 	end)
 end
+
+--赠送房卡
+function M:GiftDiamond(data, callback)
+	--不走登录逻辑
+	local _client = ControllerManager.WebClient
+	local _data = {}
+	_data.tagId = data.tagId or 0
+	_data.diamo = data.diamo or 0
+	_client:send(Protocol.WEB_RECHARGE_DIAMO, _data, function(res)
+		if (callback ~= nil) then
+			callback(res)
+		end
+	end)
+end

lua_probject/base_project/Game/Controller/LoginController.lua

@@ -48,7 +48,7 @@ local function __Login(cmd, _data, callBack)
             user.head_url   = account["portrait"]
             user.room_id    = account["roomid"]
             user.group_id   = account["groupId"]
-            user.type       = account["type"]
+            user.type       = account["type"] --为1的时候是代理，为0的时候是普通玩家
             user.agent      = account["mng"]
 
             user.real_info  = account.real_info

lua_probject/base_project/Game/Protocol.lua

@@ -39,6 +39,8 @@ Protocol = {
     WEB_GET_AGENT_SECRET     = "acc/agent_secret",
     -- 设置被邀请开关
     WEB_SET_GROUP_INVITATED  = "acc/set_group_invitation",
+    ---赠送房卡
+    WEB_RECHARGE_DIAMO       = "acc/recharge_diamo",
     ----index----
     -- 获取公告
     WEB_UPDATE_NOTICE        = "index/get_notice",

lua_probject/base_project/Game/View/Lobby/CreateRoomView.lua

@@ -9,7 +9,8 @@ function CreateRoomView.new(index)
     local self = setmetatable({}, { __index = M })
     self.class = "CreateRoomView"
     self._animation = false
-    self._full = true
+    --self._full = true
+    self._scale = true
     self._full_offset = false
     self._modeMap = {}
     self.selectedIndex = index

lua_probject/base_project/Game/View/Lobby/LobbyGiftDiamond.lua

@@ -0,0 +1,33 @@
+local LobbyGiftDiamond = {}
+
+local M = LobbyGiftDiamond
+
+function M.new()
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = "LobbyGiftDiamond"
+    self._close_destroy = true
+    self:init("ui://Lobby/GiftDiamond")
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    self._view:GetChild('btn_center').onClick:Set(function()
+        local text_id = self._view:GetChild('input_id').text
+        local text_num = self._view:GetChild('input_num').text
+
+        local lobbyCtr = ControllerManager.GetController(LoddyController)
+        lobbyCtr:GiftDiamond({ tagId = tonumber(text_id), diamo = tonumber(text_num) }, function(res)
+            if res.ReturnCode == 0 then
+                self:Destroy()
+                ViewUtil.ErrorTip(-1, "赠送房卡成功")
+            else
+                ViewUtil.ErrorTip(res.ReturnCode, "赠送房卡失败")
+            end
+        end)
+    end)
+end
+
+return M

lua_probject/base_project/Game/View/LobbyView.lua

@@ -19,6 +19,7 @@ local HeadView = import(".Lobby.LobbyHeadView")
 local PhoneBindView = import(".Lobby.PhoneBindView")
 local RealAddressView = import(".Lobby.RealAddressView")
 local LobbyHeadView = import(".Lobby.LobbyHeadView")
+local LobbyGiftDiamond = import(".Lobby.LobbyGiftDiamond")
 
 LobbyView = {}
 
@@ -150,9 +151,12 @@ function M:InitView(url)
     end)
 
     local btn_diamo = self._view:GetChild("btn_diamo")
-    -- btn_diamo.onClick:Add(function()
-    --     ViewUtil.ErrorTip(self._view, string.format("当前房卡一共%s张", DataManager.SelfUser.diamo))
-    -- end)
+    btn_diamo.onClick:Add(function()
+        if DataManager.SelfUser.type == 1 then
+            local lobbyGiftDiamond = LobbyGiftDiamond.new()
+            lobbyGiftDiamond:Show()
+        end
+    end)
 
     local btn_customerService = self._view:GetChild("btn_customerService")
     btn_customerService.onClick:Add(function()
@@ -204,7 +208,7 @@ function M:InitView(url)
 
     view:GetChild("tex_name").emojies = EmojiDitc.EmojiesDitc
     view:GetChild("tex_name").text = Utils.TextOmit(DataManager.SelfUser.nick_name, 6, "...")
-    view:GetChild("tex_id").text = tostring(DataManager.SelfUser.account_id)
+    view:GetChild("tex_id").text = string.format("ID:%s", tostring(DataManager.SelfUser.account_id))
 
     view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo)
 

lua_probject/base_project/Game/View/PlayerInfoView2.lua

@@ -169,7 +169,7 @@ function M:FillData(player)
             self._tex_player_id.text = ""
         end
     else
-        self._tex_player_name.text = player.self_user.nick_name
+        self._tex_player_name.text = Utils.TextOmit(player.self_user.nick_name, 6, "...")
         if self._tex_player_id then
             self._tex_player_id.text = "ID:" .. player.self_user.account_id
         end

lua_probject/extend_project/extend/poker/runfast/ExtendConfig.lua

@@ -92,7 +92,8 @@ function M:FillRoomData(s2croom)
     if room.curren_round == 0 and reload then
         room.curren_round = 1
     end
-
+    room.witness_player_list = _tableInfo["playerSpectatorData"]
+    room._flag_updateWitness = true
     local playerList = _tableInfo["playerData"]
     for i = 1, #playerList do
         local _jp = playerList[i]
@@ -271,6 +272,7 @@ function M:FillWitnessData(pd_data)
 
     room.curren_round = _tableInfo["round"]
 
+    room.witness_player_list = _tableInfo["playerSpectatorData"]
     local playerList = _tableInfo["playerData"]
     for i = 1, #playerList do
         local _jp = playerList[i]

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/PlayerHead_1.xml

@@ -38,7 +38,7 @@
       <gearDisplay controller="bank" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,left-left,top-top"/>
     </image>
-    <text id="n51_ckvb" name="name" xy="2,138" size="180,59" font="Arial" fontSize="44" color="#ffe26d" align="center" vAlign="middle" letterSpacing="6" autoClearText="true" text="你好~凌">
+    <text id="n51_ckvb" name="name" xy="2,138" size="311,59" font="Arial" fontSize="44" color="#ffe26d" vAlign="middle" letterSpacing="6" autoSize="none" autoClearText="true" text="你好~凌">
       <relation target="" sidePair="left-left,top-bottom%"/>
     </text>
     <image id="n28_e54q" name="n28" src="lwcl2m" fileName="font/images/head/index_bg_01.png" pkg="27vd145b" xy="-343,-226" size="100,98" group="n33_e7qn" aspect="true" visible="false"/>

wb_new_ui/assets/FGAssist/invite/component/invite/item_invite.xml

@@ -5,7 +5,7 @@
   <displayList>
     <graph id="n13_kzuz" name="n13" xy="0,0" size="144,144" type="rect" lineColor="#ff804b2e" fillColor="#ffe0a94f" corner="12"/>
     <component id="n2_cioe" name="btn_head" src="kzuzhof" fileName="invite/component/invite/btn_head.xml" xy="6,6"/>
-    <text id="n3_cioe" name="tex_name" xy="153,36" size="161,49" fontSize="36" color="#444444" vAlign="middle" autoSize="shrink" text="ddddddd"/>
+    <text id="n3_cioe" name="tex_name" xy="153,36" size="376,55" font="Arial" fontSize="41" color="#333333" vAlign="middle" autoSize="none" text="ddddddd对对对对对对的点点滴滴哒哒哒哒哒哒哒哒哒"/>
     <text id="n4_cioe" name="tex_id" xy="117,62" size="161,34" visible="false" fontSize="30" color="#5c3c16" vAlign="middle" autoSize="shrink" text="ID:123456"/>
     <component id="n8_cioe" name="btn_invite" src="cioehnc" fileName="invite/component/invite/btn_invite.xml" xy="509,25" size="210,112">
       <gearDisplay controller="enable" pages="0"/>
@@ -19,7 +19,7 @@
     <image id="n14_kzuz" name="n14" src="kzuzhog" fileName="invite/image/invite/image_inGame.png" xy="153,84">
       <gearDisplay controller="type" pages="2"/>
     </image>
-    <image id="n15_kzuz" name="n15" src="kzuzhoh" fileName="invite/image/invite/image_levef.png" xy="153,84">
+    <image id="n15_kzuz" name="n15" src="kzuzhoh" fileName="invite/image/invite/image_levef.png" xy="153,88">
       <gearDisplay controller="type" pages="0"/>
     </image>
     <image id="n16_kzuz" name="n16" src="kzuzhoi" fileName="invite/image/invite/image_online.png" xy="153,84">

wb_new_ui/assets/Family/NumberRecord/Component/comp_numberRecordDetailResultChild.xml

@@ -4,7 +4,7 @@
   <controller name="c1" pages="2,红,3,蓝" selected="0"/>
   <displayList>
     <component id="n0_jrro" name="btn_head" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="44,45" size="77,71"/>
-    <text id="n1_jrro" name="text_score" xy="115,50" size="79,59" font="FZCuYuan-M03" fontSize="40" color="#0000ff" align="center" vAlign="middle" autoSize="shrink" text="+16">
+    <text id="n1_jrro" name="text_score" xy="115,50" size="66,54" font="FZCuYuan-M03" fontSize="40" color="#0000ff" align="center" vAlign="middle" text="+16">
       <gearColor controller="colour" pages="0,1" values="#0000ff,#000000|#ff0000,#000000"/>
       <relation target="n0_jrro" sidePair="left-left"/>
     </text>

wb_new_ui/assets/Lobby/CreatePlay.xml

@@ -3,6 +3,9 @@
   <controller name="gameName" pages="0,,1,,2," selected="0"/>
   <controller name="playName" pages="0,,1," selected="0"/>
   <displayList>
+    <image id="n24_if10" name="n24" src="qmc17jbz" fileName="bg/loginBg.png" pkg="27vd145b" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <image id="n17_p8hp" name="n17" src="p8hp7cyv" fileName="component/CreatePlay/Image/bg_main1.png" xy="30,22">
       <relation target="" sidePair="center-center,middle-middle"/>
     </image>
@@ -20,6 +23,7 @@
       <relation target="" sidePair="right-right,top-top"/>
     </component>
     <list id="n6_pzuc" name="list_playName" xy="60,156" size="472,976" overflow="scroll" lineGap="24" defaultItem="ui://2d9xdj6z86ct7cwy" align="center" selectionController="playName" autoClearItems="true">
+      <relation target="" sidePair="width-width%,height-height%"/>
       <item/>
     </list>
     <image id="n22_n9qr" name="n22" src="l2997iht" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="1667,1002" size="174,78" group="n15_pzuc"/>

wb_new_ui/assets/Lobby/Main_New.xml

@@ -7,19 +7,19 @@
     <image id="n190_ivty" name="n190" src="jrro7cya" fileName="component/Main/Image/bg.png" xy="0,0" size="2533,1170">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <richtext id="n26" name="tex_name" xy="193,29" size="274,59" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="一共只有七个字">
+    <richtext id="n26" name="tex_name" xy="202,28" size="274,59" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" vAlign="middle" leading="0" autoSize="none" text="一共只有七个字">
       <relation target="n203_jrro" sidePair="left-right%,top-top"/>
     </richtext>
-    <text id="n84_mv8k" name="tex_id" xy="192,84" size="286,60" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" letterSpacing="-1" autoSize="shrink" text="ID:12345678">
+    <text id="n84_mv8k" name="tex_id" xy="202,89" size="286,60" group="n28" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" letterSpacing="-1" autoSize="shrink" text="ID:12345678">
       <relation target="n203_jrro" sidePair="right-right%,bottom-bottom"/>
     </text>
-    <image id="n203_jrro" name="n203" src="jrro7cyd" fileName="component/Main/Image/touxiangkuang.png" xy="60,24" group="n28">
+    <image id="n203_jrro" name="n203" src="66fw7d6a" fileName="component/PlayerInfo/Image/head_frame.png" xy="59,23" size="123,131" group="n28">
       <relation target="" sidePair="left-left%,top-top%"/>
     </image>
-    <component id="n193_jqwo" name="btn_head" src="jqwo7cp6" fileName="component/Main/Component/player_info/head.xml" xy="63,27" size="112,114" group="n28">
+    <component id="n193_jqwo" name="btn_head" src="jqwo7cp6" fileName="component/Main/Component/player_info/head.xml" xy="65,28" size="112,114" group="n28">
       <relation target="n203_jrro" sidePair="left-left%,top-top%"/>
     </component>
-    <group id="n28" name="player_info_panel" xy="60,24" size="418,120" advanced="true">
+    <group id="n28" name="player_info_panel" xy="59,23" size="429,131" advanced="true">
       <relation target="" sidePair="left-left,top-top"/>
     </group>
     <component id="n168_isi5" name="btn_join" src="isi57co4" fileName="component/Main/Component/down/btn_join.xml" xy="949,950" group="n7">

wb_new_ui/assets/Lobby/component/GiftDiamond/Component/GiftDiamond.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1320,705">
+  <displayList>
+    <image id="n1_if10" name="n1" src="if107d9m" fileName="images/pop_oneInput/bg.png" xy="12,45" size="1320,660" group="n3_if10"/>
+    <image id="n2_if10" name="n2" src="if107d9n" fileName="images/pop_oneInput/title_top.png" xy="0,0" size="1345,128" group="n3_if10"/>
+    <group id="n3_if10" name="bg" xy="0,0" size="1345,705"/>
+    <component id="n4_if10" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1240,-20" size="122,130" aspect="true"/>
+    <text id="n5_if10" name="n5" xy="66,7" size="1188,101" font="Alibaba PuHuiTi 3.0" fontSize="68" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" shadowColor="#000000" shadowOffset="1,1" text="转让房卡"/>
+    <image id="n6_if10" name="n6" src="if107d9o" fileName="images/pop_oneInput/input.png" xy="418,223" size="819,75"/>
+    <text id="n7_if10" name="input_id" xy="418,223" size="819,75" font="Alibaba PuHuiTi 3.0" fontSize="56" vAlign="middle" autoSize="none" autoClearText="true" text="shuru" input="true"/>
+    <text id="n10_if10" name="n10" xy="121,231" size="231,58" scale="1.2,1" font="Arial" fontSize="43" text="赠送目标ID:"/>
+    <image id="n8_if10" name="n8" src="if107d9o" fileName="images/pop_oneInput/input.png" xy="418,378" size="819,75"/>
+    <text id="n9_if10" name="input_num" xy="418,378" size="819,75" font="Alibaba PuHuiTi 3.0" fontSize="56" vAlign="middle" autoSize="none" autoClearText="true" text="shuru" input="true"/>
+    <text id="n11_if10" name="n11" xy="78,386" size="274,58" scale="1.2,1" font="Arial" fontSize="43" text="赠送房卡数量:"/>
+    <component id="n12_if10" name="btn_center" src="n2h87imc" fileName="component/pop_oneChoose/btn_oneChoose.xml" pkg="27vd145b" xy="455,519" size="410,125">
+      <Button icon="ui://2d9xdj6zif107d9p"/>
+    </component>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/component/Main/Component/top/btn_diamo.xml

@@ -5,7 +5,7 @@
     <image id="n4_jrro" name="n4" src="jrro7cyf" fileName="component/Main/Image/fangkashuzikuang.png" xy="27,6"/>
     <image id="n5_jrro" name="n5" src="jrro7cy7" fileName="component/Main/Image/hall_view_cl_fk_unct.png" xy="0,0"/>
     <image id="n6_jrro" name="n6" src="jrro7cye" fileName="component/Main/Image/update.png" xy="259,2"/>
-    <text id="n7_jrro" name="title" xy="80,11" size="180,67" font="ui://27vd145bh35o7iln" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="1000000"/>
+    <text id="n7_jrro" name="title" xy="73,9" size="143,68" scale="1.3,1" font="ui://27vd145bh35o7iln" fontSize="46" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="10000"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Lobby/component/Record/Component/listChild_recordListChild.xml

@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="455,48" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="colour" pages="0,,1," selected="1"/>
+  <controller name="colour" pages="0,,1," selected="0"/>
   <displayList>
-    <graph id="n0_ukp7" name="n0" xy="0,0" size="455,48" touchable="false" type="rect" lineSize="0" fillColor="#73333333">
+    <graph id="n0_ukp7" name="n0" xy="0,0" size="455,48" touchable="false" type="rect" lineSize="0" fillColor="#33999999">
       <relation target="" sidePair="width-width,height-height"/>
     </graph>
     <text id="n3_ukp7" name="text_name" xy="166,-1" size="59,46" scale="1.3,1" fontSize="34" color="#a16115" align="right" autoClearText="true" text="jefe">
       <relation target="" sidePair="right-right%"/>
     </text>
-    <text id="n4_ukp7" name="text_score" xy="279,-1" size="34,46" scale="1.3,1" fontSize="34" color="#ff0000" align="right" autoClearText="true" text="-4">
+    <text id="n4_ukp7" name="text_score" xy="279,-1" size="34,46" scale="1.3,1" fontSize="34" color="#0908fd" align="right" autoClearText="true" text="-4">
       <gearColor controller="colour" pages="0,1" values="#0908fd,#000000|#ff0000,#000000"/>
       <relation target="" sidePair="left-left%"/>
     </text>

wb_new_ui/assets/Lobby/component/Record/Component/listChild_recordMain.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2395,203" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="win" pages="0,,1," selected="1"/>
+  <controller name="win" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n4_ukp7" name="n4" src="66fw7d6v" fileName="component/Record/Image/Recharge_2.png" xy="0,0" size="2395,203"/>
     <text id="n5_ukp7" name="text_gameName" xy="34,18" pivot="0.5,0.5" size="209,162" scale="1.3,1" font="Arial" fontSize="38" color="#ff6f06" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="黎川麻将">
@@ -14,7 +14,7 @@
     <image id="n7_ukp7" name="n7" src="66fw7d6n" fileName="component/Record/Image/Record12.png" xy="298,42" size="179,118">
       <gearDisplay controller="win" pages="0"/>
     </image>
-    <text id="n8_ukp7" name="text_score" xy="532,17" pivot="0.5,0.5" size="160,168" scale="1.3,1" fontSize="46" color="#ff0000" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+4">
+    <text id="n8_ukp7" name="text_score" xy="532,17" pivot="0.5,0.5" size="160,168" scale="1.3,1" fontSize="46" color="#0908fd" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+4">
       <gearColor controller="win" pages="1" values="#ff0000,#000000" default="#0908fd,#000000"/>
       <relation target="" sidePair="width-width%,height-height%"/>
     </text>
@@ -24,16 +24,22 @@
     <text id="n11_ukp7" name="text_time1" xy="1932,17" pivot="0.5,0.5" size="211,168" scale="1.3,1" fontSize="32" color="#a16115" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="2025-09-08&#xA;14:34:22">
       <relation target="" sidePair="width-width%,height-height%"/>
     </text>
-    <component id="n12_ukp7" name="btn_lookRecord" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2237,70" pivot="0.5,0.5" size="102,65">
+    <component id="n12_ukp7" name="btn_lookRecord" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2237,70" size="102,65">
       <relation target="" sidePair="width-width%,height-height%"/>
       <Button icon="ui://2d9xdj6z66fw7d6p"/>
     </component>
-    <list id="n13_ukp7" name="list" xy="963,18" size="921,164" layout="flow_hz" overflow="scroll" colGap="7" defaultItem="ui://2d9xdj6zukp77d9l" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n13_ukp7" name="list" xy="963,18" size="921,164" layout="flow_hz" colGap="7" defaultItem="ui://2d9xdj6zukp77d9l" align="center" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
+    <image id="n14_if10" name="n14" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="275,8" scale="1.5,1.5"/>
+    <image id="n15_if10" name="n15" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="505,8" scale="1.5,1.5"/>
+    <image id="n16_if10" name="n16" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="718,8" scale="1.5,1.5"/>
+    <image id="n17_if10" name="n17" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="956,8" scale="1.5,1.5"/>
+    <image id="n18_if10" name="n18" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="1890,8" scale="1.5,1.5"/>
+    <image id="n19_if10" name="n19" src="66fw7d6w" fileName="component/Record/Image/Record02.png" xy="2180,8" scale="1.5,1.5"/>
   </displayList>
   <Button/>
 </component>

wb_new_ui/assets/Lobby/package.xml

@@ -692,6 +692,11 @@
     <component id="n9qr7d9i" name="btn_close.xml" path="/component/"/>
     <component id="ukp77d9j" name="listChild_recordMain.xml" path="/component/Record/Component/"/>
     <component id="ukp77d9l" name="listChild_recordListChild.xml" path="/component/Record/Component/"/>
+    <component id="if107jg4" name="GiftDiamond.xml" path="/component/GiftDiamond/Component/" exported="true"/>
+    <image id="if107d9m" name="bg.png" path="/component/GiftDiamond/Image/" scale="9grid" scale9grid="14,135,28,270"/>
+    <image id="if107d9n" name="title_top.png" path="/component/GiftDiamond/Image/" scale="9grid" scale9grid="160,22,320,44"/>
+    <image id="if107d9o" name="input.png" path="/component/GiftDiamond/Image/" scale="9grid" scale9grid="11,12,22,24"/>
+    <image id="if107d9p" name="hall_club_common_btntext_queding.png" path="/component/GiftDiamond/Image/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_1.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="132,132" initName="gcm_info">
   <controller name="room_owner" pages="0,,1," selected="0"/>
-  <controller name="bank" pages="0,,1," selected="1"/>
+  <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
   <controller name="three_win" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
@@ -34,20 +34,20 @@
       <gearDisplay controller="read" pages="1"/>
       <relation target="" sidePair="center-center,top-bottom"/>
     </image>
-    <text id="n48_pkx5" name="name" xy="-47,-43" size="226,49" font="FZCuYuan-M03" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="shrink" text="萌萌砂带">
-      <gearXY controller="site" pages="2,0,1" values="-47,-43|-37,-57|150,0"/>
+    <text id="n48_pkx5" name="name" xy="-69,-43" size="270,49" font="FZCuYuan-M03" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="萌萌砂带能能">
+      <gearXY controller="site" pages="2,0,1" values="-69,-43|-37,-57|150,0"/>
       <relation target="" sidePair="center-center,top-top"/>
     </text>
-    <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="78,6" size="232,80" alpha="0" touchable="false" pkg="27vd145b">
+    <component id="n31_e54q" name="chat" src="gq7m6b" fileName="component/head/MsgBubble2.xml" pkg="27vd145b" xy="78,6" size="232,80" alpha="0" touchable="false">
       <Label title="你太牛了"/>
     </component>
-    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/Face3.xml" xy="0,0" alpha="0" touchable="false" pkg="27vd145b">
+    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/head/Face3.xml" pkg="27vd145b" xy="0,0" alpha="0" touchable="false">
       <relation target="" sidePair="width-width,height-height"/>
     </component>
     <image id="n38_tla5" name="n38" src="sx7x14g" fileName="Main_new/Main/Image/gamechatback1.png" xy="85,4" size="157,64" scale="1.3,1.3">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
-    <component id="n18" name="mask_voice" src="gq7m61" fileName="component/VoiceMask(1).xml" xy="112,9" size="140,74" touchable="false" pkg="27vd145b">
+    <component id="n18" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="112,9" size="140,74" touchable="false">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
     <component id="n39_nip5" name="mask_piao" src="gq7m65" fileName="component/piao_niao/mask_piao.xml" xy="-5,97" touchable="false">

wb_new_ui/assets/Main_Majiang/Main_new/Main/PlayerHead_2.xml

@@ -4,7 +4,7 @@
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="read" pages="0,,1," selected="0"/>
   <controller name="offline" pages="0,,1," selected="0"/>
-  <controller name="mask_voice" pages="0,,1," selected="1"/>
+  <controller name="mask_voice" pages="0,,1," selected="0"/>
   <controller name="piao_niao" pages="0,,1," selected="0"/>
   <controller name="three_win" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
@@ -36,18 +36,18 @@
     <image id="n8" name="ready" src="gq7m5y" fileName="font/images/game/game_fonts_01.png" xy="158,32">
       <gearDisplay controller="read" pages="1"/>
     </image>
-    <text id="n48_pkx5" name="name" xy="136,18" size="203,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" autoSize="shrink" bold="true" singleLine="true" text="萌萌六个字了">
+    <text id="n48_pkx5" name="name" xy="136,18" size="263,49" font="ui://27vd145bh35o7ik0" fontSize="36" color="#ffffff" autoSize="none" bold="true" singleLine="true" text="萌萌六个字了">
       <gearXY controller="site" pages="2,0,1" values="136,18|-33,-57|154,0"/>
       <relation target="" sidePair="left-left,bottom-middle"/>
     </text>
-    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/Face3.xml" xy="0,0" alpha="0" touchable="false" pkg="27vd145b"/>
-    <component id="n51_l9ll" name="chat" src="gq7m6b" fileName="component/MsgBubble2.xml" xy="78,6" size="198,80" alpha="0" touchable="false" pkg="27vd145b">
+    <component id="n27_e54q" name="face" src="gq7m5x" fileName="component/head/Face3.xml" pkg="27vd145b" xy="0,0" alpha="0" touchable="false"/>
+    <component id="n51_l9ll" name="chat" src="gq7m6b" fileName="component/head/MsgBubble2.xml" pkg="27vd145b" xy="78,6" size="232,80" alpha="0" touchable="false">
       <Label title="你太牛了"/>
     </component>
-    <image id="n38_tla5" name="n38" src="gq7m5w" fileName="images/game_icon_07.png" xy="103,5" size="204,86" flip="hz" pkg="27vd145b">
+    <image id="n38_tla5" name="n38" src="gq7m5w" fileName="images/game_icon_07.png" pkg="27vd145b" xy="103,5" size="204,86" flip="hz">
       <gearDisplay controller="mask_voice" pages="1"/>
     </image>
-    <component id="n18" name="mask_voice" src="gq7m61" fileName="component/VoiceMask(1).xml" xy="127,11" touchable="false" pkg="27vd145b">
+    <component id="n18" name="mask_voice" src="gq7m61" fileName="component/head/VoiceMask(1).xml" pkg="27vd145b" xy="127,11" touchable="false">
       <gearDisplay controller="mask_voice" pages="1"/>
     </component>
     <component id="n39_nip5" name="mask_piao" src="gq7m65" fileName="component/piao_niao/mask_piao.xml" xy="-5,97" touchable="false">

wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml

@@ -8,7 +8,9 @@
     <remark page="1" value="开"/>
   </controller>
   <displayList>
-    <image id="n178_qmc1" name="n178" src="qmc17jbz" fileName="bg/loginBg.png" pkg="27vd145b" xy="0,0"/>
+    <image id="n178_qmc1" name="n178" src="qmc17jbz" fileName="bg/loginBg.png" pkg="27vd145b" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
     <component id="n177_id5t" name="lst_game" src="pzuc7cx2" fileName="CreatePlay.xml" pkg="2d9xdj6z" xy="1,12" group="n163_10xl7"/>
     <image id="n190_icoc" name="n190" src="icoc7i9q" fileName="component/CreatePlay/Image/Rectangle 91.png" xy="565,168" size="1914,975" group="n189_icoc"/>
     <image id="n191_icoc" name="n191" src="icoc7i9r" fileName="component/CreatePlay/Image/Rectangle 292.png" xy="564,956" group="n189_icoc"/>

wb_unity_pro/Assets/ART/base/lobby/ui/Lobby_atlas0_14.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: e27c2dfc8e90f8640838a112056bc8b9
-TextureImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 11
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  applyGammaDecoding: 0
-  platformSettings:
-  - serializedVersion: 3
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    internalID: 0
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-    secondaryTextures: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
-  assetBundleVariant: 

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,9 +1,9 @@
 [
   {
-    "ver": "1.0.40",
+    "ver": "1.0.41",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.40",
+    "version": "1.0.41",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },