整体细节修正，功能补充

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/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
         --绑定统计代码
@@ -194,6 +193,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)

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

@@ -132,10 +132,12 @@ function M:init(url, data, roomid, over, win_seat, dissolve, remaincards)
         end
         local list_residue = self._view:GetChild('list_residue')
         list_residue:RemoveChildrenToPool()
-        -- for i, v in ipairs(remaincards) do
+        if remaincards then
-        --     local rc = list_residue:AddItemFromPool()
+            for i, v in ipairs(remaincards) do
-        --     rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+                local rc = list_residue:AddItemFromPool()
-        -- end
+                rc.icon = string.format("ui://Extend_Poker_RunFastNew/%s", v)
+            end
+        end
     end
 
 
@@ -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/m7iejg46/hsbhhjn.info

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

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

@@ -1,72 +1,27 @@
 {
-  "libview.firstColumnWidth": 367,
+  "libview.firstColumnWidth": 383,
   "libview.iconScale": 0,
   "doc.openedDocs": [
-    "ui://m7iejg46l7wn7i83",
+    "ui://v0j9abjygq7m8f",
-    "ui://m7iejg4610xl7i1w"
+    "ui://v0j9abjygq7m8k",
+    "ui://v0j9abjygq7m85",
+    "ui://v0j9abjygq7maf",
+    "ui://v0j9abjyitp8ss"
   ],
   "test.device": "720p Phone",
   "canvasColor": 10066329,
   "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg46l7wn7i83",
+  "doc.activeDoc": "ui://v0j9abjygq7m85",
   "libview.twoColumn": false,
   "libview.expandedNodes": [
-    "27vd145b",
-    "/",
-    "27vd145b",
-    "/buttons/",
-    "27vd145b",
-    "/component/",
-    "27vd145b",
-    "/component/share/",
-    "27vd145b",
-    "/font/",
-    "27vd145b",
-    "/font/fontTitle/",
-    "27vd145b",
-    "/font/images/",
-    "27vd145b",
-    "/font/images/btn_keyboard/",
-    "27vd145b",
-    "/images/",
-    "27vd145b",
-    "/images/btn_keyboard/",
-    "27vd145b",
-    "/images/currency/",
-    "27vd145b",
-    "/images/dismiss_room/",
-    "27vd145b",
-    "/images/game/",
-    "27vd145b",
-    "/images/head/",
-    "27vd145b",
-    "/images/head/realname/",
-    "2d9xdj6z",
-    "/",
-    "2d9xdj6z",
-    "/component/",
-    "2d9xdj6z",
-    "/component/user_info/",
-    "2d9xdj6z",
-    "/component/user_info/edit/",
-    "2d9xdj6z",
-    "/images/",
-    "2d9xdj6z",
-    "/images/new/",
     "v0j9abjy",
     "/",
     "v0j9abjy",
+    "/Main_style_2/",
+    "v0j9abjy",
     "/component/",
     "v0j9abjy",
-    "/component/clearing/",
+    "/component/card/"
-    "v0j9abjy",
-    "/component/clearing/clearing1/",
-    "lx6k641g",
-    "/",
-    "lx6k641g",
-    "/image/",
-    "m7iejg46",
-    "/"
   ],
   "auxline1": true,
   "snapToGrid": true,

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>

wb_new_ui/assets/Common/package.xml

@@ -1341,6 +1341,35 @@
     <image id="itp87iqs" name="icon_setting_chooseBG.png" path="/images/" exported="true"/>
     <image id="yffnrs" name="bg_poker_other.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
     <image id="yffnrt" name="bg_poker_self.png" path="/images/" exported="true" scale="9grid" scale9grid="176,53,352,106"/>
+    <image id="vbut7iqt" name="0 - +.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7iqu" name="9 - 8.png" path="/font/font_majianlose/"/>
+    <image id="vbut7iqv" name="8 - 7.png" path="/font/font_majianlose/"/>
+    <image id="vbut7iqw" name="7 - 6.png" path="/font/font_majianlose/"/>
+    <image id="vbut7iqx" name="6 - 5.png" path="/font/font_majianlose/"/>
+    <image id="vbut7iqy" name="5 - 4.png" path="/font/font_majianlose/"/>
+    <image id="vbut7iqz" name="4 - 3.png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir0" name="3 - 2.png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir1" name="2 - 1.png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir2" name="11 - ..png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir3" name="10 - 9.png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir4" name="1 - 0.png" path="/font/font_majianlose/"/>
+    <font id="vbut7ir5" name="font_majianlose.fnt" path="/font/font_majianlose/"/>
+    <image id="vbut7ir6" name="0 - -.png" path="/font/font_majianlose/"/>
+    <image id="vbut7ir7" name="9 - 8.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7ir8" name="8 - 7.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7ir9" name="7 - 6.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7ira" name="6 - 5.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7irb" name="5 - 4.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7irc" name="4 - 3.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7ird" name="3 - 2.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7ire" name="2 - 1.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7irf" name="11 - ..png" path="/font/font_majiangwin/"/>
+    <image id="vbut7irg" name="10 - 9.png" path="/font/font_majiangwin/"/>
+    <image id="vbut7irh" name="1 - 0.png" path="/font/font_majiangwin/"/>
+    <font id="vbut7iri" name="font_majiangwin.fnt" path="/font/font_majiangwin/"/>
+    <image id="vbut7irj" name="bg_game_times.png" path="/images/"/>
+    <image id="vbut7irk" name="btn_bing.png" path="/images/" exported="true"/>
+    <image id="vbut7irl" name="btn_unbing.png" path="/images/" exported="true"/>
   </resources>
   <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Lobby/Main.xml

@@ -3,6 +3,7 @@
   <controller name="share" pages="0,,1," selected="0">
     <action type="play_transition" fromPage="0" toPage="1" transition="t0"/>
   </controller>
+  <controller name="bind" pages="0,,1," selected="1"/>
   <displayList>
     <image id="n158_ik9v" name="n158" src="ik9v7e2z" fileName="images/bg_main2.png" xy="0,0" size="2532,1170">
       <relation target="" sidePair="width-width,height-height"/>
@@ -43,8 +44,8 @@
     <component id="n165_ik9v" name="n165" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1648,979" size="281,181" group="n7">
       <Button icon="ui://2d9xdj6zik9v7e35"/>
     </component>
-    <component id="n166_ik9v" name="n166" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1995,979" size="282,181" group="n7">
+    <component id="n166_ik9v" name="btn_bind" src="cv577inp" fileName="buttons/Btn_CheckBox.xml" pkg="27vd145b" xy="1995,979" size="282,181" group="n7">
-      <Button icon="ui://2d9xdj6zik9v7e37"/>
+      <Button checked="true" icon="ui://27vd145bvbut7irk" selectedIcon="ui://27vd145bvbut7irl" controller="bind" page="1"/>
     </component>
     <group id="n7" name="menu_panel" xy="-10,979" size="2552,191" advanced="true">
       <relation target="" sidePair="center-center,bottom-bottom"/>
@@ -53,7 +54,7 @@
       <relation target="" sidePair="right-right"/>
       <Button title="12"/>
     </component>
-    <group id="n111_ker3" name="menu_top" xy="2332,31" size="123,97" advanced="true">
+    <group id="n111_ker3" name="menu_top" xy="2332,31" size="123,97" visible="false" advanced="true">
       <relation target="" sidePair="top-top"/>
     </group>
     <component id="n167_ik9v" name="btn_joinroom" src="mljn7ijt" fileName="buttons/Btn_Normol.xml" pkg="27vd145b" xy="1158,581" size="587,406" group="n123_g8kk">

wb_new_ui/assets/Lobby/SettingWindow1.xml

@@ -14,18 +14,18 @@
     <component id="n66_omkm" name="btn_sound" src="omkm7cna" fileName="component/setting/Button5.xml" xy="927,381" group="n29"/>
     <text id="n51_eeqm" name="n51" xy="306,399" size="80,49" group="n29" font="Microsoft YaHei" fontSize="36" color="#367256" leading="4" letterSpacing="4" text="音乐"/>
     <text id="n64_omkm" name="n64" xy="818,397" size="80,49" group="n29" font="Microsoft YaHei" fontSize="36" color="#43633d" leading="4" letterSpacing="4" text="音效"/>
-    <text id="n71_g24i" name="n71" xy="231,180" size="144,44" group="n29" font="Microsoft YaHei" fontSize="32" color="#ff0000" leading="4" letterSpacing="4" text="锁定状态"/>
+    <text id="n71_g24i" name="n71" xy="231,180" size="144,44" group="n29" visible="false" font="Microsoft YaHei" fontSize="32" color="#ff0000" leading="4" letterSpacing="4" text="锁定状态"/>
-    <text id="n73_g24i" name="n73" xy="469,183" size="282,32" group="n29" fontSize="22" text="(锁定后只能在当前设备登陆)"/>
+    <text id="n73_g24i" name="n73" xy="469,183" size="283,31" group="n29" visible="false" fontSize="22" text="(锁定后只能在当前设备登陆)"/>
-    <component id="n74_g24i" name="btn_bind111" src="g24i7iju" fileName="component/create_room/Btn_cr_checkbox4.xml" pkg="27vd145b" xy="390,174" size="62,69" group="n29" touchable="false">
+    <component id="n74_g24i" name="btn_bind111" src="g24i7iju" fileName="component/create_room/Btn_cr_checkbox4.xml" pkg="27vd145b" xy="390,174" size="62,69" group="n29" visible="false" touchable="false">
       <Button controller="bind" page="1"/>
     </component>
     <group id="n29" name="n29" xy="225,174" size="983,306" advanced="true"/>
-    <component id="n60_ovii" name="btn_del" src="oviicm4" fileName="component/setting/Component3.xml" xy="31,361" visible="false"/>
+    <component id="n60_ovii" name="btn_del————" src="oviicm4" fileName="component/setting/Component3.xml" xy="31,361" visible="false"/>
     <component id="n67_omkm" name="n67" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="72,608" size="218,82" visible="false">
       <Button title=" " icon="ui://27vd145bomkm7i5f"/>
     </component>
-    <component id="n75_g24i" name="btn_bind" src="g24i7ijv" fileName="buttons/Btn_Check.xml" pkg="27vd145b" xy="523,658" size="400,169">
+    <component id="n75_g24i" name="btn_del" src="g24i7ijv" fileName="buttons/Btn_Check.xml" pkg="27vd145b" xy="523,658" size="400,169">
-      <Button icon="ui://2d9xdj6zg24i7e2x" selectedIcon="ui://2d9xdj6zg24i7e2y" controller="bind" page="1"/>
+      <Button icon="ui://2d9xdj6znld2cjs" selectedIcon="ui://2d9xdj6znld2cjs" controller="bind" page="1"/>
     </component>
     <image id="n76_do1p" name="n76" src="hz877e2d" fileName="images/new/shezhi.png" xy="357,-16"/>
     <image id="n77_do1p" name="n77" pkg="27vd145b" src="do1p7iqa" fileName="buttons/设置.png" xy="-508,-116" alpha="0.5"/>

wb_new_ui/assets/Main_Majiang/Main_style_2/Main_2_s2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImage="ui://v0j9abjygq7m95">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="0"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="1"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="3d" pages="0,,1," selected="0"/>

wb_new_ui/assets/Main_Majiang/Main_style_2/Player_card_info_3.xml

@@ -3,16 +3,16 @@
   <controller name="3d" pages="0,,1," selected="0"/>
   <controller name="ting" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n20" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-221,66" size="1816,300" touchable="false">
+    <component id="n20" name="area_handcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="619,66" size="962,300" touchable="false">
-      <gearXY controller="3d" pages="0,1" values="-221,66|24,-75"/>
+      <gearXY controller="3d" pages="0,1" values="619,66|24,-75"/>
       <relation target="n21" sidePair="rightext-left"/>
     </component>
-    <component id="n21" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1046,-2" size="1,55" touchable="false">
+    <component id="n21" name="area_fz_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="1580,66" size="9,102" touchable="false">
-      <gearXY controller="3d" pages="0,1" values="1046,-2|986,-75"/>
+      <gearXY controller="3d" pages="0,1" values="1580,66|986,-75"/>
     </component>
     <text id="n24" name="area_mask" xy="-654,-344" size="605,840" visible="false" fontSize="30" autoSize="none" text="{&#xA;&quot;fz_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;oder3d&quot;:&quot;right_left&quot;,&#xA;    &quot;adjust3d&quot;:0,&#xA;    &quot;comp&quot;:&quot;Fz_2_&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;&#xA;    },&#xA;&quot;handcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp_back&quot;:&quot;Back_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top(1)&quot;&#xA;},&#xA;&quot;outcard_list&quot;:{&#xA;    &quot;oder&quot;:&quot;right_left&quot;,&#xA;    &quot;comp&quot;:&quot;OutCard_top&quot;,&#xA;    &quot;card&quot;:&quot;202_&quot;,&#xA;    &quot;card3d&quot;:&quot;2022_&quot;,&#xA;    &quot;multi_oder&quot;:&quot;up_down&quot;,&#xA;    &quot;num&quot;:22,&#xA;    &quot;num3d&quot;:8,&#xA;    &quot;multi_oder3d&quot;:&quot;down_up&quot;,&#xA;    &quot;sorting_order3d&quot;:-1&#xA;    }&#xA;}"/>
-    <component id="n22" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-314,299" size="1904,300" touchable="false">
+    <component id="n22" name="area_outcard_list" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="-314,209" size="1904,300" touchable="false">
-      <gearXY controller="3d" pages="0,1" values="-314,299|517,4"/>
+      <gearXY controller="3d" pages="0,1" values="-314,209|517,4"/>
       <gearSize controller="3d" pages="0,1" values="1904,300,1,1|300,117,1,1"/>
     </component>
     <component id="n19" name="mask_liangpai" src="gq7m8i" fileName="Main_style_2/Component1.xml" xy="666,351" size="1,1"/>
@@ -20,7 +20,7 @@
       <gearDisplay controller="ting" pages="1"/>
       <gearXY controller="3d" pages="0,1" values="690,-2|473,-74"/>
     </image>
-    <list id="n30_itp8" name="n30" xy="-314,299" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjyitp8ss">
+    <list id="n30_itp8" name="n30" xy="-314,209" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjyitp8ss">
       <item/>
       <item/>
       <item/>
@@ -48,7 +48,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n31_itp8" name="n31" xy="-171,66" size="1904,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjygq7ma5">
+    <list id="n31_itp8" name="n31" xy="619,66" size="970,300" visible="false" layout="flow_hz" overflow="scroll" defaultItem="ui://v0j9abjygq7ma5">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_style_2/card/Btn_Card.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="188,294" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <controller name="caishen" pages="0,,1," selected="0"/>
   <controller name="quese" pages="0,,1," selected="0"/>
   <controller name="hun" pages="0,,1," selected="0"/>
@@ -12,27 +12,27 @@
     <image id="n6_nip5" name="n6" src="gq7m4" fileName="Main_style_2/fangkuang.png" xy="-168,-107" size="526,519">
       <gearDisplay controller="bg" pages="1"/>
     </image>
-    <loader id="n3_hp0b" name="icon" xy="0,2" size="188,294" url="ui://lxhyy2sd6cpqu1" fill="scaleFree" autoSize="true">
+    <loader id="n3_hp0b" name="icon" xy="-3,-22" size="188,294" url="ui://lxhyy2sd6cpqu1" fill="scaleFree" autoSize="true">
       <gearXY controller="button" pages="0,1" values="0,2|-3,-22" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
     </loader>
-    <image id="n4_i5l6" name="n4" src="gq7m5" fileName="Main_style_2/santan.png" xy="-53,-131" size="294,557">
+    <image id="n4_i5l6" name="n4" src="gq7m5" fileName="Main_style_2/santan.png" xy="122,-36" size="294,557">
       <gearDisplay controller="caishen" pages="1"/>
       <gearXY controller="button" pages="0,1" values="-53,-131|122,-36" tween="true"/>
     </image>
-    <loader id="n5_hxpw" name="flag" xy="40,14" size="47,41" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n5_hxpw" name="flag" xy="40,-13" size="47,41" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
       <gearXY controller="button" pages="1" values="40,-13" default="40,14"/>
     </loader>
     <graph id="n8_e8zl" name="n8" xy="0,0" size="188,294" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
       <gearDisplay controller="color" pages="1"/>
     </graph>
-    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="93,-27" pivot="0.5,0.5" anchor="true">
+    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="93,-77" pivot="0.5,0.5" anchor="true" scale="2,2">
       <gearDisplay controller="mark_ting" pages="1,2"/>
-      <gearXY controller="button" pages="0,1" values="93,-27|43,-50"/>
+      <gearXY controller="button" pages="0,1" values="93,-52|93,-77"/>
       <gearIcon controller="mark_ting" pages="1,2" values="ui://v0j9abjygq7m1|ui://v0j9abjygq7m0" default=""/>
     </component>
-    <image id="n10_xiha" name="n10" src="gq7m6" fileName="Main_style_2/laizi.png" xy="3,4">
+    <image id="n10_xiha" name="n10" src="gq7m6" fileName="Main_style_2/laizi.png" xy="3,-22">
       <gearDisplay controller="laizi" pages="1"/>
       <gearXY controller="button" pages="1" values="3,-22" default="3,4" tween="true"/>
     </image>

wb_new_ui/assets/Main_Majiang/component/card/Back_top.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="129,201">
+<component size="68,106">
   <displayList>
-    <loader id="n2_itp8" name="n2" xy="-6,0" size="141,206" url="ui://v0j9abjygq7ma6" fill="scaleFree"/>
+    <loader id="n2_itp8" name="n2" xy="-3,0" size="74,109" url="ui://v0j9abjygq7ma6" fill="scaleFree"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/Btn_Card.xml

@@ -20,16 +20,16 @@
       <gearDisplay controller="caishen" pages="1"/>
       <gearXY controller="button" pages="0,1" values="-53,-131|122,-36" tween="true"/>
     </image>
-    <loader id="n5_hxpw" name="flag" xy="59,-16" pivot="0.5,0.5" size="47,41" scale="1.5,1.5" url="ui://d493x2q7hxpw10" fill="scale">
+    <loader id="n5_hxpw" name="flag" xy="59,-23" pivot="0.5,0.5" size="47,41" scale="2.5,2.5" url="ui://d493x2q7hxpw10" fill="scale">
       <gearDisplay controller="hun" pages="1"/>
-      <gearXY controller="button" pages="0,1" values="59,-16|40,-13"/>
+      <gearXY controller="button" pages="0,1" values="59,-23|59,-73"/>
     </loader>
     <graph id="n8_e8zl" name="n8" xy="0,0" size="165,256" alpha="0.3" touchable="false" type="rect" lineColor="#fffcfc12" fillColor="#fffcfc12">
       <gearDisplay controller="color" pages="1"/>
     </graph>
-    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="82,-27" pivot="0.5,0.5" anchor="true">
+    <component id="n9_piv9" name="n9" src="gq7m2" fileName="Main_style_2/card/card_mark/btn_mark.xml" xy="82,-51" pivot="0.5,0.5" anchor="true" scale="1.8,1.8">
       <gearDisplay controller="mark_ting" pages="1,2"/>
-      <gearXY controller="button" pages="0,1" values="82,-27|43,-50"/>
+      <gearXY controller="button" pages="0,1" values="82,-51|82,-92"/>
       <gearIcon controller="mark_ting" pages="1,2" values="ui://v0j9abjygq7m1|ui://v0j9abjygq7m0" default=""/>
     </component>
     <image id="n10_xiha" name="n10" src="gq7m6" fileName="Main_style_2/laizi.png" xy="3,4">

wb_new_ui/assets/Main_Majiang/component/card/Fz_0_4.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="512,258">
   <displayList>
-    <loader id="n0" name="card_1" xy="0,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n0" name="card_1" xy="0,0" size="187,260" url="ui://lxhyy2sdqfgwls" fill="scaleFree"/>
-    <loader id="n1" name="card_2" xy="158,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n1" name="card_2" xy="158,0" size="187,260" url="ui://lxhyy2sdqfgwls" fill="scaleFree"/>
-    <loader id="n2" name="card_3" xy="325,0" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n2" name="card_3" xy="325,0" size="187,260" url="ui://lxhyy2sdqfgwls" fill="scaleFree"/>
-    <loader id="n3" name="card_4" xy="158,-55" size="187,260" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n3" name="card_4" xy="158,-55" size="187,260" url="ui://lxhyy2sdqfgwls" fill="scaleFree"/>
     <image id="n5_snta" name="santan" src="gq7m9x" fileName="images/santan.png" xy="-66,-56" size="393,239" aspect="true" visible="false"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/Fz_2_3.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="112,53">
+<component size="198,101">
   <displayList>
-    <loader id="n0" name="card_1" xy="6,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n0" name="card_1" xy="-4,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <loader id="n1" name="card_2" xy="41,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n1" name="card_2" xy="61,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <loader id="n2" name="card_3" xy="76,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n2" name="card_3" xy="126,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <image id="n4_snta" name="santan" src="gq7m9x" xy="-22,-23" size="160,98" aspect="true" visible="false"/>
+    <image id="n4_snta" name="santan" src="gq7m9x" fileName="images/santan.png" xy="-22,-23" size="160,98" aspect="true" visible="false"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/card/Fz_2_4.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="112,53">
+<component size="198,101">
   <displayList>
-    <loader id="n0" name="card_1" xy="6,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n6_zmrw" name="card_1" xy="-4,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <loader id="n1" name="card_2" xy="41,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n7_zmrw" name="card_2" xy="61,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <loader id="n2" name="card_3" xy="76,-1" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n8_zmrw" name="card_3" xy="126,-1" size="72,102" url="ui://v0j9abjygq7mk3" fill="scaleFree" clearOnPublish="true"/>
-    <loader id="n3_ppzk" name="card_4" xy="41,-12" size="91,137" scale="0.4,0.4" url="ui://lxhyy2sdqfgwls" autoSize="true"/>
+    <loader id="n3_ppzk" name="card_4" xy="61,-22" size="72,102" url="ui://lxhyy2sdqfgwls" fill="scaleFree"/>
-    <image id="n5_snta" name="santan" src="gq7m9x" xy="-20,-22" size="157,96" aspect="true" visible="false"/>
+    <image id="n5_snta" name="santan" src="gq7m9x" fileName="images/santan.png" xy="-20,-22" size="157,96" aspect="true" visible="false"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/clearing/clearing.xml

@@ -1,17 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
   <controller name="over" pages="0,,1," selected="0"/>
-  <controller name="button" pages="0,,1," selected="1"/>
+  <controller name="button" pages="0,,1," selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
-  <controller name="type" pages="0,,1,,2,,3,,4," selected="0"/>
+  <controller name="type" pages="0,,1,,2,,3,,4," selected="4"/>
   <controller name="mapai" pages="0,,1," selected="0"/>
   <controller name="matype" pages="0,,1," selected="0"/>
   <controller name="matypeshow" pages="0,,1," selected="0"/>
   <controller name="matypebgshow" pages="0,,1," selected="0"/>
   <controller name="paixing" pages="0,,1," selected="0"/>
-  <controller name="xipai" pages="0,,1," selected="1"/>
+  <controller name="xipai" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n110_itp8" name="n110" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="177,24" size="2178,1120"/>
+    <component id="n110_itp8" name="bgWindow" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="177,24" size="2178,1120">
+      <gearText controller="type" pages="0,1,2,3" values="解散房间|胜利|失败|流局" default=""/>
+    </component>
     <list id="n3_fux2" name="player_list_1" xy="262,177" size="1985,517" group="n29_10imx" lineGap="27" defaultItem="ui://v0j9abjygq7mcu" autoItemSize="false" align="center" vAlign="middle">
       <gearDisplay controller="over" pages="0"/>
       <item/>

wb_new_ui/assets/Main_Majiang/component/clearing/clearing1/clearing_1_item.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1985,265" designImageLayer="1">
-  <controller name="win" pages="0,,1,,2," selected="1"/>
+  <controller name="win" pages="0,,1,,2," selected="0"/>
   <controller name="hu_list" pages="0,,1," selected="0"/>
   <controller name="bank" pages="0,,1," selected="0"/>
   <controller name="niao" pages="0,,1," selected="0"/>
@@ -18,7 +18,7 @@
     <image id="n48_m16m" name="n48" src="yffnrt" fileName="images/bg_poker_self.png" pkg="27vd145b" xy="0,0" size="1985,265">
       <gearDisplay controller="win" pages="0"/>
     </image>
-    <image id="n50_m16m" name="n50" src="m16msh" fileName="component/clearing/clearing1/Rectangle 406.png" xy="0,0" size="1985,265">
+    <image id="n50_m16m" name="n50" src="yffnrs" fileName="images/bg_poker_other.png" pkg="27vd145b" xy="0,0" size="1985,265">
       <gearDisplay controller="win" pages="2"/>
     </image>
     <image id="n49_m16m" name="n49" src="yffnrs" fileName="images/bg_poker_other.png" pkg="27vd145b" xy="0,0" size="1985,265">
@@ -44,17 +44,14 @@
     <image id="n13_yyhx" name="fangpao" src="gq7mcw" fileName="component/clearing/clearing1/放炮.png" xy="1569,176">
       <gearDisplay controller="win" pages="2"/>
     </image>
-    <text id="n38_piv9" name="lab_hp" xy="847,1" size="109,48" visible="false" fontSize="28" color="#624720" align="center" vAlign="middle" ubb="true" autoSize="shrink" text="积分:">
-      <gearDisplay controller="nonnegative" pages="1"/>
-    </text>
     <text id="n39_piv9" name="tex_hp" xy="935,1" size="129,48" visible="false" fontSize="28" color="#624720" vAlign="middle" ubb="true" autoSize="shrink" autoClearText="true" text="20000">
       <gearDisplay controller="nonnegative" pages="1"/>
     </text>
     <text id="n41_piv9" name="score2win" xy="1666,170" size="292,64" font="ui://27vd145btki67irh" fontSize="60" color="#ffffff" align="center" vAlign="middle" ubb="true" autoSize="shrink" autoClearText="true" text="+10000">
       <gearDisplay controller="win" pages="0"/>
     </text>
-    <text id="n52_tki6" name="score2lose" xy="1666,170" size="292,64" font="ui://27vd145btki67iri" fontSize="42" color="#ff6a00" align="center" vAlign="middle" ubb="true" autoSize="shrink" autoClearText="true" text="+10000">
+    <text id="n52_tki6" name="score2lose" xy="1666,170" size="292,79" font="ui://27vd145btki67iri" fontSize="60" color="#ff6a00" align="center" vAlign="middle" ubb="true" autoSize="shrink" autoClearText="true" text="+10000">
-      <gearDisplay controller="win" pages="1"/>
+      <gearDisplay controller="win" pages="1,2"/>
     </text>
     <text id="n6_fux2" name="score1" xy="276,72" size="629,54" font="Microsoft YaHei" fontSize="40" color="#43633d" vAlign="middle" autoClearText="true" text="自摸、清一色*4+24分 明杠*1+1分"/>
     <text id="n15_iqv0" name="score3" xy="93,44" size="698,85" fontSize="20" color="#ffcc99" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="清一色  将将胡  全球人  碰碰胡  抢杠胡">

wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/big_result_item.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="482,724">
   <controller name="owner" pages="0,,1," selected="0"/>
-  <controller name="big_win" pages="0,,1," selected="0"/>
+  <controller name="big_win" pages="0,,1," selected="1"/>
   <controller name="pn" pages="0,,1," selected="0"/>
   <controller name="entrust" pages="0,,1," selected="0"/>
   <controller name="have_flag" pages="0,,1," selected="0"/>
@@ -25,7 +25,7 @@
     </image>
     <text id="n3_tjnv" name="txt_name" xy="220,54" size="261,62" font="Microsoft YaHei" fontSize="46" color="#43633d" vAlign="middle" autoSize="shrink" autoClearText="true" text="对对对"/>
     <text id="n4_tjnv" name="txt_reserve_hp" xy="222,115" size="191,49" font="Microsoft YaHei" fontSize="36" color="#43633d" vAlign="middle" autoSize="none" autoClearText="true" text=""/>
-    <image id="n5_tjnv" name="n5" src="gq7mdu" fileName="component/clearing/clearing2/dyj.png" xy="92,-54">
+    <image id="n5_tjnv" name="n5" src="yffn7iqj" fileName="images/icon_game_bigWin.png" pkg="27vd145b" xy="41,-195">
       <gearDisplay controller="big_win" pages="1"/>
     </image>
     <graph id="n26_tki6" name="n26" xy="38,40" size="136,136" type="rect" lineColor="#ffffffff" fillColor="#4cffffff" corner="10"/>
@@ -40,7 +40,7 @@
       <item/>
     </list>
     <text id="n10_tjnv" name="n10" xy="62,613" size="130,57" font="Microsoft YaHei" fontSize="42" color="#43633d" align="center" vAlign="middle" text="总成绩"/>
-    <text id="n11_tjnv" name="txt_positive" xy="134,415" size="213,64" fontSize="40" color="#d94146" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+56">
+    <text id="n11_tjnv" name="txt_positive" xy="193,609" size="213,64" font="Microsoft YaHei" fontSize="42" color="#d94146" align="center" vAlign="middle" autoSize="none" autoClearText="true" text="+56">
       <gearDisplay controller="pn" pages="1"/>
     </text>
     <text id="n12_tjnv" name="txt_navigate" xy="193,609" size="213,64" font="Microsoft YaHei" fontSize="42" color="#ff1212" align="center" vAlign="middle" autoSize="none" text="-4555">

wb_new_ui/assets/Main_Majiang/component/clearing/clearing2/descript_item.xml

@@ -2,6 +2,6 @@
 <component size="328,50">
   <displayList>
     <text id="n1_tjnv" name="txt_value" xy="328,24" pivot="1,0.5" anchor="true" size="176,49" font="Microsoft YaHei" fontSize="36" color="#80622c" align="right" vAlign="middle" autoSize="shrink" text="100"/>
-    <text id="n0_tjnv" name="txt_key" xy="0,24" pivot="0,0.5" anchor="true" size="140,47" font="Microsoft YaHei" fontSize="34" color="#80622c" vAlign="middle" text="点炮次数"/>
+    <text id="n0_tjnv" name="txt_key" xy="0,24" pivot="0,0.5" anchor="true" size="140,47" font="Microsoft YaHei" fontSize="34" color="#80622c" vAlign="middle" autoSize="shrink" text="点炮次数"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/component/option/Btn_fztip.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="136,134" extention="Button">
+<component size="258,254" extention="Button">
   <displayList>
-    <loader id="n2" name="icon" xy="15,11" size="105,111" url="ui://v0j9abjygq7met" align="center" vAlign="middle" autoSize="true"/>
+    <loader id="n2" name="icon" xy="15,11" size="227,231" url="ui://v0j9abjygq7met" align="center" vAlign="middle" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/component/option/Btn_hu.xml

@@ -1,9 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="133,134" extention="Button">
+<component size="253,254" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
-  <controller name="hupai" pages="0,,1," selected="1"/>
+  <controller name="hupai" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n2" name="icon" xy="0,0" size="133,134" url="ui://v0j9abjygq7mez" align="center" vAlign="middle"/>
+    <loader id="n2" name="icon" xy="0,0" size="246,251" url="ui://v0j9abjygq7mez" align="center" vAlign="middle" fill="scaleFree">
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
     <component id="n4_rjio" name="hupai" src="gq7mbp" fileName="component/card/Gcm_OutCard_COM.xml" xy="23,-148">
       <gearDisplay controller="hupai" pages="1"/>
       <Button icon="ui://v0j9abjygq7mf0"/>

wb_new_ui/assets/Main_Majiang/component/option/Btn_pass.xml

@@ -1,7 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="131,137" extention="Button">
+<component size="249,260" extention="Button">
   <displayList>
-    <image id="n0" name="n0" src="gq7mev" fileName="images/fztip/Button_GuoAction.png" xy="12,15"/>
+    <image id="n0" name="n0" src="gq7mev" fileName="images/fztip/Button_GuoAction.png" xy="12,15" size="224,230">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
   </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>

wb_new_ui/assets/Main_Majiang/component/option/Gcm_action_tips.xml

@@ -1,17 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750" opaque="false" adaptationTest="FitSize">
+<component size="2532,1170" opaque="false">
   <controller name="hide_bg" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n2_e7qn" name="n2" src="gq7mex" fileName="images/game_bg_01.png" xy="-208,395" size="1751,214">
+    <image id="n2_e7qn" name="n2" src="gq7mex" fileName="images/game_bg_01.png" xy="-208,0" size="2949,1170">
       <gearDisplay controller="hide_bg" pages="0"/>
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <list id="n1" name="lit_fanzi" xy="338,400" size="857,203" layout="row" selectionMode="none" colGap="30" defaultItem="ui://v0j9abjygq7mes" autoItemSize="false" align="right" vAlign="middle">
+    <list id="n1" name="lit_fanzi" xy="1399,585" size="857,203" scale="0.9,0.9" layout="row" selectionMode="none" colGap="30" defaultItem="ui://v0j9abjygq7mes" autoItemSize="false" align="right" vAlign="middle">
       <relation target="" sidePair="right-right,bottom-bottom"/>
       <item url="ui://v0j9abjygq7meu"/>
       <item/>
       <item/>
     </list>
   </displayList>
-  <relation target="" sidePair="width-width,height-height"/>
 </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -4,7 +4,7 @@
     <image id="gq7m0" name="tingArrowMax.png" path="/Main_style_2/card/card_mark/images/"/>
     <image id="gq7m1" name="tingArrow.png" path="/Main_style_2/card/card_mark/images/"/>
     <component id="gq7m2" name="btn_mark.xml" path="/Main_style_2/card/card_mark/"/>
-    <component id="gq7m3" name="Btn_Card.xml" path="/Main_style_2/card/" exported="true"/>
+    <component id="gq7m3" name="Btn_Card.xml" path="/Main_style_2/card/"/>
     <image id="gq7m4" name="fangkuang.png" path="/Main_style_2/" exported="true"/>
     <image id="gq7m5" name="santan.png" path="/Main_style_2/" exported="true"/>
     <image id="gq7m6" name="laizi.png" path="/Main_style_2/" exported="true"/>

wb_new_ui/assets/NewGroup/Win_ManagerView.xml

@@ -5,7 +5,7 @@
   <controller name="single" pages="0,,1," selected="0"/>
   <controller name="tongji" homePageType="specific" homePage="1" pages="0,,1," selected="0"/>
   <displayList>
-    <component id="n95_hz87" name="n95" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="2178,1120" group="n96_hz87">
+    <component id="n95_hz87" name="bgWindow" src="st2l7ijp" fileName="component/Win_BaseWindow.xml" pkg="27vd145b" xy="0,0" size="2178,1120" group="n96_hz87">
       <Button title="战况"/>
     </component>
     <image id="n98_hz87" name="n98" src="cv577iqe" fileName="images/bg_manager_menber.png" xy="362,103" group="n96_hz87"/>

wb_new_ui/assets/NewGroup/Win_ManagerView_old.xml

@@ -29,5 +29,6 @@
     <text id="n79_ovii" name="n79" xy="561,70" size="178,42" visible="false" font="Microsoft YaHei" fontSize="30" color="#fffff6" vAlign="middle" autoSize="none" text="统计">
       <relation target="" sidePair="center-center,top-top"/>
     </text>
+    <component id="n92_zmrw" name="n92" src="zmrw7is8" fileName="mgr/View_GroupPersonStat2.xml" xy="365,105" size="1791,997"/>
   </displayList>
 </component>

wb_new_ui/assets/NewGroup/mgr/View_GroupPersonStat2.xml

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="1791,997">
+  <controller name="record" pages="0,,1," selected="0"/>
+  <controller name="type" pages="0,,1,,2," selected="0"/>
+  <displayList>
+    <image id="n144_t8gf" name="n144" src="cv577io9" fileName="images/bg_labDown.png" pkg="27vd145b" xy="1,872" size="1791,125">
+      <gearDisplay controller="record" pages="0"/>
+      <relation target="" sidePair="width-width%,bottom-bottom%"/>
+    </image>
+    <list id="n115_l679" name="lst_mgr_index" xy="-17,-86" size="650,78" group="n83_kwi0" visible="false" layout="row" overflow="hidden" colGap="1" defaultItem="ui://27vd145beeqmch0" selectionController="type">
+      <item url="ui://m7iejg46eany7ie1" title="今天"/>
+      <item url="ui://m7iejg46eany7ie2" title="昨天"/>
+      <item url="ui://m7iejg46eany7ie3" title="前天"/>
+    </list>
+    <component id="n117_l679" name="btn_date1" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="16,883" group="n104_kwi0"/>
+    <text id="n123_omkm" name="n123" xy="904,943" size="24,29" group="n104_kwi0" visible="false" font="Microsoft YaHei" fontSize="20" color="#367256" align="center" vAlign="middle" text="至"/>
+    <component id="n119_l679" name="btn_date2" src="n5sxha2" fileName="component/Btn/date_set/btn_date.xml" xy="587,883" group="n104_kwi0"/>
+    <component id="n86_kwi0" name="btn_search" src="dzx8hbb" fileName="component/Btn/btn_req.xml" xy="1227,919" size="129,67" group="n104_kwi0" visible="false"/>
+    <image id="n146_hz87" name="n146" src="cv577inn" fileName="images/icon_timeLeft.png" pkg="27vd145b" xy="519,908" group="n104_kwi0"/>
+    <group id="n104_kwi0" name="panel_search" xy="16,883" size="1340,103" group="n83_kwi0" advanced="true">
+      <relation target="" sidePair="center-center%,bottom-bottom%"/>
+    </group>
+    <group id="n83_kwi0" name="index2" xy="-17,-86" size="1373,1072" advanced="true">
+      <gearDisplay controller="record" pages="0"/>
+    </group>
+    <list id="n82_kwi0" name="lst_record" xy="24,12" size="1738,842" group="n121_l679" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmc" autoClearItems="true">
+      <gearDisplay controller="record" pages="0"/>
+      <relation target="" sidePair="width-width"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n121_l679" name="record0" xy="24,12" size="1738,842"/>
+    <component id="n111_kwi0" name="btn_back" src="ik9v7imt" fileName="buttons/Btn_Close2.xml" pkg="27vd145b" xy="1405,-231" group="n112_kwi0">
+      <relation target="" sidePair="center-center%"/>
+      <Button controller="record" page="0"/>
+    </component>
+    <list id="n109_kwi0" name="lst_recordInfo" xy="26,6" size="1746,833" group="n112_kwi0" overflow="scroll" lineGap="5" defaultItem="ui://m7iejg46kwi0hmd" autoClearItems="true">
+      <relation target="" sidePair="width-width"/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+      <item/>
+    </list>
+    <group id="n112_kwi0" name="record1" xy="26,-231" size="1746,1070" advanced="true">
+      <gearDisplay controller="record" pages="1"/>
+    </group>
+    <image id="n122_j120" name="n122" pkg="m7iejg46" src="j1207i2s" fileName="个人战绩统计_PxCook.png" xy="-545,-210" visible="false" alpha="0.5"/>
+    <text id="n133_k5m9" name="n133" xy="1160,915" size="148,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" vAlign="middle" text="总场次：">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <text id="n134_k5m9" name="tex_winner_count" xy="1315,917" size="107,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" autoSize="shrink" autoClearText="true" text="0">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <text id="n137_k5m9" name="n137" xy="1219,-74" size="148,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" vAlign="middle" text="总输赢：">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <text id="n138_k5m9" name="tex_total_proportion" xy="1385,-72" size="148,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" autoSize="shrink" autoClearText="true" text="0">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <text id="n139_k5m9" name="n139" xy="1474,916" size="148,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" vAlign="middle" text="有效场：">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <text id="n140_k5m9" name="tex_valid_count" xy="1623,918" size="88,49" group="n141_k5m9" font="ui://27vd145bik9v7imf" fontSize="36" color="#43633d" autoSize="shrink" autoClearText="true" text="0">
+      <relation target="" sidePair="center-center%"/>
+    </text>
+    <group id="n141_k5m9" name="n141" xy="1160,-74" size="550,1041" advanced="true"/>
+  </displayList>
+</component>

wb_new_ui/assets/NewGroup/package.xml

@@ -1342,6 +1342,7 @@
     <image id="dhos7is5" name="item_partner_banplays_bg.png" path="/mgr/component/reward/"/>
     <image id="dhos7is6" name="item_partner_banplays_btnstart.png" path="/mgr/component/reward/"/>
     <image id="fmlr7is7" name="win_fagInput_input.png" path="/"/>
+    <component id="zmrw7is8" name="View_GroupPersonStat2.xml" path="/mgr/" exported="true"/>
   </resources>
   <publish name="NewGroup" path="..\wb_unity_pro\Assets\ART\base\newgroup\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/common/ui.meta

@@ -1,9 +1,8 @@
 fileFormatVersion: 2
 guid: c00e730e00e11fb4aa82c44f8a7ca2db
 folderAsset: yes
-timeCreated: 1647668087
-licenseType: Pro
 DefaultImporter:
+  externalObjects: {}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_11.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_12.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_13.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_14.png.meta

@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_15.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_16.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_17.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_18.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_19.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_2.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_3.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_4.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_5.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_6.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_7.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_8.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_9.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,66 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 1
-    textureFormat: 13
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 1
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Windows Store Apps
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: WebGL
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -148,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas1.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 11
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 0
+    enableMipMap: 1
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0
@@ -57,7 +57,7 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 1
+  applyGammaDecoding: 0
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
@@ -71,42 +71,6 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
-  - serializedVersion: 3
-    buildTarget: Standalone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
-  - serializedVersion: 3
-    buildTarget: iPhone
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
-  - serializedVersion: 3
-    buildTarget: Android
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-    forceMaximumCompressionQuality_BC6H_BC7: 1
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -124,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas7.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_cv577io9.png.meta

@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_e0dy8j.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_e0dy8k.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_e0dy8l.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_e0dy8m.mp3.meta

@@ -18,5 +18,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_fui.bytes.meta

@@ -3,5 +3,5 @@ guid: eb18ba26c546b664d8bcf40dfb22334c
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijo.woff.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b3fd47f6b807a5f4d99a067b8298e573
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijp.woff2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: e2a43db26d7b42441972df6d9bdd7bd1
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijq.txt

@@ -1,4 +0,0 @@
-请按照下面流程安装文件夹里的字体包。
-
-1. 打开字体文件夹，根据不同系统需要选择OTF或TTF版本
-2. 字体所包含只有一个字重（双击安装）。

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijq.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f494e792e67a66b4db65512383e25642
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijr.txt

@@ -1,11 +0,0 @@
-1. 阿里妈妈东方大楷体字体及包含该字体的字库软件，合称“阿里妈妈东方大楷体”。
-
-2. 阿里妈妈东方大楷体的知识产权和相关权益归属于淘宝（中国）软件有限公司（以下简称“阿里妈妈”），受《中华人民共和国著作权法》及其他适用法律法规、国际公约、条约的保护。
-
-3. 阿里妈妈授权个人、企业等用户在遵守本声明相关条款的前提下，可以下载、安装和使用上述阿里妈妈字体，该授权是免费的普通许可，用户可基于合法目的用于商业用途或非商业用途，但不得以任何违反本声明第4条及法律法规、政策、规章或公序良俗的方式使用。
-
-4. 除本法律声明中明确授权之外，阿里妈妈未授予用户关于阿里妈妈东方大楷体的其他权利。未经阿里妈妈授权，任何人不得：1）对阿里妈妈东方大楷体进行仿制、转换、翻译、反编译、反向工程、拆分、破解或以其他方式试图从该字库软件获取源代码；2）删除、覆盖或修改阿里妈妈东方大楷体法律声明的全部或部分内容；3）将阿里妈妈东方大楷体进行单独定价出售、出租、出借、转让、转授权、或采取其他未经阿里妈妈授权的行为；4) 发布任何使外界误认其与阿里妈妈或其关联公司存在合作、赞助或背书等商业关联的不实信息。
-
-5. 阿里妈妈授予用户的上述授权不附带任何明示或暗示的保证，不对任何人因从非阿里妈妈官方渠道或指定渠道下载、安装或使用阿里妈妈东方大楷体而引发的任何直接或间接损失承担责任。
-
-6. 本声明的解释、履行与争议解决适用中华人民共和国的法律。用户与阿里妈妈就阿里妈妈东方大楷体的使用若发生争议，双方应友好协商，若协商不成，任一方有权向浙江省杭州市有管辖权的人民法院提起诉讼。

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijr.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 8d495fdc99160ab4181d9f6fe501cad0
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijv.woff.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: de2b01ac80600f6499db43b2ff17f696
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijw.txt

@@ -1,19 +0,0 @@
-A. 在哪里可以下载阿里妈妈数黑体？
-渠道一：https://www.iconfont.cn/fonts/detail?cnid=a9fXc2HD9n7s
-渠道二：fonts.alibabagroup.com
-
-
-B. 阿里阿里妈妈数黑体简介
-基本信息：阿里妈妈数黑体为中文简体字库，收纳的中文字符包括但不限于GB2312，共计6767个汉字；英文大小写共52个；常用标点符号共206个，总计7025个字符。 
-
-设计说明：阿里妈妈数黑体字型饱满、体态中正，布白极具现代韵律，落笔厚实而简练；字里行间流露出先锋、前卫和时尚的视觉感受。适用于电商、广告、品牌形象、推广物料等场景。
-
-C. 使用反馈、商业合作等问题，请email：
-alimama-font@list.alibaba-inc.com
-——
-重要！安装前请先阅读此文档
-请先按照下面流程安装文件夹里的字体包。
-
-1. 打开字体文件夹，根据不同系统需要选择OTF或TTF版本
-
-2. 字体所包含只有一个字重（双击安装）。

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijw.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: f1752370255dc154f932fce085b1685a
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijx.txt

@@ -1,15 +0,0 @@
-阿里妈妈数黑体法律声明
-
-1. 阿里妈妈数黑体字体及包含该字体的字库软件，合称“阿里妈妈数黑体”。
-
-2. 阿里妈妈数黑体的知识产权和相关权益归属于淘宝（中国）软件有限公司（以下简称“阿里妈妈”），受《中华人民共和国著作权法》及其他适用法律法规、国际公约、条约的保护。
-
-3. 阿里妈妈授权个人、企业等用户在遵守本声明相关条款的前提下，可以下载、安装和使用上述阿里妈妈字体，该授权是免费的普通许可，用户可基于合法目的用于商业用途或非商业用途，但不得以任何违反本声明第4条及法律法规、政策、规章或公序良俗的方式使用。
-
-4. 除本法律声明中明确授权之外，阿里妈妈未授予用户关于阿里妈妈数黑体的其他权利。未经阿里妈妈授权，任何人不得：1）对阿里妈妈数黑体进行仿制、转换、翻译、反编译、反向工程、拆分、破解或以其他方式试图从该字库软件获取源代码；2）删除、覆盖或修改阿里妈妈数黑体法律声明的全部或部分内容；3）将阿里妈妈数黑体进行单独定价出售、出租、出借、转让、转授权、或采取其他未经阿里妈妈授权的行为；4) 发布任何使外界误认其与阿里妈妈或其关联公司存在合作、赞助或背书等商业关联的不实信息。
-
-5. 阿里妈妈授予用户的上述授权不附带任何明示或暗示的保证，不对任何人因从非阿里妈妈官方渠道或指定渠道下载、安装或使用阿里妈妈数黑体而引发的任何直接或间接损失承担责任。
-
-6. 本声明的解释、履行与争议解决适用中华人民共和国的法律。用户与阿里妈妈就阿里妈妈数黑体的使用若发生争议，双方应友好协商，若协商不成，任一方有权向浙江省杭州市有管辖权的人民法院提起诉讼。
-
-反馈与咨询联系方：alimama-font@list.alibaba-inc.com

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijx.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 71aeeafc3b3e2004eb3d692111065754
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijy.woff.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4feb3f8abbd884c458b4296210929c27
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ijz.woff2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: a1efe52fc0bb45145b912b159908141b
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/common/ui/Common_h35o7ik1.woff.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 4e71527ddcc48b241afccfdc71911112
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
-  assetBundleVariant: