4点测试包版本

lua_probject/base_project/Game/View/Common/BaseWindow.lua

@@ -154,8 +154,10 @@ function M:Show()
     AddPanel(self._root_view)
     if self._full then
         local offset = get_offset(self._full_offset)
-        self._contentPane.width = GRoot.inst.width - 2 * offset
+        self._contentPane:MakeFullScreen()
-        self._contentPane.height = GRoot.inst.height
+        self._contentPane:AddRelation(GRoot.inst, RelationType.Size)
+        -- self._contentPane.width = GRoot.inst.width - 2 * offset
+        -- self._contentPane.height = GRoot.inst.height
         self._contentPane.x = offset
     end
 end

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

@@ -64,43 +64,6 @@ function M:init(url)
         _curren_msg:Show()
     end)
 
-
-    --绑定按钮
-    local btn_bing = view:GetChild('btn_bind')
-    if btn_bing then
-        btn_bing.selected = DataManager.SelfUser.is_lock == 1
-        -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
-        btn_bing.onClick:Set(function(context)
-            local _curren_msg = MsgWindow.new(self._root_view,
-                string.format( btn_bing.selected and "是否锁定当前设备\n锁定之后其余设备无法登陆" or "是否解除该设备\n解除之后所有设备都可登陆"),
-                MsgWindow.MsgMode.OkAndCancel)
-            _curren_msg.onOk:Add(
-                function()
-                    local loginCtr = ControllerManager.GetController(LoginController)
-                    loginCtr:LockDevice(btn_bing.selected, function(res)
-                        if res.ReturnCode ~= 0 then
-                            ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
-                            btn_bing.selected = not btn_bing.selected
-                        else
-                            DataManager.SelfUser.is_lock = btn_bing.selected and 1 or 0
-                        end
-                        -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
-                    end)
-                end
-            )
-            -- _curren_msg.onCancel:Add(function()
-            --     btn_bing.selected = not btn_bing.selected
-            --     btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
-            -- end)
-            _curren_msg._view:GetChild('btn_close').onClick:Set(function()
-                btn_bing.selected = not btn_bing.selected
-                -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
-                _curren_msg:Destroy()
-            end)
-            _curren_msg:Show()
-        end)
-    end
-
     btn_music.onChanged:Add(function()
         GameApplication.Instance.MusicValue = btn_music.selected and 50 or 0
         slider_music.value = GameApplication.Instance.MusicValue

lua_probject/base_project/Game/View/LobbyView.lua

@@ -97,6 +97,42 @@ function M:InitView(url)
     end)
 
     self:__GetMessage()
+
+        --绑定按钮
+    local btn_bing = view:GetChild('btn_bind')
+    if btn_bing then
+        btn_bing.selected = DataManager.SelfUser.is_lock == 1
+        -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
+        btn_bing.onClick:Set(function(context)
+            local _curren_msg = MsgWindow.new(self._root_view,
+                string.format( btn_bing.selected and "是否锁定当前设备\n锁定之后其余设备无法登陆" or "是否解除该设备\n解除之后所有设备都可登陆"),
+                MsgWindow.MsgMode.OkAndCancel)
+            _curren_msg.onOk:Add(
+                function()
+                    local loginCtr = ControllerManager.GetController(LoginController)
+                    loginCtr:LockDevice(btn_bing.selected, function(res)
+                        if res.ReturnCode ~= 0 then
+                            ViewUtil.ErrorTip(res.ReturnCode, "设置失败")
+                            btn_bing.selected = not btn_bing.selected
+                        else
+                            DataManager.SelfUser.is_lock = btn_bing.selected and 1 or 0
+                        end
+                        -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
+                    end)
+                end
+            )
+            -- _curren_msg.onCancel:Add(function()
+            --     btn_bing.selected = not btn_bing.selected
+            --     btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
+            -- end)
+            _curren_msg._view:GetChild('btn_close').onClick:Set(function()
+                btn_bing.selected = not btn_bing.selected
+                -- btn_bing.icon = btn_bing.selected and 'ui://Common/on' or 'ui://Common/off'
+                _curren_msg:Destroy()
+            end)
+            _curren_msg:Show()
+        end)
+    end
 end
 
 function M:OnJoinRoomAction(context)

lua_probject/base_project/Game/View/LoginView.lua

@@ -11,6 +11,7 @@ function LoginView.new()
     local self = setmetatable({}, { __index = M })
     self.class = "LoginView"
     self._full = true
+    self._full_offset = false
     self:init()
     return self
 end

lua_probject/base_project/Game/View/NewGroup/GroupMainView.lua

@@ -32,6 +32,7 @@ function M:InitView(url)
     -- end)
     local fgCtr = ControllerManager.GetController(NewGroupController)
     local btn_creategroup = self._view:GetChild('btn_creategroup')
+    btn_creategroup.visible = false
     btn_creategroup.onClick:Set(function()
         local cgv = CreateGroupView.new(self._root_view)
         cgv:Show()

lua_probject/base_project/Game/View/NewGroup/GroupManagerView.lua

@@ -66,7 +66,6 @@ function M:init(btn_type)
     self.ctr_index = self._view:GetController("index")
     self._ctr_tongji = self._view:GetController('tongji')
     self.page_config = MngPageConfig.Config[btn_type][lev]
-
     local gmsv
     if btn_type == 2 and lev ~= 4 then
         --绑定统计代码
@@ -77,6 +76,7 @@ function M:init(btn_type)
         self._view_map = {}
         self._view_map[#self.page_config + 1] = gmsv
         gmsv.id = first_page_config.id
+        self._view:GetChild('bgWindow').text = first_page_config.title
     else
         -- 初始界面
         local first_page_config = getPageConfig(self.page_config[1])
@@ -84,6 +84,7 @@ function M:init(btn_type)
         self._view_map = {}
         self._view_map[1] = gmsv
         gmsv.id = first_page_config.id
+        self._view:GetChild('bgWindow').text = first_page_config.title
     end
     -- 初始化标题列表
     for i = 1, #self.page_config do
@@ -194,6 +195,7 @@ function M:init(btn_type)
         -- 如果refresh为true，重新加载界面时执行初始化数据方法initData
         if page_info then
             self.titleTxt.text = page_info.title
+            self._view:GetChild('bgWindow').text = page_info.title
         end
         self._view_map[index + 1]:initData()
     end)
@@ -258,6 +260,7 @@ function M:Show(quick_access_id)
         -- if page_info.refresh then self._view_map[index + 1]:initData() end
         if page_info then
             self.titleTxt.text = page_info.title
+            self._view:GetChild('bgWindow').text = page_info.title
         end
         self._view_map[index + 1]:initData()
     else

lua_probject/base_project/Game/View/NewGroup/MngView/GroupMngPersonStatView2.lua

@@ -0,0 +1,351 @@
+local TimeSettingPanel = import(".TimeSettingPanelTog")
+-- 开桌统计
+local GroupMngPersonStatView2 = {}
+
+local M = GroupMngPersonStatView2
+
+function GroupMngPersonStatView2.new(gid)
+    local self = M
+    self.class = "GroupMngPersonStatView2"
+    self.group_id = gid
+    self:InitView()
+    return self
+end
+
+function M:initData()
+    self.lst_record.numItems = 0
+    self.record_data = {}
+    self._view:GetController("record").selectedIndex = 0
+    self:GetRecordData(0)
+end
+
+function M:InitView()
+    self._view = UIPackage.CreateObjectFromURL("ui://NewGroup/View_GroupPersonStat2")
+
+    local group = DataManager.groups:get(self.group_id)
+    self.lst_record = self._view:GetChild("lst_record")
+    self.lst_record:SetVirtual()
+    self.lst_record.itemRenderer = function(index, obj)
+        self:OnRenderRecordItem(index, obj)
+    end
+    self.lst_record.scrollPane.onPullUpRelease:Set(function()
+        self:GetRecordData(self.lst_record.numItems)
+    end)
+
+    self.time_panel = TimeSettingPanel.new(self._view, self._view:GetChild("btn_date1"), self._view:GetChild("btn_date2"),
+        -308, 0, function()
+            self.record_data = {}
+            self.lst_record.numItems = 0
+
+            self.begin_time, self.end_time = self.time_panel:GetDate()
+            self:GetRecordData(0)
+        end, { showDay = group.lev < 3 and 30 or 7 })
+    self.begin_time, self.end_time = self.time_panel:GetDate()
+    local ctr_page = self._view:GetController("type")
+    ctr_page.onChanged:Set(function()
+        self.record_data = {}
+        self.lst_record.numItems = 0
+        self.begin_time = nil
+        self.end_time = nil
+        self:GetRecordData(0)
+    end)
+
+    self._view:GetChild("btn_search").onClick:Set(function()
+        self.record_data = {}
+        self.lst_record.numItems = 0
+
+        self.begin_time, self.end_time = self.time_panel:GetDate()
+        self:GetRecordData(0)
+    end)
+end
+
+function M:GetRecordData(index)
+    ViewUtil.ShowModalWait()
+
+    local time_type = self._view:GetController("type").selectedIndex
+
+    if self.begin_time ~= nil and self.end_time ~= nil then
+        time_type = 3
+    end
+
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_GetGroupPersonRecord(self.group_id, GetPlatform(), DataManager.SelfUser.account_id, time_type,
+        self.begin_time, self.end_time, index, 6, function(res)
+            if self._is_destroy then
+                return
+            end
+            ViewUtil.CloseModalWait()
+            if res.ReturnCode ~= 0 then
+                ViewUtil.ErrorTip(res.ReturnCode, "获取回放数据失败")
+            else
+                local records = res.Data.records
+                for i = 1, #records do
+                    self.record_data[#self.record_data + 1] = records[i]
+                end
+                self.lst_record.numItems = #self.record_data
+
+                printlog("ccccccccccccccccccccccccccccccccccc2222223333333333333333333333333333333", res.Data
+                    .total_round,
+                    "    ", res.Data.valid_round)
+                pt(res.Data)
+                if index == 0 then
+                    --self._view:GetChild("tex_num1").text = ""..res.Data.total
+                    --self._view:GetChild("tex_num3").text = ""..d2ad(res.Data.consume)
+                    self._view:GetChild("tex_winner_count").text = res.Data.total_round
+                    self._view:GetChild("tex_valid_count").text = res.Data.valid_round / 100
+
+                    self._view:GetChild("tex_total_proportion").text = d2ad(res.Data.total_win)
+                end
+            end
+        end)
+end
+
+function M:FillRecordItem(data, obj)
+    local game_id = data.game_id
+    local room_id = data.room_id
+    local create_time = data.create_time
+    local room_type_str = data.game_info.name
+    local time = tonumber(create_time)
+    local room_time_str = os.date("%Y-%m-%d %H:%M:%S", time)
+    local totalScore = json.decode(data.totalScore)
+    local hpOnOff = data.hpOnOff
+    local hpType = data.game_info.hpType
+    local player_list = {}
+    for i = 1, #totalScore do
+        local p = totalScore[i]
+        player_list[i] = {}
+        player_list[i].id = p.accId
+        local score = p.score
+        if hpOnOff == 1 and hpType > 1 then
+            score = score / 10
+        end
+        player_list[i].score = score
+        player_list[i].house = 0
+        player_list[i].nick = p.nick
+    end
+    local play_name = DataManager.groups:get(self.group_id):getPlayName(data.groupPid)
+
+    obj:GetChild("tex_time").text = room_time_str
+    obj:GetChild("tex_roomid").text = room_id
+    obj:GetChild("tex_times").text = d2ad(data.hp_times) .. "倍"
+    obj:GetChild("tex_game").text = play_name
+    local lst_total = obj:GetChild("lst_total")
+    lst_total:RemoveChildrenToPool()
+    local ids = {}
+    for j = 1, #totalScore do
+        local titem = lst_total:AddItemFromPool()
+        local trdata = totalScore[j]
+        titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick)
+        titem:GetChild("tex_id").text = "ID:" .. trdata.accId
+        table.insert(ids, trdata.accId)
+
+        local score = trdata.score
+        if trdata.hp == nil then
+            if hpOnOff == 1 and hpType > 1 then
+                score = score / 10
+            end
+        else
+            score = d2ad(trdata.hp)
+        end
+
+        titem:GetChild("tex_score").text = score
+
+        if score >= 0 then
+            titem:GetController("num_color").selectedIndex = 0
+        else
+            titem:GetController("num_color").selectedIndex = 1
+        end
+    end
+
+    if #totalScore >= 6 then
+        obj:GetController("person_num").selectedIndex = 1
+    else
+        obj:GetController("person_num").selectedIndex = 0
+    end
+
+    obj:GetChild("btn_screenshot").onClick:Set(function()
+        self:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
+    end)
+
+    obj:GetChild("btn_share").onClick:Set(function()
+        ShareChatRoom(room_id, tostring(os.time()), data.round, room_type_str, self.group_id, player_list)
+    end)
+    obj.onClick:Set(function()
+        self:OnShowRecordInfo(data, ids)
+    end)
+end
+
+function M:OnRenderRecordItem(index, obj)
+    local data = self.record_data[index + 1]
+    self:FillRecordItem(data, obj)
+end
+
+function M:OnShareScreenShot(room_id, room_type_str, room_time_str, totalScore, hpOnOff, hpType)
+    ViewUtil.ShowModalWait(self._view, "正在分享...")
+    UIPackage.AddPackage("base/rank/ui/Rank")
+    local result_view = UIPackage.CreateObjectFromURL("ui://Rank/ResultView")
+    result_view.visible = false
+    self._view:AddChild(result_view)
+    result_view.x = -308
+    result_view.y = -47
+    result_view:GetChild("tex_roomnum").text = "房间号:" .. room_id .. "  " .. room_type_str
+    result_view:GetChild("tex_data").text = room_time_str
+    result_view:GetChild("btn_confirm").onClick:Set(function() result_view:Dispose() end)
+    local lst_p = result_view:GetChild("list_result")
+    local load_head_num = #totalScore
+    for j = 1, #totalScore do
+        local p = totalScore[j]
+        local item = lst_p:AddItemFromPool()
+        item:GetChild("name").text = ViewUtil.stringEllipsis(p.nick)
+        local score = p.score
+        if hpOnOff == 1 and hpType > 1 then
+            score = score / 10
+        end
+        item:GetChild("score").text = score
+        if score < 0 then item:GetController("di").selectedIndex = 1 end
+        if p.portrait and p.portrait ~= "" then
+            ImageLoad.Load(p.portrait, item:GetChild("n9")._iconObject, self.class, function(...)
+                load_head_num = load_head_num - 1
+            end)
+        else
+            load_head_num = load_head_num - 1
+        end
+    end
+    coroutine.start(function(...)
+        local left_time = 4
+        while (true) do
+            if load_head_num == 0 or left_time == 0 then
+                result_view.visible = true
+                coroutine.wait(0.2)
+                ShareScreenShotWithOption(function()
+                    result_view:Dispose()
+                end)
+                ViewUtil.CloseModalWait()
+                break
+            end
+            coroutine.wait(1)
+            left_time = left_time - 1
+        end
+    end)
+end
+
+function M:OnShowRecordInfo(rdata, ids)
+    local ctr_record = self._view:GetController("record")
+    ctr_record.selectedIndex = 1
+
+    local lst_recordInfo = self._view:GetChild("lst_recordInfo")
+    lst_recordInfo:RemoveChildrenToPool()
+    -- lst_recordInfo.scrollPane.currentPageX = 0
+    local round_count = tonumber(rdata.round)
+    local game_id = rdata.game_info.game_id
+    local playback_id = rdata.military_id
+    local hpOnOff = rdata.hpOnOff
+    local hpType = rdata.game_info.hpType
+    for i = 1, round_count do
+        local item = lst_recordInfo:AddItemFromPool()
+        item:GetChild("tex_num").text = tostring(i)
+
+        local play_name = DataManager.groups:get(self.group_id):getPlayName(rdata.groupPid)
+        item:GetChild("tex_game").text = play_name
+
+        item:GetChild("tex_roomid").text = rdata.room_id
+
+        item:GetChild("tex_times").text = d2ad(rdata.hp_times) .. "倍"
+
+        local round_score_str = rdata["round_" .. i]
+        local round_score_item = json.decode(round_score_str)
+        local lst_total = item:GetChild("lst_total")
+        lst_total:RemoveChildrenToPool()
+        for k = 1, #round_score_item do
+            local titem = lst_total:AddItemFromPool()
+            local trdata = round_score_item[k]
+            titem:GetChild("tex_name").text = ViewUtil.stringEllipsis(trdata.nick)
+            titem:GetChild("tex_id").text = "ID:" .. ids[k]
+
+            local score = trdata.score
+            if trdata.hp == nil then
+                if hpOnOff == 1 and hpType > 1 then
+                    score = score / 10
+                end
+            else
+                score = d2ad(trdata.hp)
+            end
+
+
+            titem:GetChild("tex_score").text = score
+        end
+
+        if #round_score_item >= 6 then
+            item:GetController("person_num").selectedIndex = 1
+        else
+            item:GetController("person_num").selectedIndex = 0
+        end
+        local btn_play = item:GetChild("btn_play")
+        btn_play.onClick:Set(function()
+            local group = DataManager.groups:get(self.group_id)
+            if DataManager.SelfUser.playback[playback_id] ~= nil and DataManager.SelfUser.playback[playback_id][i] ~= nil then
+                local room = ExtendManager.GetExtendConfig(game_id):NewRoom()
+                DataManager.CurrenRoom = room
+                room.lev = group.lev
+                room.game_id = game_id
+                local extend = ExtendManager.GetExtendConfig(game_id)
+                extend:FillPlayBackData(DataManager.SelfUser.playback[playback_id][i])
+                if not room.self_player then
+                    room.self_player = room:GetPlayerBySeat(1)
+                end
+                local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id)
+                main._currentId = playback_id
+                main._currentRound = i
+                main._totalRound = tonumber(rdata.round)
+                main:FillRoomData(DataManager.SelfUser.playback[playback_id][i])
+            else
+                ViewUtil.ShowModalWait(self._view)
+                local _data = {}
+                _data["military_id"] = playback_id
+                _data["round"] = tostring(i)
+                local loddyCtr1 = ControllerManager.GetController(LoddyController)
+                loddyCtr1:RequestPlayBack(_data, function(code, data)
+                    ViewUtil.CloseModalWait()
+                    if code == 0 then
+                        if DataManager.SelfUser.playback[playback_id] ~= nil then
+                            DataManager.SelfUser.playback[playback_id][i] = data
+                        else
+                            local playback_data = {}
+                            playback_data[i] = data
+                            DataManager.SelfUser.playback[playback_id] = playback_data
+                        end
+
+                        local main = self:GenaratePlayBack(ViewManager.View_PlayBack, game_id)
+                        main._currentId = playback_id
+                        main._currentRound = i
+                        main._totalRound = tonumber(rdata.round)
+                        main:FillRoomData(data)
+                        main._room.lev = group.lev
+                    elseif code == 25 then
+                        ViewUtil.ErrorTip(-1, "回放未找到！")
+                        -- btn_play_back.grayed = true
+                    end
+                end, rdata.game_info)
+            end
+        end)
+    end
+end
+
+function M:GenaratePlayBack(id, game_id, ...)
+    local tem = nil
+    local dview_class = nil
+    if not dview_class then
+        local exconfig = ExtendManager.GetExtendConfig(game_id)
+        dview_class = exconfig:GetView(id)
+    end
+    if not dview_class then
+        return
+    end
+    local arg = { ... }
+    tem = dview_class.new(...)
+    tem.Id = id
+    tem:Show()
+    return tem
+end
+
+return M

lua_probject/base_project/Game/View/NewGroup/MngView/MngPageConfig.lua

@@ -14,6 +14,7 @@ local GroupMngPlayStatView = import(".GroupMngPlayStatView")
 local GroupMngPersonStatView = import(".GroupMngPersonStatView")
 local GroupMngMemberStatView = import(".GroupMngMemberStatView")
 local GroupMngPartnerStatView = import(".GroupMngPartnerStatView")
+local GroupMngPersonStatView2 = import(".GroupMngPersonStatView2")
 local GroupMngMemberInfoView = import(".GroupMngMemberInfoView")
 local GroupMngXingYunStatView = import(".GroupMngXingYunStatView")
 local GroupMngZuanShiStatView = import(".GroupMngZuanShiStatView")
@@ -45,6 +46,7 @@ MngPageConfig.PageList = {
 	{ id = 22, title = "数据统计", view = GroupMngMemberInfoView, refresh = true, clear_image = true, anchorOffset = 300 },
 	{ id = 23, title = "玩家数据", view = GroupMngXingYunStatView, refresh = true, clear_image = true, anchorOffset = 300 },
 	{ id = 24, title = "局数统计", view = GroupMngZuanShiStatView, refresh = true, clear_image = true, anchorOffset = 300 },
+	{ id = 25, title = "个人战绩", view = GroupMngPersonStatView2, refresh = true, clear_image = true, anchorOffset = 300 },
 }
 
 -- Config定义不同职位的人，通过不同按钮进入显示的内容
@@ -73,7 +75,7 @@ MngPageConfig.Config = {
 		--{19,16,7, 8,17,22},
 		-- 普通玩家
 		--{9, 17},
-		{ 17 },
+		{ 25 },
 	},
 	-- 成员按钮
 	{

lua_probject/extend_project/extend/majiang/hongzhong/EXClearingView.lua

@@ -85,6 +85,8 @@ function M:InitData(over, room, result, total_result, callback)
 		room.room_config.round, os.date("%Y-%m-%d %H:%M:%S", os.time()))
 	self._view:GetChild("tex_gameinfo").text = string.gsub(room.room_config:GetDes(), "\r", "")
 
+    self.bgWindow = self._view:GetChild('bgWindow')
+
 	local paixingxiangqing = self._view:GetChild("btn_detal")
 	paixingxiangqing.visible = false
 
@@ -208,7 +210,7 @@ function M:FillItemData(room, data, item, active_player, niao)
 	local _gamectr = ControllerManager.GetController(GameController)
 	local p = room:GetPlayerBySeat(data["seat"])
 	item:GetChild("playerName").text = p.self_user.nick_name
-
+	ImageLoad.Load(p.self_user.head_url,item:GetChild('head')._iconObject)
 	-- 手牌
 	local hand_cards = data["hand_card"]
 	table.sort(hand_cards, ViewUtil.HandCardSort)
@@ -338,7 +340,7 @@ function M:FillItemData2(room, data, list)
 	if #player_list == 3 then
 		lst_p.columnGap = 108
 	elseif #player_list == 2 then
-		lst_p.columnGap = 376
+		lst_p.columnGap = 208
 	end
 	self:InitBigResult(room, 30)
 	local show_detail = room.hpOnOff == 1

lua_probject/extend_project/extend/majiang/zhuanzhuan/EXClearingView.lua

@@ -197,11 +197,11 @@ function M:FillItemData(room, data, item, active_player, niao)
 	item:GetChild("score1").text = str
 	-- local total_score = data["total_score"]
 	if total >= 0 then
-		item:GetChild("score2").text = "+"..total
+		item:GetChild("score2win").text = "+" .. total
-		item:GetChild("score2").grayed = false
+		-- item:GetChild("score2win").grayed = false
 	else
-		item:GetChild("score2").text = total
+		item:GetChild("score2lose").text = total
-		item:GetChild("score2").grayed = true
+		-- item:GetChild("score2win").grayed = true
 	end
 
 	local hp_nonnegative = room:checkHpNonnegative()

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

@@ -215,7 +215,7 @@ function M:InitPoker(pokerList, isPlayAni, open)
     -- -- print(vardump(self.card_list))
     self.cor_init_poker = nil
     self.card_list = {}
-    self._ctr_canSendCard.selectedIndex = 0
+    self._ctr_canSendCard.selectedIndex = 1
     self._flag_ruleCard = false
     self._view_handCard:RemoveChildren(0, -1, true)
     if isPlayAni == true then
@@ -498,9 +498,9 @@ function M:TouchMoveEnd(context)
                     ._flag_ruleCard
             })
 
-        self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
+    --     self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
-    else
+    -- else
-        self._ctr_canSendCard.selectedIndex = 0
+    --     self._ctr_canSendCard.selectedIndex = 0
     end
 end
 
@@ -568,7 +568,7 @@ function M:ShowOutCardOption(ctr_select, type, number, length, mustPutMaxCard, p
     self.tips_click_count = 0
     self.send_card = {}
     self.tips_card_list = self:GetCardTips(type, number, length, mustPutMaxCard)
-    self._ctr_canSendCard.selectedIndex = 0
+    self._ctr_canSendCard.selectedIndex = 1
 
     if #self.tips_card_list >= 1 then
         -- body --在这个方法里添加判断抬起牌是否符合出牌类型(少跑一次手牌循环)
@@ -855,9 +855,9 @@ function M:UpdateHandCardsColor()
     if #send_card > 0 then
         table.sort(send_card, tableSortNumber)
         self._cardCheck:initCards(send_card, { flag = false, flag_allCards = #send_card == self._view_handCard.numItems })
-        self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
+    --     self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
-    else
+    -- else
-        self._ctr_canSendCard.selectedIndex = 0
+    --     self._ctr_canSendCard.selectedIndex = 0
     end
 end
 
@@ -954,7 +954,7 @@ function M:ShowTipsCard(index)
     end
     pt(item)
     self._cardCheck:initCards(item)
-    self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
+    -- self._ctr_canSendCard.selectedIndex = self._cardCheck:CheckCards() and 1 or 0
 end
 
 function M:GetHandCardOffset(count)

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

@@ -130,8 +130,10 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
             self:FillPlayerInfoEnd(self._view:GetChild(string.format("comp_playerInfo%d_over1", i)), info, playerInfo, rt,
                 bgWindow)
         end
-        local list_residue = self._view:GetChild('list_residue')
+    end
-        list_residue:RemoveChildrenToPool()
+    local list_residue = self._view:GetChild('list_residue')
+    list_residue:RemoveChildrenToPool()
+    if remaincards then
         for i, v in ipairs(remaincards) do
             local rc = list_residue:AddItemFromPool()
             rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
@@ -185,7 +187,7 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
     end
 end
 
-function M:FillPlayerInfoEnd(view, info, playerInfo, rt,bgWindow)
+function M:FillPlayerInfoEnd(view, info, playerInfo, rt, bgWindow)
     local room = DataManager.CurrenRoom
 
     ImageLoad.Load(playerInfo.self_user.head_url, view:GetChild('btn_head')._iconObject)

wb_new_ui/.objs/fonts.json

@@ -13,6 +13,8 @@ ui://27vd145bz5om44
 ui://27vd145bik9v7ing
 ui://27vd145bcv577ioj
 ui://27vd145bik9v7imb
+ui://27vd145bvbut7iri
+ui://27vd145bvbut7ir5
 ui://27vd145byffn7iqf
 ui://3qr8nmi47q1m2h
 ui://fnuxqeflkllg1u

wb_new_ui/.objs/metas/2d9xdj6z/fn7fao.info

@@ -1,6 +1,7 @@
 {
   "objectStatus": {
     "n111_ker3": {
+      "hidden": true,
       "collapsed": true
     },
     "n100_lumr": {

wb_new_ui/.objs/metas/2d9xdj6z/l0lzb.info

@@ -1,15 +1,24 @@
 {
   "objectStatus": {
-    "n60_ovii": {
+    "n74_g24i": {
+      "hidden": true
+    },
+    "n71_g24i": {
+      "hidden": true
+    },
+    "n73_g24i": {
+      "hidden": true
+    },
+    "n23": {
       "hidden": true
     },
     "n67_omkm": {
       "hidden": true
     },
-    "n24": {
+    "n60_ovii": {
       "hidden": true
     },
-    "n23": {
+    "n24": {
       "hidden": true
     }
   }

wb_new_ui/.objs/metas/2d9xdj6z/naupko.info

@@ -1,5 +1,8 @@
 {
   "objectStatus": {
+    "n0_naup": {
+      "hidden": true
+    },
     "n2_naup": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/hsbhhjn.info

@@ -3,9 +3,6 @@
     "n87_csp4": {
       "hidden": true
     },
-    "n96_hz87": {
-      "collapsed": true
-    },
     "n79_ovii": {
       "hidden": true
     }

wb_new_ui/.objs/metas/m7iejg46/l7wn7i83.info

@@ -0,0 +1 @@
+{}

wb_new_ui/.objs/metas/v0j9abjy/gq7m8f.info

@@ -1,16 +1,13 @@
 {
   "objectStatus": {
-    "n90_8sat": {
+    "n85_l2u4": {
       "collapsed": true
     },
-    "n107_go7q": {
-      "hidden": true
-    },
     "n108_go7q": {
       "hidden": true
     },
-    "n85_l2u4": {
+    "n107_go7q": {
-      "collapsed": true
+      "hidden": true
     },
     "n82_l2u4": {
       "collapsed": true

wb_new_ui/.objs/workspace.json

@@ -14,6 +14,8 @@
     "v0j9abjy",
     "/",
     "v0j9abjy",
+    "/Main_style_2/",
+    "v0j9abjy",
     "/component/",
     "v0j9abjy",
     "/component/clearing/",

wb_new_ui/assets/Common/MessageBox.xml

@@ -3,6 +3,7 @@
   <displayList>
     <component id="n20_st2l" name="n18" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1260,862">
       <relation target="" sidePair="width-width,height-height"/>
+      <Button title="提示"/>
     </component>
     <text id="n7_m0vo" name="tex_message" xy="47,194" pivot="0.5,0.5" size="1166,414" font="ui://27vd145bik9v7img" fontSize="56" color="#4b7359" align="center" vAlign="middle" ubb="true" autoSize="none" text="您是否退出当前账号？"/>
     <component id="n4_m0vo" name="btn_ok" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="176,647" size="400,169" group="n8_m0vo">

wb_new_ui/assets/Common/MessageBox1.xml

@@ -3,7 +3,7 @@
   <displayList>
     <component id="n19_ik9v" name="n18" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" xy="0,0" size="1260,862">
       <relation target="" sidePair="width-width,height-height"/>
-      <Button title="&#xA;"/>
+      <Button title="提示"/>
     </component>
     <text id="n20_ik9v" name="tex_message" xy="47,194" pivot="0.5,0.5" size="1166,414" font="ui://27vd145bik9v7img" fontSize="56" color="#4b7359" align="center" vAlign="middle" ubb="true" autoSize="none" text="您是否退出当前账号？"/>
     <component id="n21_ik9v" name="btn_ok" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" xy="430,647" size="400,169" group="n23_ik9v">

wb_new_ui/assets/Common/component/Win_BaseWindow.xml

@@ -1,10 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1500,930" extention="Button">
-  <controller name="bianhui" pages="0,,1," selected="0"/>
+  <controller name="bianhui" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n5_ik9v" name="n5" src="ik9v7imc" fileName="images/bg_window.png" xy="-1,0" size="1500,930">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
+    <image id="n7_zmrw" name="n7" src="ik9v7imd" fileName="images/bg_windowTitle.png" xy="371,-6" grayed="true">
+      <gearLook controller="bianhui" pages="1" values="1,0,1,0" default="1,0,0,0"/>
+      <relation target="" sidePair="center-center"/>
+    </image>
     <loader id="n4_hz87" name="icon" xy="371,-6" size="757,125" fill="scaleFree" clearOnPublish="true">
       <relation target="" sidePair="center-center"/>
     </loader>