同步

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -49,6 +49,7 @@ function M:FG_GroupList(callback)
                 group.groupDiamo = tem.groupDiamo
                 group.messageCount = tem.messageCount
                 group.joins = tem.joins
+                group.notice = tem.notice
                 l_groups:add(group)
             end
         end

lua_probject/base_project/Game/Protocol.lua

@@ -41,6 +41,8 @@ Protocol = {
     WEB_SET_GROUP_INVITATED  = "acc/set_group_invitation",
     ---赠送房卡
     WEB_RECHARGE_DIAMO       = "acc/recharge_diamo",
+    ---赠送房卡
+    WEB_GET_SERVICES         = "acc/get_services",
     ----index----
     -- 获取公告
     WEB_UPDATE_NOTICE        = "index/get_notice",

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

@@ -178,6 +178,7 @@ function FamilyMyFamily:Init()
     self.tex_playerName = self._view:GetChild("tex_playerName")
     self.tex_changeTitle = self._view:GetChild("tex_changeTitle")
 
+    self.btn_jiesanFamily = self._view:GetChild("btn_jiesanFamily")
     self.btn_quitFamily = self._view:GetChild("btn_quitFamily")
     self.btn_playSet = self._view:GetChild("btn_playSet")
     self.btn_invite = self._view:GetChild("btn_invite")
@@ -266,6 +267,10 @@ function FamilyMyFamily:Init()
         QuitFamily(self)
     end)
 
+    self.btn_jiesanFamily.onClick:Set(function()
+        QuitFamily(self)
+    end)
+
     self.btn_quitNotice.onClick:Set(function()
         self.cWindow.selectedIndex = 0
     end)

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

@@ -0,0 +1,38 @@
+local FamilyNotice = {}
+
+local M = FamilyNotice
+
+function M.New(data, callback)
+    setmetatable(M, { __index = BaseWindow })
+    local self          = setmetatable({}, { __index = M })
+    self.class          = "FamilyNotice"
+    self._close_destroy = true
+    self._close_zone    = false
+    self._data          = data
+    self._callback      = callback
+    self:init("ui://Family/com_FamilyNotice")
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    local group = self._data.group
+
+    self._view:GetChild('text_familyName').text = string.format("%s(%s)", group.name, group.id)
+    self._view:GetChild('label_detial').text = group.notice
+end
+
+function M.TryShow(data, callback)
+    local group = data.group
+    local noticeTime = Utils.LoadLocalFile(string.format("Family_%s_notice_time", group.id)) or 0
+    local noticeText = Utils.LoadLocalFile(string.format("Family_%s_notice_text", group.id)) or ""
+    if tonumber(os.date("%Y%m%d", tonumber(noticeTime))) - tonumber(os.date("%Y%m%d", os.time())) < -1 and group.notice and #group.notice > 0 and noticeText ~= group.notice then
+        Utils.SaveLocalFile(string.format("Family_%s_notice_time", group.id), os.time())
+        Utils.SaveLocalFile(string.format("Family_%s_notice_text", group.id), group.notice)
+        local my = M.New(data, callback)
+        my:Show()
+    end
+end
+
+return M

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

@@ -13,7 +13,6 @@ function FamilyNumberRecord.New(root, page)
     self.group_id = root._group.id
     root.familyType.selectedIndex = 0
     local comp_numberRecord = UIPackage.CreateObjectFromURL("ui://Family/comp_numberRecord")
-    root._view:AddChild(comp_numberRecord)
     --[[
     comp_numberRecord.width = root._view.width
     comp_numberRecord.height = root._view.height
@@ -99,7 +98,7 @@ function FamilyNumberRecord.New(root, page)
                 self.PKScore = tonumber(res.Data.pk_score)
                 self.text_score_majiang.text = 0 - self.MJScore
                 self.text_score_poker.text = 0 - self.PKScore
-                self.ctr_limitDay_isReverting = true
+                self.ctr_limitDay_isReverting = ctr_limitDay.selectedIndex ~= res_data.dayType - 1
                 ctr_limitDay.selectedIndex = res_data.dayType - 1
             end
         end)
@@ -293,10 +292,11 @@ function FamilyNumberRecord.New(root, page)
             self.PKScore = tonumber(res.Data.pk_score)
             self.text_score_majiang.text = 0 - self.MJScore
             self.text_score_poker.text = 0 - self.PKScore
-            self.ctr_limitDay_isReverting = true
+            self.ctr_limitDay_isReverting = ctr_limitDay.selectedIndex ~= res_data.dayType - 1
             ctr_limitDay.selectedIndex = res_data.dayType - 1
         end
     end)
+    root._view:AddChild(comp_numberRecord)
     return self
 end
 

lua_probject/base_project/Game/View/FamilyView.lua

@@ -6,6 +6,7 @@ local FamilAllRank = import(".Family.FamilAllRank")
 local FamilyNumberRecord = import(".Family.FamilyNumberRecord")
 local FamilyRecord = import(".Family.FamilyRecord")
 local FamilyMsgDiamond = import(".Family.FamilyMsgDiamond")
+local FamilyNotice = import(".Family.FamilyNotice")
 
 ---无窗口
 local FamilyAllNumbers = import(".Family.FamilyAllNumbers")
@@ -279,6 +280,7 @@ function M:Reflash()
             end
             local btn = self.list_family:GetChildAt(chooseIndex - 1)
             btn.onClick:Call()
+            FamilyNotice.TryShow({ group = DataManager.groups.groupList[chooseIndex] })
         else
             self:JoinFamily(true)
             self.btn_chatRoom.visible = false

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

@@ -2,11 +2,13 @@ local LobbyGiftDiamond = {}
 
 local M = LobbyGiftDiamond
 
-function M.new()
+function M.new(data, callback)
     setmetatable(M, { __index = BaseWindow })
-    local self = setmetatable({}, { __index = M })
-    self.class = "LobbyGiftDiamond"
+    local self          = setmetatable({}, { __index = M })
+    self.class          = "LobbyGiftDiamond"
     self._close_destroy = true
+    self._data          = data
+    self._callback      = callback
     self:init("ui://Lobby/GiftDiamond")
     return self
 end
@@ -21,6 +23,8 @@ function M:init(url)
         local lobbyCtr = ControllerManager.GetController(LoddyController)
         lobbyCtr:GiftDiamond({ tagId = tonumber(text_id), diamo = tonumber(text_num) }, function(res)
             if res.ReturnCode == 0 then
+                DataManager.SelfUser.diamo = DataManager.SelfUser.diamo - text_num
+                self._callback()
                 self:Destroy()
                 ViewUtil.ErrorTip(-1, "赠送房卡成功")
             else

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

@@ -0,0 +1,36 @@
+local LobbyService = {}
+
+local M = LobbyService
+
+function M.new()
+    setmetatable(M, { __index = BaseWindow })
+    local self = setmetatable({}, { __index = M })
+    self.class = "LobbyService"
+    self._close_destroy = true
+    self:init("ui://Lobby/service")
+    return self
+end
+
+function M:init(url)
+    BaseWindow.init(self, url)
+
+    self._listView_main = self._view:GetChild('list')
+    self._listView_main.itemRenderer = function(index, obj)
+        local info = self._data_services[index + 1]
+        obj.text = info.wx
+        obj:GetChild('text_title').text = string.format("%s：", info.title)
+        obj:GetChild('btn_copy').onClick:Set(function()
+            GameApplication.Instance:CopyToClipboard(info.wx) --湘北
+            ViewUtil.ErrorTip(-1, "复制成功")
+        end)
+    end
+
+    self:GetService()
+end
+
+function M:GetService()
+    self._data_services = { { title = "游戏客服", wx = "youxikefuweixing" }, { title = "黎川代理", wx = "lichuandaili" } }
+    self._listView_main.numItems = #self._data_services
+end
+
+return M

lua_probject/base_project/Game/View/LobbyView.lua

@@ -20,6 +20,8 @@ local PhoneBindView = import(".Lobby.PhoneBindView")
 local RealAddressView = import(".Lobby.RealAddressView")
 local LobbyHeadView = import(".Lobby.LobbyHeadView")
 local LobbyGiftDiamond = import(".Lobby.LobbyGiftDiamond")
+local LobbyService = import(".Lobby.LobbyService")
+
 
 LobbyView = {}
 
@@ -66,9 +68,9 @@ function M:InitView(url)
 
     local btn_authenticate = self._view:GetChild("btn_authenticate")
     btn_authenticate.onClick:Add(handler(self, function()
-        -- local authenticateView = LobbyAuthenticateView.new()
-        -- authenticateView:Show()
-        ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
+        local authenticateView = LobbyAuthenticateView.new()
+        authenticateView:Show()
+        -- ViewUtil.ErrorTip(-1, "该功能还会开放，敬请期待")
     end))
 
     local btn_notice = self._view:GetChild("btn_notice")
@@ -152,20 +154,13 @@ function M:InitView(url)
 
     local btn_diamo = self._view:GetChild("btn_diamo")
     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()
-        ViewUtil.ShowModalWait2(self._root_view, 0.01)
-        coroutine.start(function()
-            coroutine.wait(3)
-            ViewUtil.CloseModalWait2()
-            ViewUtil.ErrorTip(-1, "微信跳转失败")
-        end)
+        local lobbyService = LobbyService.new()
+        lobbyService:Show()
     end)
 
     local btn_invite = self._view:GetChild("btn_invite")
@@ -342,6 +337,17 @@ function M:InitView(url)
     self._message = message:GetChild("message")
     self._tex_message = message:GetChild("text")
     self:__GetMessage()
+
+    local btn_giftDiamond = self._view:GetChild('btn_giftDiamond')
+    if btn_giftDiamond then
+        btn_giftDiamond.visible = DataManager.SelfUser.type == 1
+        btn_giftDiamond.onClick:Set(function()
+            local lobbyGiftDiamond = LobbyGiftDiamond.new(nil, function()
+                view:GetChild("btn_diamo").text = tostring(DataManager.SelfUser.diamo)
+            end)
+            lobbyGiftDiamond:Show()
+        end)
+    end
 end
 
 function M:OnJoinRoomAction(context)

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

@@ -525,6 +525,7 @@ function M:EventInit()
                 self:PlayMJMusic("gameover.mp3")
             end
         else
+            self:ShowHand(arg)
             self:PlayMJMusic("gameover.mp3")
         end
         local liuju = result and result.liuju or nil

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

@@ -527,6 +527,7 @@ function M:EventInit()
                 self:PlayMJMusic("gameover.mp3")
             end
         else
+            self:ShowHand(arg)
             self:PlayMJMusic("gameover.mp3")
         end
         local liuju = result and result.liuju or nil

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

@@ -526,6 +526,7 @@ function M:EventInit()
                 self:PlayMJMusic("gameover.mp3")
             end
         else
+            self:ShowHand(arg)
             self:PlayMJMusic("gameover.mp3")
         end
         local liuju = result and result.liuju or nil

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

@@ -526,6 +526,7 @@ function M:EventInit()
                 self:PlayMJMusic("gameover.mp3")
             end
         else
+            self:ShowHand(arg)
             self:PlayMJMusic("gameover.mp3")
         end
         local liuju = result and result.liuju or nil

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

@@ -186,6 +186,8 @@ function M:CheckCards()
         return
     end
 
+    print("lingmeng self.lastMinCard", self.lastMinCard)
+
     print("lingmengCheckAloneOrLong")
     if self:CheckAloneOrLong() then
         return true
@@ -196,8 +198,18 @@ function M:CheckCards()
         return true
     end
     print("lingmengCheckSanDai")
-
     if self:CheckSanDai() then
+        if self._flag_fristCard then
+            return true
+        end
+        local a, b, c = self:CheckSanDai()
+        self.type = a
+        if b then
+            self.specilCard = b
+        end
+        if c then
+            return c > (self.lastMinCard or 0)
+        end
         return true
     end
     print("lingmengCheckZha")

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

@@ -329,6 +329,7 @@ function M:EventInit()
         -- end
         -- end
         self._leftClock_continue = coroutine.start(function()
+            coroutine.wait(0.02)
             card_info:SetOutCardInfo(nil, false)
             for i = 1, #self._player_card_info do
                 local card_info = self._player_card_info[i]

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

@@ -53,6 +53,7 @@ function M:RegisterEvt()
 
     self._eventmap[RunFast_Protocol.GAME_EVT_CARDINHAND] = self.OnPlaySuccCheckHandCard
     self._eventmap[RunFast_Protocol.RunFast_Bomb_Score_New] = self.OnBompScoreNew
+    self._eventmap[RunFast_Protocol.RunFast_CheckCard_Succ] = self.OnCheckCard
 end
 
 -- function M:Oener(evt_data)
@@ -133,6 +134,19 @@ function M:SendCard(cards, currentCard)
     _client:send(RunFast_Protocol.RunFast_Send_Card, _data)
 end
 
+function M:SendCheckCard()
+    local _data = {}
+    local _client = ControllerManager.GameNetClinet
+    _client:send(RunFast_Protocol.RunFast_CheckCard, _data)
+end
+
+function M:SendCheckCardSend(data)
+    local _data = {}
+    _data = data
+    local _client = ControllerManager.GameNetClinet
+    _client:send(RunFast_Protocol.RunFast_CheckCard_Send, _data)
+end
+
 function M:SendPiao(piao)
     local _data = {}
     _data["id"] = piao
@@ -716,13 +730,19 @@ function M:OnBompScoreNew(evt_data)
             for i = 1, #scoreList do
                 local score = scoreList[i].pomSore
                 local player = self._room:GetPlayerBySeat(scoreList[i].seat)
-                print("lingmeng log20011", player.total_score)
                 player.total_score = player.total_score + score
-                print("lingmeng log20012", player.total_score)
             end
             DispatchEvent(self._dispatcher, RunFast_GameEvent.OnBompScoreNew, scoreList)
         end
     )
 end
 
+function M:OnCheckCard(evt_data)
+    self._cacheEvent:Enqueue(
+        function()
+            DispatchEvent(self._dispatcher, RunFast_GameEvent.OnCheckCard, evt_data)
+        end
+    )
+end
+
 return M

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

@@ -19,6 +19,7 @@ local RunFast_GameEvent = {
     Game_TuoGuan = "Game_TuoGuan",
     EventXiPai = "EventXiPai",
     OnPassSuccCheckCard = "OnPassSuccCheckCard",
-    OnBompScoreNew = "OnBompScoreNew"
+    OnBompScoreNew = "OnBompScoreNew",
+    OnCheckCard = "OnCheckCard"
 }
 return RunFast_GameEvent

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

@@ -113,6 +113,13 @@ function M:InitView(url)
         self._view:GetChild("roominfo_panel1"):GetChild("tex_beishu").text = ""
     end
 
+    self._view_click = self._view:GetChild('click')
+    if self._view_click then
+        self._view_click.onClick:Set(function()
+            self._gamectr:SendCheckCard()
+        end)
+    end
+
     self.ctr_state = self._view:GetController("state")
     self._ctr_action = self._view:GetController("action")
     -- self._tex_leftTime = self._view:GetChild("time"):GetChild("title")
@@ -587,6 +594,7 @@ function M:EventInit()
         -- end
         -- end
         self._leftClock_continue = coroutine.start(function()
+            coroutine.wait(0.02)
             card_info:SetOutCardInfo(nil, false)
             for i = 1, #self._player_card_info do
                 local card_info = self._player_card_info[i]
@@ -704,7 +712,45 @@ function M:EventInit()
             end)
         end
     end)
-
+    _gamectr:AddEventListener(RunFast_GameEvent.OnCheckCard, function(...)
+        local arg = { ... }
+        local evt_data = arg[1]
+        local list = self._view:GetChild('comp_checkCard'):GetChild('list')
+        list:RemoveChildrenToPool()
+        for k, v in pairs(evt_data) do
+            local obj = list:AddItemFromPool()
+            table.sort(v, function(a, b)
+                if a % 100 == b % 100 then
+                    return math.floor(a / 100) > math.floor(b / 100)
+                else
+                    return a % 100 > b % 100
+                end
+            end)
+            local titleText = ""
+            if k == "first" then
+                titleText = "手牌1："
+            elseif k == "second" then
+                titleText = "手牌2："
+            elseif k == "three" then
+                titleText = "手牌3："
+            end
+            obj.text = titleText
+            obj:GetChild('click').onClick:Set(function()
+                evt_data.choic = k
+                self._gamectr:SendCheckCardSend(evt_data)
+                self._view:GetController('check').selectedIndex = 0
+            end)
+            obj:GetChild('List_Out').itemRenderer = function(index, obj)
+                local code = v[index + 1]
+                if code % 100 == 15 then
+                    code = math.floor(code / 100) * 100 + 2
+                end
+                obj:GetChild('icon').url = string.format("ui://Main_Poker/%s", code)
+            end
+            obj:GetChild('List_Out').numItems = #v
+        end
+        self._view:GetController('check').selectedIndex = 1
+    end)
 
     _gamectr:AddEventListener(RunFast_GameEvent.OnPassSuccCheckCard, function(...)
         self._popEvent = false
@@ -979,7 +1025,7 @@ function M:EventInit()
                 if player.seat ~= win_seat then
                     card_info.ctr_outpoker.selectedIndex = 0
                 end
-                if player.seat ~= self._room.self_player.seat then
+                if win_seat == self._room.self_player.seat and player.seat ~= self._room.self_player.seat then
                     local oneTime = 7 / 60
 
                     -- card_info:UpdateHandPoker(player.cards, false, true)
@@ -1032,20 +1078,6 @@ function M:EventInit()
                 btn_confirm.onClick:Call()
             end
             ViewUtil.PlaySound("RunFastNew_PK", "extend/poker/runfast/sound/end_music.mp3")
-            -- local _actionView = UIPackage.CreateObject("Common", "Btn_Yellow")
-            -- _actionView.icon = "ui://Common/btn_comfirm"
-            -- _actionView.onClick:Set(function ()
-            --     --local _gamectr = ControllerManager.GetController(GameController)
-            --     _gamectr:ConformToNextGame()
-            --     _actionView:Dispose()
-            -- end)
-            -- _actionView.xy = Vector2(900, 625)
-            -- self._view:AddChild(_actionView)
-            -- else
-            --     coroutine.wait(4)
-            --     self.result_view = RunFast_ResultView.new(self._root_view,info,self._room.room_id)
-            --     self.result_view:Show()
-            -- end
         end)
         if over == 1 then
             -- body

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

@@ -831,6 +831,7 @@ function M:UpdateHandCardsColor()
             self:SetBtnCardColor(card_view, 0)
         else
             card_view.btn_card.touchable = false
+            card_view.btn_card.selected = false
             self:SetBtnCardColor(card_view, 1)
         end
         if card_view.btn_card.selected and card_view.btn_card.touchable then

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

@@ -39,6 +39,10 @@ local RunFast_Protocol = {
     GAME_EVENT_XIPAI              = "20837",
     GAME_EVENT_NOTIFY_XIPAI       = "20838",
     GAME_EVT_CARDINHAND           = "202022",
+
+    RunFast_CheckCard             = "8881",
+    RunFast_CheckCard_Succ        = "8882",
+    RunFast_CheckCard_Send        = "888"
 }
 
 return RunFast_Protocol

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/Btn_SelfCard.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="278,328" extention="Button">
   <controller name="button" pages="0,up,1,down" selected="0"/>
-  <controller name="choose" pages="0,,1," selected="1"/>
+  <controller name="choose" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n4_ckvb" name="icon" xy="0,0" size="278,328" group="n6_ckvb" url="ui://lx6k641grmtwhm" align="center" vAlign="middle" fill="scaleFree">
+    <loader id="n4_ckvb" name="icon" xy="0,0" size="278,328" group="n6_ckvb" url="ui://Main_Poker/310_1" align="center" vAlign="bottom" fill="scaleFree">
       <relation target="" sidePair="width-width,height-height"/>
     </loader>
     <image id="n7_diqo" name="n7" src="diqocna" fileName="Main_New/Component/Image/bg_mask.png" xy="-2,-8" size="286,336" group="n6_ckvb">

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCard.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2532,1170" opaque="false">
+  <displayList>
+    <list id="n0_bgcf" name="list" xy="94,135" size="2344,900" overflow="scroll" defaultItem="ui://9n9stu2ebgcftcrg" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+    </list>
+  </displayList>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Component/comp_checkCardOne.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="2344,300" extention="Button">
+  <displayList>
+    <text id="n2_bgcf" name="title" xy="123,103" size="260,94" font="Arial" fontSize="72" color="#ffffff" strokeColor="#000000" shadowColor="#000000" shadowOffset="1,1" text="手牌1："/>
+    <list id="n1_bgcf" name="List_Out" xy="484,45" pivot="0.5,0.5" size="1376,210" layout="row" selectionMode="none" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <component id="n3_bgcf" name="click" src="bm7dtcrb" fileName="Main_New/Component/btn_normol.xml" xy="1912,88" size="396,124">
+      <Button icon="ui://9n9stu2ebgcftcrh"/>
+    </component>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_1.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2280,328" opaque="false" initName="player_card_info">
   <controller name="output" pages="0,,1,,2," selected="0"/>
-  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="1"/>
+  <controller name="out_card_option" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
   <controller name="put_error" pages="0,,1," selected="0"/>
   <controller name="piao" pages="0,,1,,2,,3," selected="0"/>
   <controller name="piao_value" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
@@ -61,7 +61,7 @@
       <Button icon="ui://9n9stu2ei3h6gv" selectedIcon="ui://9n9stu2ei3h6gv" controller="piao_value" page="5"/>
     </component>
     <group id="n63_i3h6" name="piao" xy="66,-185" size="1250,103"/>
-    <list id="n69_ckvb" name="List_HandCard" xy="-73,0" size="2426,328" layout="row" selectionMode="none" colGap="-135" defaultItem="ui://9n9stu2eckvbcjp" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n69_ckvb" name="List_HandCard" xy="-72,-1" size="2426,328" layout="row" selectionMode="none" colGap="-135" defaultItem="ui://9n9stu2eckvbcjp" align="center" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_2.xml

@@ -2,7 +2,7 @@
 <component size="1760,157" opaque="false" initName="player_card_info">
   <controller name="output" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
   <controller name="one_card" pages="0,,1," selected="0"/>
-  <controller name="resultOut" pages="0,,1," selected="1"/>
+  <controller name="resultOut" pages="0,,1," selected="0"/>
   <controller name="time_clock" pages="0,,1," selected="0"/>
   <displayList>
     <list id="n53_q9cc" name="hand_card_list" xy="-697,-634" size="445,78" visible="false" layout="row" selectionMode="none" overflow="scroll" lineGap="-15" colGap="-25" defaultItem="ui://9n9stu2eprgz8e" align="right"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/Main_New/Player_card_info_3.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1760,157" opaque="false" initName="player_card_info">
-  <controller name="output" homePageType="specific" homePage="2" pages="0,,1,,2," selected="2"/>
-  <controller name="one_card" pages="0,,1," selected="0"/>
-  <controller name="resultOut" pages="0,,1," selected="0"/>
-  <controller name="time_clock" pages="0,,1," selected="0"/>
+  <controller name="output" homePageType="specific" homePage="1" pages="0,,1,,2," selected="0"/>
+  <controller name="one_card" pages="0,,1," selected="1"/>
+  <controller name="resultOut" pages="0,,1," selected="1"/>
+  <controller name="time_clock" pages="0,,1," selected="1"/>
   <displayList>
     <list id="n53_q9cc" name="hand_card_list" xy="-697,-634" size="445,78" visible="false" layout="row" selectionMode="none" overflow="scroll" lineGap="-15" colGap="-25" defaultItem="ui://9n9stu2eprgz8e" align="right"/>
     <component id="n59_8yp0" name="out_card_com" src="prgz89" fileName="component/poker/hand_poker_con.xml" xy="-640,-632" size="390,179" visible="false"/>
@@ -17,7 +17,7 @@
     <text id="n56_8yp0" name="CardNumber" xy="-249,-482" size="114,37" visible="false" fontSize="26" color="#ffffff" align="center" vAlign="middle" autoSize="none" shadowColor="#000000" shadowOffset="1,1" text=""/>
     <text id="n58_8yp0" name="area_mask" xy="-898,-1013" size="358,566" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;parent&quot;:&quot;out_card_com&quot;,&#xA;    &quot;obj&quot;:&quot;poker7&quot;,&#xA;    &quot;maxcount_x&quot;:8,&#xA;    &quot;start_x&quot;:400,&#xA;    &quot;start_y&quot;:0&#xA;    }&#xA;}"/>
     <component id="n60_agiz" name="mask_liangpai" src="djzo18" fileName="component/Component1.xml" pkg="27vd145b" xy="-640,-632" size="5,5" visible="false"/>
-    <list id="n61_ckvb" name="List_Out" xy="0,0" size="1760,157" layout="row" selectionMode="none" scroll="horizontal" colGap="-66" defaultItem="ui://9n9stu2eckvbcjn">
+    <list id="n61_ckvb" name="List_Out" xy="-440,27" pivot="0.5,0.5" size="1760,210" layout="row" selectionMode="none" scroll="horizontal" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
       <gearDisplay controller="output" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
@@ -25,9 +25,10 @@
       <item/>
       <item/>
       <item/>
+      <item/>
     </list>
     <list id="n62_ckvb" name="n62" xy="570,-1020" size="200,300" overflow="scroll"/>
-    <list id="n63_ckvb" name="list_resultOut" xy="0,0" size="1014,158" layout="row" colGap="-46" defaultItem="ui://9n9stu2eckvbcjn">
+    <list id="n63_ckvb" name="list_resultOut" xy="158,-26" pivot="0.5,0.5" size="1014,210" layout="flow_hz" lineGap="-90" colGap="-101" defaultItem="ui://9n9stu2eckvbcjn" align="center" vAlign="middle">
       <gearDisplay controller="resultOut" pages="1"/>
       <item/>
       <item/>
@@ -38,9 +39,27 @@
       <item/>
       <item/>
     </list>
-    <component id="n64_n9qr" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="-188,-6" size="174,143">
+    <component id="n64_n9qr" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="-138,-6" size="174,143">
       <gearDisplay controller="time_clock" pages="1"/>
     </component>
+    <list id="n65_if10" name="list_backHand" xy="-80,-56" size="1080,195" scale="0.657,1" rotation="90" touchable="false" layout="row" overflow="scroll" colGap="-120" defaultItem="ui://9n9stu2eckvbcjn" autoClearItems="true">
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
   </displayList>
   <transition name="score">
     <item time="0" type="Alpha" target="n55_pgkj" tween="true" startValue="0" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -8,7 +8,8 @@
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
   <controller name="Inclear" pages="0,,1," selected="0"/>
-  <controller name="witness" pages="0,,1," selected="1"/>
+  <controller name="witness" pages="0,,1," selected="0"/>
+  <controller name="check" pages="0,,1," selected="1"/>
   <displayList>
     <graph id="n141_ckvb" name="bg_mask" xy="6,7" size="2532,751" type="rect" lineSize="0" fillColor="#00ffffff"/>
     <component id="n76_rqeb" name="mask" src="prgzeq" fileName="component/mask.xml" xy="14,1956" alpha="0">
@@ -66,23 +67,23 @@
       <gearDisplay controller="state" pages="0,1,2"/>
     </text>
     <component id="n77_ij2y" name="gcm_chat" src="h1uu2p" fileName="Gcm_chat.xml" pkg="l0ds4ys6" xy="2294,1604" visible="false"/>
-    <component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="655,1848" visible="false" touchable="false">
+    <component id="n79_roef" name="btn_distance" src="kxwjhyc" fileName="component/gps/btn_distance_new.xml" pkg="27vd145b" xy="651,1848" visible="false" touchable="false">
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="n86_q50p" sidePair="right-right"/>
     </component>
-    <component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="124,2441" size="1334,108" group="n86_q50p" scale="1.5,1.5">
+    <component id="n82_q50p" name="right_panel" src="prgzet" fileName="component/RightPanel.xml" xy="120,2437" size="1334,108" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,1,2,3"/>
     </component>
-    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="974,1930" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
-    <component id="n84_q50p" name="btn_back_lobby__" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="510,1878" size="58,75" group="n86_q50p" scale="1.5,1.5">
+    <component id="n83_q50p" name="roominfo_panel1" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="970,1926" size="274,41" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n84_q50p" name="btn_back_lobby__" src="prgzds" fileName="component/poker/Btn_back_lobby.xml" xy="506,1874" size="58,75" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <component id="n85_q50p" name="btn_rule--" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="332,1878" group="n86_q50p" scale="1.5,1.5"/>
-    <component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="732,1734" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
-    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="631,1878" group="n86_q50p" scale="1.5,1.5">
+    <component id="n85_q50p" name="btn_rule--" src="prgzdu" fileName="component/poker/Btn_log.xml" xy="328,1874" group="n86_q50p" scale="1.5,1.5"/>
+    <component id="n87_q50p" name="roominfo_panel" src="prgzev" fileName="component/RoomInfoPanel1.xml" xy="728,1730" size="150,77" group="n86_q50p" scale="1.5,1.5" touchable="false"/>
+    <component id="n120_r1z9" name="btn_leave_lobby" src="vijocih" fileName="component/poker/Btn_leave_lobby.xml" xy="627,1874" group="n86_q50p" scale="1.5,1.5">
       <gearDisplay controller="state" pages="0,3"/>
     </component>
-    <group id="n86_q50p" name="n86" xy="124,1734" size="1334,815" advanced="true">
+    <group id="n86_q50p" name="n86" xy="120,1730" size="1334,815" advanced="true">
       <relation target="" sidePair="center-center"/>
     </group>
     <component id="n75_jmab" name="poker_eff" src="prgz9k" fileName="component/effect/poker/poker_eff.xml" xy="618,10" touchable="false">
@@ -243,6 +244,18 @@
     </component>
     <group id="n163_ukp7" name="huifang" xy="0,34" size="2532,984" group="n164_ukp7" advanced="true"/>
     <group id="n164_ukp7" name="playback" xy="0,-1" size="2532,1170"/>
+    <component id="n174_bgcf" name="n174" src="bm7dtcrd" fileName="Main_New/Component/btn_bg.xml" xy="0,0" size="2532,1170">
+      <gearDisplay controller="check" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+      <Button controller="check" page=""/>
+    </component>
+    <component id="n175_bgcf" name="comp_checkCard" src="bgcftcri" fileName="Main_New/Component/comp_checkCard.xml" xy="0,0">
+      <gearDisplay controller="check" pages="1"/>
+    </component>
+    <component id="n176_bgcf" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="2318,51" size="141,134">
+      <gearDisplay controller="check" pages="1"/>
+      <Button controller="check" page="0"/>
+    </component>
     <component id="n166_ukp7" name="com_notice" src="ukp7tcqy" fileName="Main_new/com_notice.xml" xy="681,104" size="1169,62">
       <relation target="" sidePair="top-top"/>
     </component>
@@ -259,10 +272,11 @@
       <relation target="" sidePair="width-width,height-height"/>
       <Button controller="witness" page="0"/>
     </component>
-    <component id="n172_ukp7" name="comp_witness" src="bm7dtcr7" fileName="Main_New/Component/comp_witness.xml" xy="2097,30">
+    <component id="n172_ukp7" name="comp_witness" src="bm7dtcr7" fileName="Main_New/Component/comp_witness.xml" xy="2537,30">
       <gearDisplay controller="witness" pages="1"/>
       <gearXY controller="witness" pages="0" values="2537,30" default="2097,30" tween="true" ease="Linear" duration="0.5"/>
     </component>
+    <graph id="n173_bgcf" name="click" xy="15,14" size="552,432" type="rect" lineSize="0" fillColor="#00ffffff"/>
   </displayList>
   <transition name="t1">
     <item time="0" type="Alpha" target="n75_jmab" tween="true" startValue="1" endValue="1" duration="18"/>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_3.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放,4,观战" selected="4"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
-  <controller name="time" pages="0,,1,,2,,3," selected="0"/>
+  <controller name="time" pages="0,,1,,2,,3," selected="1"/>
   <controller name="card_eff" pages="0,,1," selected="0"/>
   <controller name="zidongtishi" pages="0,,1," selected="0"/>
   <controller name="voice" pages="0,,1," selected="0"/>
@@ -15,7 +15,9 @@
       <gearDisplay controller="state" pages="1"/>
       <gearLook controller="state" pages="0,2,3" values="0,0,0,1|0,0,0,1|0,0,0,1" default="0,0,0,1"/>
     </component>
-    <image id="n158_ukp7" name="n158" src="11k4tcqe" fileName="Main_new/Image/logo_301.png" xy="1265,372" size="400,61"/>
+    <component id="n164_if10" name="com_logo" src="ukp7tcqt" fileName="Main_new/Component/com_logo.xml" xy="1265,372" size="400,61">
+      <relation target="" sidePair="center-center"/>
+    </component>
     <component id="n12" name="btn_wxyqhy" src="o3tbcgo" fileName="component/Btn_wxyq.xml" xy="1188,2161" group="n13">
       <gearDisplay controller="sdk" pages="0"/>
     </component>
@@ -39,7 +41,7 @@
       <gearDisplay controller="state" pages="0,1,2"/>
       <relation target="" sidePair="center-center"/>
     </group>
-    <component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="625,198" scale="1.5,1.5" touchable="false">
+    <component id="n67_qfrg" name="time" src="prgzer" fileName="component/Clock.xml" xy="-296,2199" scale="1.5,1.5" visible="false" touchable="false">
       <gearDisplay controller="time" pages="1,2,3"/>
       <gearXY controller="time" pages="1,2" values="-296,2199|2797,1976" default="625,198"/>
     </component>
@@ -133,21 +135,21 @@
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
     <component id="n156_11k4t" name="player_info3" src="11k4tcq6" fileName="Main_New/PlayerHead_3.xml" xy="18,17" size="156,126" group="n121_ckvb">
-      <gearXY controller="state" pages="0,1,2,3" values="18,17|2359,17|2336,32|2372,294" default="18,17"/>
+      <gearXY controller="state" pages="0,1,2,3" values="18,17|18,17|2336,32|2372,294" default="18,17"/>
       <relation target="" sidePair="right-right,middle-middle"/>
     </component>
     <group id="n121_ckvb" name="playiinfo" xy="18,17" size="2497,700"/>
     <component id="n69_sdax" name="player_card_info_1" src="ckvbcjl" fileName="Main_New/Player_card_info_1.xml" xy="126,841" group="n122_ckvb">
-      <gearDisplay controller="state" pages="1,3"/>
+      <gearDisplay controller="state" pages="1,3,4"/>
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
     <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="447,178" group="n122_ckvb" touchable="false">
-      <gearDisplay controller="state" pages="1,3"/>
+      <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
-    <component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="317,178" group="n122_ckvb" touchable="false">
-      <gearDisplay controller="state" pages="1,3"/>
+    <component id="n157_11k4t" name="player_card_info_3" src="11k4tcq7" fileName="Main_New/Player_card_info_3.xml" xy="325,178" group="n122_ckvb" touchable="false">
+      <gearDisplay controller="state" pages="1,3,4"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
     <group id="n122_ckvb" name="playCardInfo" xy="126,178" size="2280,991"/>
@@ -183,7 +185,7 @@
       <gearDisplay controller="Inclear" pages="1"/>
       <relation target="" sidePair="width-width%,height-height%,center-center,top-middle%"/>
     </component>
-    <component id="n140_ckvb" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="388,492" visible="false">
+    <component id="n140_ckvb" name="Comp_Clock" src="ckvbcis" fileName="Main_New/Component/Comp_Clock.xml" xy="729,667" visible="false">
       <gearDisplay controller="time" pages="1,2,3"/>
       <gearXY controller="time" pages="1,2" values="729,667|2133,159" default="388,492"/>
     </component>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -703,6 +703,9 @@
     <component id="bm7dtcrd" name="btn_bg.xml" path="/Main_New/Component/" exported="true"/>
     <component id="bm7dtcre" name="comp_hudon.xml" path="/Main_New/Component/"/>
     <component id="bm7dtcrf" name="comp_hudon.xml" path="/Main_new/Main/Component/"/>
+    <component id="bgcftcrg" name="comp_checkCardOne.xml" path="/Main_New/Component/"/>
+    <image id="bgcftcrh" name="checkthiscard.png" path="/Main_New/Component/"/>
+    <component id="bgcftcri" name="comp_checkCard.xml" path="/Main_New/Component/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Family/FamilyNotice/Component/label_tipText.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1200,200" overflow="scroll" extention="Label">
+  <displayList>
+    <text id="n0_qz7i" name="title" xy="0,0" size="921,164" font="Arial" fontSize="42" color="#61270f" vAlign="middle" autoClearText="true" text="小提示&#xA;1.设置为0分时表示进入牌局不受限制&#xA;2.每天未读的输分高于设置的分数后无法进入牌局">
+      <relation target="" sidePair="width-width,height-height"/>
+    </text>
+  </displayList>
+</component>

wb_new_ui/assets/Family/FamilyNotice/com_FamilyNotice.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1178,798">
+  <displayList>
+    <image id="n0_bgcf" name="n0" src="bgcft7d7d" fileName="FamilyNotice/Image/bg.png" xy="12,31" size="1155,766"/>
+    <image id="n1_bgcf" name="n1" src="bgcft7d7e" fileName="FamilyNotice/Image/title_top.png" xy="0,0" size="1178,128"/>
+    <component id="n2_bgcf" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1090,-29" size="122,130" aspect="true"/>
+    <text id="n3_bgcf" name="title" xy="32,5" size="1049,101" font="Alibaba PuHuiTi 3.0" fontSize="68" color="#ffffff" align="center" vAlign="middle" autoSize="none" bold="true" shadowColor="#000000" shadowOffset="1,1" text="公告"/>
+    <text id="n6_bgcf" name="text_familyName" xy="68,122" size="1049,101" font="Arial" fontSize="46" color="#61270f" align="center" vAlign="middle" autoSize="none" text="公告"/>
+    <component id="n5_bgcf" name="label_detial" src="bgcft7d7f" fileName="FamilyNotice/Component/label_tipText.xml" xy="72,225" size="1034,550"/>
+  </displayList>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_jiesanFamily.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="330,99" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n0_ieus" name="n0" src="bgcft7d7a" fileName="MyFamily/Image/jiesanqinyouquan.png" xy="0,0" size="330,99">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button downEffect="scale" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Family/MyFamily/Component/btn_quitFamily.xml

@@ -2,7 +2,7 @@
 <component size="330,99" pivot="0.5,0.5" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n0_ieus" name="n0" src="ieus7d1q" fileName="MyFamily/Image/tuichuqinyouquan.png" xy="0,0">
+    <image id="n0_ieus" name="n0" src="bgcft7d79" fileName="MyFamily/Image/tuichuqinyouquan(1).png" xy="0,0" size="330,99">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

wb_new_ui/assets/Family/MyFamily/com_myFamily.xml

@@ -49,7 +49,12 @@
     <richtext id="n19_ieus" name="tex_cradNum" xy="1233,580" size="356,77" group="n53_q2iu" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="ellipsis" autoClearText="true" text="文本文本文本文本文本文本文本"/>
     <richtext id="n20_ieus" name="tex_nocice" xy="1233,688" size="987,362" group="n53_q2iu" font="ui://27vd145bh35o7il2" fontSize="54" color="#111111" autoSize="ellipsis" autoClearText="true" text="文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本文本"/>
     <richtext id="n22_ieus" name="tex_playerName" xy="334,219" size="388,64" group="n53_q2iu" font="ui://27vd145bg2mo7ij0" fontSize="48" color="#8e0305" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="玩家玩家玩家玩家"/>
-    <component id="n23_ieus" name="btn_quitFamily" src="ieus7d1v" fileName="MyFamily/Component/btn_quitFamily.xml" xy="363,943" group="n53_q2iu"/>
+    <component id="n58_if10" name="btn_jiesanFamily" src="bgcft7d7b" fileName="MyFamily/Component/btn_jiesanFamily.xml" xy="363,943" group="n53_q2iu">
+      <gearDisplay controller="cStyle" pages="0"/>
+    </component>
+    <component id="n23_ieus" name="btn_quitFamily" src="ieus7d1v" fileName="MyFamily/Component/btn_quitFamily.xml" xy="363,943" group="n53_q2iu">
+      <gearDisplay controller="cStyle" pages="1,2"/>
+    </component>
     <component id="n25_ieus" name="btn_invite" src="ieus7d1x" fileName="MyFamily/Component/btn_invite.xml" xy="363,832" group="n53_q2iu"/>
     <component id="n28_ieus" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n53_q2iu"/>
     <component id="n24_ieus" name="btn_playSet" src="ieus7d1w" fileName="MyFamily/Component/btn_playSet.xml" xy="363,721" group="n53_q2iu">

wb_new_ui/assets/Family/package.xml

@@ -426,6 +426,13 @@
     <image id="11k4t7d75" name="table_btn_green_background3.png" path="/Record/Image/"/>
     <component id="11k4t7d77" name="btn_nextPage.xml" path="/Record/Component/"/>
     <component id="11k4t7d78" name="btn_lastPage.xml" path="/Record/Component/"/>
+    <image id="bgcft7d79" name="tuichuqinyouquan(1).png" path="/MyFamily/Image/"/>
+    <image id="bgcft7d7a" name="jiesanqinyouquan.png" path="/MyFamily/Image/"/>
+    <component id="bgcft7d7b" name="btn_jiesanFamily.xml" path="/MyFamily/Component/"/>
+    <component id="bgcft7d7c" name="com_FamilyNotice.xml" path="/FamilyNotice/" exported="true"/>
+    <image id="bgcft7d7d" name="bg.png" path="/FamilyNotice/Image/" scale="9grid" scale9grid="14,135,28,270"/>
+    <image id="bgcft7d7e" name="title_top.png" path="/FamilyNotice/Image/" scale="9grid" scale9grid="160,22,320,44"/>
+    <component id="bgcft7d7f" name="label_tipText.xml" path="/FamilyNotice/Component/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Lobby/Authentication.xml

@@ -1,19 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1272,750">
   <displayList>
-    <image id="n4_h35o" name="n4" src="h35o7cs8" fileName="component/Authentication/Image/Rectangle 39@3x.png" xy="0,21" group="n8_h35o"/>
-    <image id="n5_h35o" name="n5" src="h35o7cs9" fileName="component/Authentication/Image/Rectangle 40@3x.png" xy="24,27" group="n8_h35o"/>
-    <image id="n3_h35o" name="n3" src="h35o7cs7" fileName="component/Authentication/Image/Group 28@3x.png" xy="-12,-12" group="n8_h35o"/>
+    <image id="n19_if10" name="n19" src="if107d9s" fileName="images/pop_oneInput/bg.png" xy="13,0" size="1247,777" group="n8_h35o"/>
+    <image id="n20_if10" name="n20" src="if107d9t" fileName="images/pop_oneInput/title_top.png" xy="0,0" size="1272,140" group="n8_h35o"/>
     <image id="n6_h35o" name="n6" src="h35o7csa" fileName="component/Authentication/Image/实名认证@3x.png" xy="503,15" group="n8_h35o"/>
-    <group id="n8_h35o" name="bg" xy="-12,-12" size="1296,762"/>
-    <text id="n9_h35o" name="title__name" xy="198,203" size="186,71" group="n16_h35o" font="ui://27vd145bh35o7ilb" fontSize="54" color="#444444" text="姓    名:"/>
-    <graph id="n10_h35o" name="bg_name" xy="408,197" size="720,84" group="n16_h35o" type="rect" lineSize="0" lineColor="#ffa06640" fillColor="#ffa06640" corner="18"/>
-    <text id="n13_h35o" name="input_name" xy="438,209" size="660,60" group="n16_h35o" alpha="0.5" font="ui://27vd145bh35o7im7" fontSize="42" color="#ffffff" autoSize="none" text="" input="true" prompt="[color=#FFFFFF ]请输入名字[/color]"/>
-    <group id="n16_h35o" name="name" xy="198,197" size="930,84"/>
-    <text id="n11_h35o" name="title_idInfo" xy="145,328" size="236,71" group="n17_h35o" font="ui://27vd145bh35o7ilb" fontSize="54" color="#444444" text="身份证号:"/>
-    <graph id="n12_h35o" name="bg_idInfo" xy="408,322" size="720,84" group="n17_h35o" type="rect" lineSize="0" lineColor="#ffa06640" fillColor="#ffa06640" corner="18"/>
-    <text id="n14_h35o" name="input_idInfo" xy="438,334" size="660,60" group="n17_h35o" alpha="0.5" font="ui://27vd145bh35o7im7" fontSize="42" color="#ffffff" autoSize="none" text="" input="true" prompt="[color=#FFFFFF ]请输入名字[/color]"/>
-    <group id="n17_h35o" name="idInfo" xy="145,322" size="983,84"/>
+    <group id="n8_h35o" name="bg" xy="0,0" size="1272,777"/>
+    <text id="n9_h35o" name="title__name" xy="198,201" size="182,72" group="n16_h35o" font="FZCuYuan-M03" fontSize="54" color="#444444" text="姓    名:"/>
+    <graph id="n10_h35o" name="bg_name" xy="408,195" size="720,84" group="n16_h35o" type="rect" lineSize="0" lineColor="#ffa06640" fillColor="#ffa06640" corner="18"/>
+    <text id="n13_h35o" name="input_name" xy="438,207" size="660,62" group="n16_h35o" alpha="0.5" font="Arial" fontSize="46" color="#ffffff" autoSize="none" text="" input="true" prompt="[color=#FFFFFF ]请输入名字[/color]"/>
+    <group id="n16_h35o" name="name" xy="198,195" size="930,84"/>
+    <graph id="n12_h35o" name="bg_idInfo" xy="408,342" size="720,84" group="n17_h35o" type="rect" lineSize="0" lineColor="#ffa06640" fillColor="#ffa06640" corner="18"/>
+    <text id="n14_h35o" name="input_idInfo" xy="438,354" size="660,62" group="n17_h35o" alpha="0.5" font="Arial" fontSize="46" color="#ffffff" autoSize="none" text="" input="true" prompt="[color=#FFFFFF ]请输入名字[/color]"/>
+    <text id="n11_h35o" name="title_idInfo" xy="103,350" size="234,72" group="n17_h35o" scale="1.2,1" font="FZCuYuan-M03" fontSize="54" color="#444444" text="身份证号:"/>
+    <group id="n17_h35o" name="idInfo" xy="103,342" size="1025,84"/>
     <component id="n18_h35o" name="btn_send" src="h35o7cs4" fileName="component/Authentication/Component/btn_send.xml" xy="408,507" size="432,147"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/Main_New.xml

@@ -55,13 +55,16 @@
       <relation target="" sidePair="right-right%,top-top%"/>
     </component>
     <group id="n111_ker3" name="menu_top" xy="2149,6" size="358,96"/>
-    <component id="n176_isi5" name="btn_customerService" src="isi57cny" fileName="component/Main/Component/right/btn_customerService.xml" xy="2332,422" group="n123_g8kk">
+    <component id="n176_isi5" name="btn_customerService" src="isi57cny" fileName="component/Main/Component/right/btn_customerService.xml" xy="2336,422" group="n123_g8kk">
       <relation target="" sidePair="right-right%,top-top%"/>
     </component>
     <component id="n177_isi5" name="btn_invite" src="isi57cnx" fileName="component/Main/Component/right/btn_invite.xml" xy="2336,257" group="n123_g8kk">
       <relation target="" sidePair="right-right%,top-top%"/>
     </component>
-    <group id="n123_g8kk" name="menu_right" xy="2332,257" size="165,304"/>
+    <component id="n204_bgcf" name="btn_giftDiamond" src="66fw7d75" fileName="component/Record/Component/btn_normol.xml" xy="2336,584" size="160,139" group="n123_g8kk" visible="false">
+      <Button icon="ui://2d9xdj6zbgcf7jg5"/>
+    </component>
+    <group id="n123_g8kk" name="menu_right" xy="2336,257" size="161,466"/>
     <component id="n178_isi5" name="btn_more" src="isi57co9" fileName="component/Main/Component/left/btn_more.xml" xy="-4,482" group="n125_g8kk">
       <relation target="" sidePair="middle-middle,left-left"/>
     </component>

wb_new_ui/assets/Lobby/component/Authentication/Component/btn_send.xml

@@ -4,10 +4,6 @@
   <displayList>
     <image id="n6_h35o" name="n6" src="h35o7cs5" fileName="component/Authentication/Image/Group 25@3x.png" xy="9,0"/>
     <image id="n3_h35o" name="n3" src="h35o7cs5" fileName="component/Authentication/Image/Group 25@3x.png" xy="9,0"/>
-    <graph id="n4_h35o" name="n4" xy="-147,0" size="147,147" type="polygon" lineSize="0" fillColor="#4c333333" points="74,0,147,147,73,147,3.814697E-06,0"/>
   </displayList>
   <Button/>
-  <transition name="t0" autoPlay="true" autoPlayRepeat="-1" frameRate="60">
-    <item time="0" type="XY" target="n4_h35o" tween="true" startValue="-147,0" endValue="419,0" duration="60" ease="Linear" repeat="-1"/>
-  </transition>
 </component>

wb_new_ui/assets/Lobby/component/service/Component/listChild_one.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1598,120" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <component id="n3_if10" name="btn_copy" src="nauple" fileName="component/service/btn_copywx.xml" xy="1352,23" pivot="0.5,0.5" size="206,74" scale="1.2,1.2"/>
+    <text id="n4_if10" name="text_title" xy="115,20" size="261,79" font="Arial" fontSize="60" text="游戏代理:"/>
+    <text id="n6_if10" name="title" xy="376,20" size="949,79" font="Arial" fontSize="60" color="#006600" autoSize="shrink" text="微信号:">
+      <relation target="n4_if10" sidePair="leftext-right"/>
+    </text>
+    <image id="n7_if10" name="n7" src="nld2cjr" fileName="component/user_info/wx/update_wechat_icon.png" xy="6,9"/>
+  </displayList>
+  <Button/>
+</component>

wb_new_ui/assets/Lobby/component/service/service.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1683,778">
+  <displayList>
+    <image id="n5_if10" name="n5" src="if107d9s" fileName="images/pop_oneInput/bg.png" xy="13,0" size="1654,777" group="n7_if10"/>
+    <image id="n6_if10" name="n6" src="if107d9t" fileName="images/pop_oneInput/title_top.png" xy="0,0" size="1683,140" group="n7_if10"/>
+    <group id="n7_if10" name="bg" xy="0,0" size="1683,777"/>
+    <component id="n1_if10" name="btn_close" src="vg2c4" fileName="buttons/Btn_close.xml" pkg="27vd145b" xy="1562,-30" size="155,148"/>
+    <list id="n2_if10" name="list" xy="47,167" size="1578,555" overflow="scroll" defaultItem="ui://2d9xdj6zif107d9r" autoClearItems="true">
+      <item/>
+    </list>
+    <text id="n10_if10" name="title" xy="247,12" 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="联系客服"/>
+  </displayList>
+</component>

wb_new_ui/assets/Lobby/package.xml

@@ -697,6 +697,12 @@
     <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/"/>
+    <component id="if107d9q" name="service.xml" path="/component/service/" exported="true"/>
+    <component id="if107d9r" name="listChild_one.xml" path="/component/service/Component/"/>
+    <image id="if107d9s" name="bg.png" path="/images/pop_oneInput/" scale="9grid" scale9grid="14,135,28,270"/>
+    <image id="if107d9t" name="title_top.png" path="/images/pop_oneInput/" scale="9grid" scale9grid="160,22,320,44"/>
+    <image id="if107d9u" name="hall_club_common_btntext_queding.png" path="/images/pop_oneInput/"/>
+    <image id="bgcf7jg5" name="fangkazhengsong.png" path="/component/Main/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_Poker/newcard/3/310_1.xml

@@ -9,8 +9,8 @@
       <relation target="" sidePair="left-left%,top-top%"/>
     </image>
     <image id="n4_iqk2" name="n4" src="rmtwiw" fileName="newcard/素材/hongtao.png" xy="143,188" size="128,124" aspect="true"/>
-    <image id="n6_eqmd" name="n6" src="eqmdtm" fileName="newcard/素材/fb.png" xy="0,0" size="66,66">
-      <relation target="" sidePair="width-width%,height-height%"/>
+    <image id="n6_eqmd" name="n6" src="eqmdtm" fileName="newcard/素材/fb.png" xy="57,271" pivot="0.5,0.5" anchor="true" size="111,111">
+      <relation target="" sidePair="width-width%,height-height%,left-left%"/>
     </image>
   </displayList>
 </component>

wb_new_ui/assets/Main_Poker/newcard/3/310_2.xml

@@ -9,8 +9,8 @@
       <relation target="" sidePair="left-left%,top-top%"/>
     </image>
     <image id="n4_iqk2" name="n4" src="rmtwiw" fileName="newcard/素材/hongtao.png" xy="143,188" size="128,124" aspect="true"/>
-    <image id="n6_eqmd" name="n6" src="eqmdtm" fileName="newcard/素材/fb.png" xy="0,0" size="66,66">
-      <relation target="" sidePair="width-width%,height-height%"/>
+    <image id="n6_eqmd" name="n6" src="eqmdtm" fileName="newcard/素材/fb.png" xy="2,226" size="111,111">
+      <relation target="" sidePair="width-width%,height-height%,left-left%,top-bottom%"/>
     </image>
   </displayList>
 </component>

wb_unity_pro/Assets/StreamingAssets/init1_1.json

@@ -1,41 +1,41 @@
 [
   {
-    "ver": "1.0.41",
+    "ver": "1.0.42",
     "name": "跑得快",
     "check": true,
-    "version": "1.0.41",
+    "version": "1.0.42",
     "game_id": "66",
     "bundle": "extend/poker/runfast"
   },
   {
-    "ver": "1.0.59",
+    "ver": "1.0.60",
     "name": "南城麻将",
     "check": true,
-    "version": "1.0.59",
+    "version": "1.0.60",
     "game_id": "86",
     "bundle": "extend/majiang/nancheng"
   },
   {
-    "ver": "1.0.62",
+    "ver": "1.0.63",
     "name": "黎川麻将",
     "check": true,
-    "version": "1.0.62",
+    "version": "1.0.63",
     "game_id": "87",
     "bundle": "extend/majiang/lichuan"
   },
   {
-    "ver": "1.0.46",
+    "ver": "1.0.47",
     "name": "金溪麻将",
     "check": true,
-    "version": "1.0.46",
+    "version": "1.0.47",
     "game_id": "88",
     "bundle": "extend/majiang/jinxi"
   },
   {
-    "ver": "1.0.45",
+    "ver": "1.0.46",
     "name": "抚州麻将",
     "check": true,
-    "version": "1.0.45",
+    "version": "1.0.46",
     "game_id": "89",
     "bundle": "extend/majiang/fuzhou"
   }

wb_unity_pro/Assets/StreamingAssets/init2_1.json

@@ -1,109 +1,109 @@
 [
   {
     "lua_path": "/tolua_project,/base_project,/main_project",
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "base_script",
     "check": true,
     "bundle": "base/base_script",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "common",
     "check": true,
     "bundle": "base/common",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "login",
     "check": true,
     "bundle": "base/login",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "lobby",
     "check": true,
     "bundle": "base/lobby",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "Family",
     "check": true,
     "bundle": "base/Family",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "chat",
     "check": true,
     "bundle": "base/chat",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "newgroup",
     "check": true,
     "bundle": "base/newgroup",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "rank",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/rank"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_majiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_majiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_poker",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_poker"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_zipai",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_zipai"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "static",
     "check": true,
     "bundle": "base/static",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "is_res": true,
     "name": "embed",
     "check": true,
     "bundle": "base/embed",
-    "version": "1.0.8"
+    "version": "1.0.9"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_pokemajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_pokemajiang"
   },
   {
-    "ver": "1.0.8",
+    "ver": "1.0.9",
     "name": "main_zipaimajiang",
     "check": true,
-    "version": "1.0.8",
+    "version": "1.0.9",
     "bundle": "base/main_zipaimajiang"
   }
 ]