修补遗漏

2026-03-12 00:53:37 +08:00 · 2026-03-12 00:53:37 +08:00 · 88c76d2dab
parent 05a08b8668
commit 88c76d2dab
42 changed files with 544 additions and 142 deletions
--- a/lua_probject/base_project/Game/View/ResultView.lua
+++ b/lua_probject/base_project/Game/View/ResultView.lua
@ -249,6 +249,8 @@ function M:SetGSListlineGap(linespacing)
 end

 function M:InitBigResult(room, fontsize)
+    print("为什么会来这里000000000000000")
+    print(InnerFunction())
    local big_result = self._view:GetChild('big_result')
    if big_result ~= nil then
        local player_list = big_result:GetChild('player_list')
--- a/lua_probject/base_project/Main.lua
+++ b/lua_probject/base_project/Main.lua
@ -379,4 +379,359 @@ function printlog(...)
    if debug_print then
        print(...)
    end
-end
+end
+
+function PrintStackTrace(ignoreCount, options)
+    -- 默认参数
+    ignoreCount = ignoreCount or 3
+    options = options or {}
+
+    -- 合并配置选项
+    local config = {
+        maxDepth = options.maxDepth or 20,
+        indentSize = options.indentSize or 2,
+        showVariables = options.showVariables ~= false, -- 默认true
+        maxVariableLength = options.maxVariableLength or 50,
+        showLineNumbers = options.showLineNumbers ~= false,
+        showFunctionType = options.showFunctionType ~= false,
+        showFullPath = options.showFullPath or false,
+        colorOutput = options.colorOutput or false,
+        skipDebuggerFrames = options.skipDebuggerFrames ~= false,
+        debuggerFiles = options.debuggerFiles or {
+            "debugger.lua",
+            "LuaDebugger.lua",
+            "=[C]"
+        },
+        includeTimestamp = options.includeTimestamp or false,
+        maxStackDepth = options.maxStackDepth or 100
+    }
+
+    -- ANSI颜色代码（用于彩色输出）
+    local colors = {
+        reset = "\27[0m",
+        red = "\27[31m",
+        green = "\27[32m",
+        yellow = "\27[33m",
+        blue = "\27[34m",
+        magenta = "\27[35m",
+        cyan = "\27[36m",
+        white = "\27[37m",
+        gray = "\27[90m"
+    }
+
+    -- 如果不支持彩色输出，使用空字符串
+    if not config.colorOutput then
+        for k, _ in pairs(colors) do
+            colors[k] = ""
+        end
+    end
+
+    -- 辅助函数：判断是否为调试器自身的帧
+    local function isDebuggerFrame(frameInfo)
+        if not config.skipDebuggerFrames then
+            return false
+        end
+
+        for _, pattern in ipairs(config.debuggerFiles) do
+            if frameInfo.src and frameInfo.src:find(pattern, 1, true) then
+                return true
+            end
+            if frameInfo.source and frameInfo.source:find(pattern, 1, true) then
+                return true
+            end
+        end
+        return false
+    end
+
+    -- 辅助函数：格式化变量值（限制长度）
+    local function formatValue(value, maxLength)
+        if value == nil then
+            return colors.gray .. "nil" .. colors.reset
+        end
+
+        local valueType = type(value)
+        local str
+
+        if valueType == "string" then
+            str = colors.green .. string.format("%q", value) .. colors.reset
+        elseif valueType == "number" then
+            str = colors.yellow .. tostring(value) .. colors.reset
+        elseif valueType == "boolean" then
+            str = colors.cyan .. tostring(value) .. colors.reset
+        elseif valueType == "table" then
+            local mt = getmetatable(value)
+            if mt and mt.__tostring then
+                str = tostring(value)
+            else
+                str = colors.magenta .. string.format("table: %p", value) .. colors.reset
+            end
+        elseif valueType == "function" then
+            str = colors.blue .. string.format("function: %p", value) .. colors.reset
+        elseif valueType == "userdata" or valueType == "thread" then
+            str = colors.white .. string.format("%s: %p", valueType, value) .. colors.reset
+        else
+            str = colors.gray .. tostring(value) .. colors.reset
+        end
+
+        -- 限制长度
+        if #str > maxLength * 2 then -- 乘以2因为ANSI代码也占长度
+            str = str:sub(1, maxLength * 2) .. "..."
+        end
+
+        return str
+    end
+
+    -- 辅助函数：格式化变量信息
+    local function formatVariables(vars, indent)
+        if not vars or not config.showVariables then
+            return ""
+        end
+
+        local lines = {}
+        local prefix = string.rep(" ", indent)
+
+        -- 处理局部变量
+        if vars.locals then
+            local hasLocals = false
+            local localNames = {}
+            for name, _ in pairs(vars.locals) do
+                table.insert(localNames, name)
+            end
+            table.sort(localNames) -- 按字母顺序排序
+
+            for _, name in ipairs(localNames) do
+                local info = vars.locals[name]
+                if not hasLocals then
+                    table.insert(lines, prefix .. colors.cyan .. "Local Variables:" .. colors.reset)
+                    hasLocals = true
+                end
+                local valueStr = formatValue(info.value, config.maxVariableLength)
+                table.insert(lines, string.format("%s  %s%s%s = %s",
+                    prefix, colors.yellow, name, colors.reset, valueStr))
+            end
+        end
+
+        -- 处理上值（upvalues）
+        if vars.upvalues then
+            local hasUpvalues = false
+            local upvalueNames = {}
+            for name, _ in pairs(vars.upvalues) do
+                table.insert(upvalueNames, name)
+            end
+            table.sort(upvalueNames)
+
+            for _, name in ipairs(upvalueNames) do
+                local info = vars.upvalues[name]
+                if not hasUpvalues then
+                    table.insert(lines, prefix .. colors.cyan .. "Upvalues:" .. colors.reset)
+                    hasUpvalues = true
+                end
+                local valueStr = formatValue(info.value, config.maxVariableLength)
+                table.insert(lines, string.format("%s  %s%s%s = %s",
+                    prefix, colors.yellow, name, colors.reset, valueStr))
+            end
+        end
+
+        if #lines > 0 then
+            return table.concat(lines, "\n") .. "\n"
+        end
+        return ""
+    end
+
+    -- 获取堆栈信息
+    local stackInfo = {}
+    local outputLines = {}
+
+    -- 添加标题
+    if config.includeTimestamp then
+        table.insert(outputLines, colors.white .. "=== Stack Trace @" .. os.date("%H:%M:%S") .. " ===" .. colors.reset)
+    else
+        table.insert(outputLines, colors.white .. "=== Stack Trace ===" .. colors.reset)
+    end
+
+    -- 收集堆栈信息
+    local frameCount = 0
+    local skippedDebuggerFrames = 0
+
+    for level = ignoreCount, config.maxStackDepth do
+        local source = debug.getinfo(level, "Snlf")
+        if not source then
+            break
+        end
+
+        -- 构建栈帧信息
+        local frameInfo = {
+            level = level - ignoreCount + 1,
+            src = source.source,
+            funcName = source.name or "<anonymous>",
+            currentline = source.currentline,
+            linedefined = source.linedefined,
+            lastlinedefined = source.lastlinedefined,
+            what = source.what,
+            namewhat = source.namewhat or "",
+            source = source.source
+        }
+
+        -- 跳过调试器自身的帧
+        if isDebuggerFrame(frameInfo) then
+            skippedDebuggerFrames = skippedDebuggerFrames + 1
+            goto continue
+        end
+
+        -- 达到最大显示深度时停止
+        if frameCount >= config.maxDepth then
+            table.insert(outputLines, colors.gray .. string.format("... (%d more frames hidden)",
+                (config.maxStackDepth - level + 1)) .. colors.reset)
+            break
+        end
+
+        -- 格式化文件路径
+        local filePath
+        if config.showFullPath then
+            filePath = source.source
+        else
+            -- 提取文件名
+            if source.source:sub(1, 1) == "@" then
+                local path = source.source:sub(2)
+                local _, filename = path:match("^.*[/\\](.+)$")
+                filePath = filename or path
+            elseif source.source:sub(1, 1) == "=" then
+                filePath = source.source:sub(2)
+            else
+                filePath = "[string]"
+            end
+        end
+
+        -- 构建帧描述
+        local indent = string.rep(" ", config.indentSize)
+        local framePrefix = string.format("#%d ", frameCount + 1)
+
+        local frameLine
+        if config.showLineNumbers then
+            if source.currentline > 0 then
+                frameLine = string.format("%s%s in %s%s%s at %s%s%s:%s%d%s",
+                    colors.white, framePrefix,
+                    colors.yellow, frameInfo.funcName, colors.reset,
+                    colors.blue, filePath, colors.reset,
+                    colors.green, source.currentline, colors.reset)
+            else
+                frameLine = string.format("%s%s in %s%s%s at %s%s%s",
+                    colors.white, framePrefix,
+                    colors.yellow, frameInfo.funcName, colors.reset,
+                    colors.blue, filePath, colors.reset)
+            end
+        else
+            frameLine = string.format("%s%s in %s%s%s",
+                colors.white, framePrefix,
+                colors.yellow, frameInfo.funcName, colors.reset)
+        end
+
+        -- 添加函数类型信息
+        if config.showFunctionType then
+            local typeColor = colors.gray
+            if source.what == "Lua" then
+                typeColor = colors.green
+            elseif source.what == "C" then
+                typeColor = colors.red
+            elseif source.what == "main" then
+                typeColor = colors.cyan
+            end
+
+            frameLine = frameLine .. string.format(" [%s%s%s]",
+                typeColor, source.what, colors.reset)
+        end
+
+        table.insert(outputLines, frameLine)
+
+        -- 获取并格式化变量
+        if config.showVariables then
+            local success, vars = pcall(function()
+                local varInfo = {}
+
+                -- 获取局部变量
+                varInfo.locals = {}
+                local idx = 1
+                while true do
+                    local name, value = debug.getlocal(level + 1, idx)
+                    if not name then break end
+
+                    -- 过滤掉调试器内部变量
+                    if not name:find("^_debugger_") then
+                        varInfo.locals[name] = {
+                            value = value,
+                            type = type(value)
+                        }
+                    end
+                    idx = idx + 1
+                end
+
+                -- 获取上值
+                varInfo.upvalues = {}
+                local func = debug.getinfo(level + 1, "f").func
+                if func then
+                    idx = 1
+                    while true do
+                        local name, value = debug.getupvalue(func, idx)
+                        if not name then break end
+
+                        varInfo.upvalues[name] = {
+                            value = value,
+                            type = type(value)
+                        }
+                        idx = idx + 1
+                    end
+                end
+
+                return varInfo
+            end)
+
+            if success then
+                local varsStr = formatVariables(vars, config.indentSize * 2)
+                if varsStr ~= "" then
+                    table.insert(outputLines, varsStr)
+                end
+            end
+        end
+
+        frameCount = frameCount + 1
+
+        -- 到达主程序层时停止
+        if source.what == "main" then
+            break
+        end
+
+        ::continue::
+    end
+
+    -- 添加统计信息
+    table.insert(outputLines, "")
+    table.insert(outputLines, colors.gray .. string.format(
+        "Total frames: %d (skipped %d debugger frames)",
+        frameCount, skippedDebuggerFrames) .. colors.reset)
+
+    -- 如果没有找到任何帧
+    if frameCount == 0 then
+        table.insert(outputLines,
+            colors.yellow .. "No stack frames found (possibly all frames were skipped)" .. colors.reset)
+    end
+
+    -- 添加分隔线
+    table.insert(outputLines, colors.white .. "====================" .. colors.reset)
+
+    return table.concat(outputLines, "\n")
+end
+
+function InnerFunction()
+    local x = 42
+    local name = "Test"
+    local data = { a = 1, b = 2 }
+
+    -- 打印堆栈信息
+    local trace = PrintStackTrace(2, {
+        showVariables = false,
+        colorOutput = false,
+        maxDepth = 20
+    })
+
+    return trace
+end
--- a/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/EXMainView.lua
@ -779,8 +779,8 @@ function M:__FangziTip(tip, _uid, fptype)
    else
        self._view:AddChild(_chipeng_tip)
        _chipeng_tip:Center()
-        _chipeng_tip.x = _chipeng_tip.x + 600
-        _chipeng_tip.y = _chipeng_tip.y - 200
+        _chipeng_tip.x = _chipeng_tip.x + 450
+        _chipeng_tip.y = _chipeng_tip.y - 100
    end
 end

--- a/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
+++ b/lua_probject/extend_project/extend/zipai/fanpaofa/main/HuTipView.lua
@ -6,12 +6,12 @@ local HuTipView = {
 local M = HuTipView

 function M.new(main_view)
-    local self = {}
-    self.class = "HuTipView"
-    setmetatable(self,{__index = HuTipView})
-    self._main_view = main_view
-    self:init()
-    return self
+	local self = {}
+	self.class = "HuTipView"
+	setmetatable(self, { __index = HuTipView })
+	self._main_view = main_view
+	self:init()
+	return self
 end

 local function SetObjEnabled(obj, enabled)
@ -22,8 +22,9 @@ function M:OnTouchBegin(context)
 	self._view_start_pos = Vector2(self._view.x, self._view.y)
 	self._touch_start_pos = self._main_view._view:GlobalToLocal(Vector2(context.inputEvent.x, context.inputEvent.y))
 end
+
 function M:OnTouchMove(context)
-	local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x,context.inputEvent.y))
+	local xy = self._main_view._view:GlobalToLocal(Vector2.New(context.inputEvent.x, context.inputEvent.y))
 	local dist = Vector2(xy.x - self._touch_start_pos.x, xy.y - self._touch_start_pos.y)
 	local posx = self._view_start_pos.x + dist.x
 	local posy = self._view_start_pos.y + dist.y
@ -41,16 +42,20 @@ function M:init()
 	local m_height = self._main_view._view.height
 	self._view.x = 0.115 * m_width --- 0.5 * width
 	--self._view.x = 0
+	-- self._view.y = 0.65 * m_height
 	self._view.y = 0.65 * m_height
 	SetObjEnabled(self._view, false)
 	self._view.onTouchBegin:Add(handler(self, self.OnTouchBegin))
 	self._view.onTouchMove:Add(handler(self, self.OnTouchMove))
 end

-function M:FillData(cards)		
+function M:FillData(cards)
 	local lst_card = self._view:GetChild("tingpai")
 	lst_card:RemoveChildrenToPool()
 	local num = #cards
+	local n0 = self._view:GetChild("n0")
+	n0.height = 130
+	n0.width = 76 * #cards + 150
 	if num > 0 then
 		if num > 4 and num < 28 then
 			self._view.width = 191 + ((num > 4 and 6 or num) - 3) * 38
@ -66,4 +71,4 @@ function M:FillData(cards)
 	end
 end

-return M
+return M
--- a/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
+++ b/wb_new_ui/.objs/metas/1utjt0r2/ufu92i.info
@ -6,6 +6,9 @@
    "n84_rbpg": {
      "hidden": true
    },
+    "n55_rx2e": {
+      "collapsed": true
+    },
    "n4_fux2": {
      "hidden": true
    }
--- a/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info
+++ b/wb_new_ui/.objs/metas/8wph7p8n/yffnmy.info
@ -3,13 +3,10 @@
    "n87_q50p": {
      "hidden": true
    },
-    "n155_diqo": {
-      "collapsed": true
-    },
    "n166_ukp7": {
      "hidden": true
    },
-    "n179_yffn": {
+    "n155_diqo": {
      "collapsed": true
    },
    "n131_ckvb": {
--- a/wb_new_ui/.objs/workspace.json
+++ b/wb_new_ui/.objs/workspace.json
@ -2,24 +2,61 @@
  "libview.firstColumnWidth": 413,
  "libview.iconScale": 0,
  "doc.openedDocs": [
-    "ui://m7iejg4610snh5j",
-    "ui://m7iejg46h46p7ish",
-    "ui://m7iejg4610i2p7isr",
-    "ui://m7iejg4610i2p7iss"
+    "ui://lkq9ne9speuq8b",
+    "ui://lkq9ne9speuq6p",
+    "ui://lkq9ne9speuq5a",
+    "ui://lkq9ne9speuq2q",
+    "ui://lkq9ne9speuq9m",
+    "ui://lkq9ne9speuq9k",
+    "ui://lkq9ne9speuqt",
+    "ui://lkq9ne9so0c1ru",
+    "ui://1utjt0r2ufu92i"
  ],
  "test.device": "Huawei Mate20",
  "canvasColor": 10066329,
  "auxline2": true,
-  "doc.activeDoc": "ui://m7iejg4610i2p7iss",
+  "doc.activeDoc": "ui://lkq9ne9speuq2q",
  "libview.twoColumn": false,
  "libview.expandedNodes": [
+    "27vd145b",
+    "/",
+    "27vd145b",
+    "/images/",
+    "1utjt0r2",
+    "/",
+    "1utjt0r2",
+    "/component/",
+    "1utjt0r2",
+    "/component/clearing/",
+    "1utjt0r2",
+    "/component/clearing/image/",
+    "lkq9ne9s",
+    "/",
+    "lkq9ne9s",
+    "/component/",
+    "lkq9ne9s",
+    "/component/HuTip/",
+    "lkq9ne9s",
+    "/component/Main/",
+    "lkq9ne9s",
+    "/component/Main/images/",
+    "lkq9ne9s",
+    "/component/cards/",
+    "lkq9ne9s",
+    "/component/images/",
+    "lkq9ne9s",
+    "/component/niao/",
+    "yzaioi79",
+    "/",
+    "yzaioi79",
+    "/component/",
+    "yzaioi79",
+    "/component/HuTip/",
    "m7iejg46",
    "/",
    "m7iejg46",
    "/component/",
    "m7iejg46",
-    "/component/Lst_room/",
-    "m7iejg46",
    "/images/"
  ],
  "auxline1": true,
--- a/wb_new_ui/assets/Common/package.xml
+++ b/wb_new_ui/assets/Common/package.xml
@ -1559,6 +1559,7 @@
    <image id="hez87j4r" name="vip_ring_ract_07.png" path="/component/hudong/jiezhi/"/>
    <movieclip id="hez87j4s" name="diamo.jta" path="/component/hudong/jiezhi/" exported="true" atlas="4"/>
    <component id="hez87j4t" name="Missile.xml" path="/component/" exported="true"/>
+    <image id="106jc7j4u" name="屏幕截图 2026-03-11 203420.png" path="/" exported="true"/>
  </resources>
  <publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
    <atlas name="默认" index="0"/>
--- a/wb_new_ui/assets/Common/屏幕截图
+++ b/wb_new_ui/assets/Common/屏幕截图
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/image/shengli_zipai.png
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/result_zipai_main.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" initName="big_result" designImageLayer="1">
-  <controller name="result" pages="0,,1," selected="1"/>
-  <controller name="time" pages="0,,1," selected="1"/>
+  <controller name="result" pages="0,,1," selected="0"/>
+  <controller name="time" pages="0,,1," selected="0"/>
  <controller name="share" pages="0,,1," selected="0"/>
  <displayList>
    <image id="n48_coat" name="n48" src="o0c18z" fileName="images/clearing_bg1.png" xy="0,0" size="2532,1170"/>
@ -27,29 +27,29 @@
    <component id="n5_tjnv" name="btn_result_confirm1" src="ufu938" fileName="component/result/component/btn_result_confirm.xml" xy="2202,1023" size="239,97" group="n7_tjnv" visible="false">
      <relation target="" sidePair="right-right,bottom-bottom"/>
    </component>
-    <component id="n41_aen8" name="btn_result_share" src="ufu93a" fileName="component/clearing/zipai_btn_result_share.xml" xy="42,947" group="n7_tjnv" touchable="false">
+    <component id="n41_aen8" name="btn_result_share" src="ufu93a" fileName="component/clearing/zipai_btn_result_share.xml" xy="631,963" group="n7_tjnv" touchable="false">
      <relation target="" sidePair="left-left,bottom-bottom"/>
    </component>
-    <component id="n45_mj9f" name="btn_result_confirm" src="ufu93c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1704,973" group="n7_tjnv">
+    <component id="n45_mj9f" name="btn_result_confirm" src="ufu93c" fileName="component/clearing/zipai_btn_queren_confirm.xml" xy="1734,1313" group="n7_tjnv" visible="false">
      <relation target="" sidePair="right-right"/>
    </component>
-    <component id="n42_aen8" name="btn_continue_game" src="ufu93e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="2127,984" size="244,103" group="n7_tjnv" visible="false">
+    <component id="n42_aen8" name="btn_continue_game" src="ufu93e" fileName="component/clearing/zipai_btn_result_confirm.xml" xy="1570,988" size="244,103" group="n7_tjnv" visible="false">
      <relation target="" sidePair="right-right,bottom-bottom"/>
    </component>
-    <group id="n7_tjnv" name="bottom" xy="42,947" size="2399,173" group="n31_aen8"/>
-    <image id="n36_aen8" name="n36" src="ufu93i" fileName="component/clearing/image/zipai_shuoming_di.png" xy="432,1004" size="1221,141" group="n11_tjnv"/>
-    <image id="n9_tjnv" name="n9" src="ufu93j" fileName="component/clearing/image/hd.png" xy="713,1028" size="749,92" group="n11_tjnv" visible="false"/>
-    <text id="n10_tjnv" name="txt_play" xy="604,1033" size="875,88" group="n11_tjnv" font="Microsoft YaHei" fontSize="36" color="#ffdabb" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法 玩法说明玩法 玩法说明玩法法说明玩法 玩法说明玩法 法说明玩法 玩法说明玩法 明玩法"/>
-    <group id="n11_tjnv" name="player" xy="432,1004" size="1221,141" group="n31_aen8" advanced="true">
+    <group id="n7_tjnv" name="bottom" xy="84,963" size="2357,474" group="n31_aen8"/>
+    <image id="n36_aen8" name="n36" src="ufu93i" fileName="component/clearing/image/zipai_shuoming_di.png" xy="490,1513" size="1221,141" group="n11_tjnv"/>
+    <image id="n9_tjnv" name="n9" src="ufu93j" fileName="component/clearing/image/hd.png" xy="771,1537" size="749,92" group="n11_tjnv" visible="false"/>
+    <text id="n10_tjnv" name="txt_play" xy="662,1542" size="875,88" group="n11_tjnv" font="Microsoft YaHei" fontSize="36" color="#ffdabb" align="center" vAlign="middle" autoSize="shrink" text="玩法说明玩法 玩法说明玩法 玩法说明玩法法说明玩法 玩法说明玩法 法说明玩法 玩法说明玩法 明玩法"/>
+    <group id="n11_tjnv" name="player" xy="490,1513" size="1221,141" group="n31_aen8" visible="false" advanced="true">
      <relation target="" sidePair="center-center,bottom-bottom"/>
    </group>
-    <text id="n28_tjnv" name="n28" xy="495,914" size="1465,74" group="n31_aen8" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
+    <text id="n28_tjnv" name="n28" xy="416,1443" size="1465,74" group="n31_aen8" visible="false" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="此页面仅用于娱乐竞技展示，禁止一切赌博行为！">
      <relation target="" sidePair="center-center"/>
    </text>
-    <text id="n27_tjnv" name="txt_game_name" xy="45,29" size="184,49" group="n34_aen8" fontSize="36" color="#ffffff" align="center" vAlign="middle" text="娄底放炮罚"/>
-    <text id="n29_tjnv" name="txt_game_data" xy="427,98" size="541,49" group="n34_aen8" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
-    <text id="n15_tjnv" name="txt_room_id" xy="42,98" size="242,49" group="n34_aen8" fontSize="36" color="#ffffff" align="center" vAlign="middle" text="房间号:888888"/>
-    <group id="n34_aen8" name="n34" xy="42,29" size="926,118" group="n31_aen8" advanced="true">
+    <text id="n27_tjnv" name="txt_game_name" xy="13,66" size="214,56" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="娄底放炮罚"/>
+    <text id="n29_tjnv" name="txt_game_data" xy="537,69" size="397,56" group="n34_aen8" fontSize="42" color="#ffffff" vAlign="middle" autoSize="none" text="2019-12-12 18:28"/>
+    <text id="n15_tjnv" name="txt_room_id" xy="247,69" size="280,56" group="n34_aen8" fontSize="42" color="#ffffff" align="center" vAlign="middle" text="房间号:888888"/>
+    <group id="n34_aen8" name="n34" xy="13,66" size="921,59" group="n31_aen8" advanced="true">
      <relation target="" sidePair="center-center"/>
    </group>
    <list id="n26_tjnv" name="player_list" xy="0,185" size="2519,749" group="n31_aen8" touchable="false" layout="row" overflow="scroll" scroll="horizontal" colGap="369" defaultItem="ui://1utjt0r2ufu93k" align="center" vAlign="middle">
@ -58,27 +58,27 @@
      <item/>
    </list>
    <component id="n51_efhz" name="btn_close" src="vg2c4" fileName="buttons/Btn_Close.xml" pkg="27vd145b" xy="2335,-16" size="165,165" group="n31_aen8"/>
-    <group id="n31_aen8" name="n31" xy="0,-16" size="2519,1161" advanced="true"/>
+    <group id="n31_aen8" name="n31" xy="0,-16" size="2519,1670" advanced="true"/>
    <image id="n12_tjnv" name="n12" src="ufu93z" fileName="component/clearing/image/jfd.png" xy="19,207" size="194,85" group="n14_tjnv"/>
    <text id="n13_tjnv" name="txt_time" xy="24,214" size="164,69" group="n14_tjnv" fontSize="36" color="#ffffff" vAlign="middle" autoSize="shrink" text="倍数：5"/>
    <group id="n14_tjnv" name="group_times" xy="19,207" size="194,85" advanced="true">
      <gearDisplay controller="time" pages="1"/>
      <relation target="" sidePair="left-left,top-top"/>
    </group>
-    <image id="n16_tjnv" name="n16" src="ufu940" fileName="font/images/win/tkd.png" xy="160,190" size="1012,370" group="n17_tjnv" />
-    <component id="n18_tjnv" name="btn_close_share" src="ufu98" fileName="buttons/Btn_close.xml" xy="1104,149" group="n17_tjnv" controller="style,0" />
+    <image id="n16_tjnv" name="n16" src="ufu940" fileName="font/images/win/tkd.png" xy="160,190" size="1012,370" group="n17_tjnv"/>
+    <component id="n18_tjnv" name="btn_close_share" src="ufu98" fileName="buttons/Btn_close.xml" xy="1104,149" group="n17_tjnv" controller="style,0"/>
    <component id="n22_tjnv" name="btn_share_copy" src="ufu941" fileName="component/result/component/btn_share_method.xml" xy="588,277" group="n25_tjnv">
-      <Button icon="ui://1utjt0r2ufu942" />
+      <Button icon="ui://1utjt0r2ufu942"/>
    </component>
    <component id="n23_tjnv" name="btn_share_link" src="ufu941" fileName="component/result/component/btn_share_method.xml" xy="866,277" group="n25_tjnv">
-      <Button icon="ui://1utjt0r2ufu943" />
+      <Button icon="ui://1utjt0r2ufu943"/>
    </component>
    <component id="n24_tjnv" name="btn_share_photo" src="ufu941" fileName="component/result/component/btn_share_method.xml" xy="310,277" group="n25_tjnv">
-      <Button icon="ui://1utjt0r2ufu944" />
+      <Button icon="ui://1utjt0r2ufu944"/>
    </component>
-    <group id="n25_tjnv" name="n25" xy="310,277" size="714,196" group="n17_tjnv" />
+    <group id="n25_tjnv" name="n25" xy="310,277" size="714,196" group="n17_tjnv"/>
    <group id="n17_tjnv" name="group_share" xy="160,149" size="1044,411" advanced="true">
-      <gearDisplay controller="share" pages="1" />
+      <gearDisplay controller="share" pages="1"/>
    </group>
    <image id="n47_coat" name="n47" pkg="27vd145b" src="coat7ivz" fileName="buttons/亲友圈 (1).png" xy="1856,-1264" alpha="0.5"/>
  </displayList>
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/zipai_btn_result_confirm.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/zipai_btn_result_confirm.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="244,124" extention="Button">
+<component size="400,169" extention="Button">
  <displayList>
-    <image id="n6_aen8" name="n6" src="ufu93d" fileName="component/clearing/image/退出.png" xy="0,31" visible="false"/>
-    <image id="n7_mj9f" name="n7" src="ufu93f" fileName="component/Main/new_ui/zailaiyiju_img.png" xy="0,31">
+    <image id="n6_aen8" name="n6" src="ufu93d" fileName="component/clearing/image/btn_exit.png" xy="0,31" visible="false"/>
+    <image id="n7_mj9f" name="n7" src="ufu93f" fileName="component/Main/new_ui/zailaiyiju_img.png" xy="0,0">
      <relation target="" sidePair="center-center,middle-middle"/>
    </image>
  </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>
--- a/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/zipai_btn_result_share.xml
+++ b/wb_new_ui/assets/Extend_Poker_FanPaoFa/component/clearing/zipai_btn_result_share.xml
@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="246,124" extention="Button">
+<component size="400,169" extention="Button">
  <displayList>
-    <image id="n7_aen8" name="n7" src="ufu93b" fileName="component/clearing/image/分享.png" xy="0,31">
+    <image id="n7_aen8" name="n7" src="ufu93b" fileName="component/clearing/image/btn_Shader.png" xy="0,0">
      <relation target="" sidePair="center-center,middle-middle"/>
    </image>
  </displayList>
-  <Button downEffect="dark" downEffectValue="0.80"/>
+  <Button downEffect="dark" downEffectValue="0.8"/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/HuTip/Hu_Tip.xml
@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="255,92" extention="Button">
+<component size="243,92" extention="Button">
  <displayList>
-    <image id="n0_lyf1" name="n0" src="peuq2r" fileName="component/images/ting.png" xy="0,0" size="253,96" group="n2_lyf1">
-      <relation target="" sidePair="width-width,height-height"/>
+    <image id="n0_lyf1" name="n0" src="peuq2r" fileName="component/images/ting.png" xy="1,2" size="241,92">
+      <relation target="" sidePair=""/>
+      <relation target="n1_lyf1" sidePair="width-width,height-height"/>
    </image>
-    <list id="n1_lyf1" name="tingpai" xy="56,22" pivot="0.5,0.5" size="190,50" group="n2_lyf1" touchable="false" layout="flow_hz" lineGap="8" colGap="5" lineItemCount="5" defaultItem="ui://lkq9ne9speuq2s"/>
-    <group id="n2_lyf1" name="n2" xy="0,0" size="253,96" advanced="true"/>
+    <list id="n1_lyf1" name="tingpai" xy="59,16" pivot="0,0.5" size="159,58" touchable="false" layout="flow_hz" lineGap="8" colGap="5" lineItemCount="5" defaultItem="ui://lkq9ne9speuq2s"/>
  </displayList>
  <Button/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Main_2.xml
@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1172" designImage="ui://3vytbifonu0l2f" designImageOffsetX="-200" designImageOffsetY="-100">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,回合间状态,3,回放状态" selected="2"/>
+  <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="jushu" pages="0,,1," selected="0"/>
-  <controller name="bg_state" pages="0,,1,,2," selected="2"/>
+  <controller name="bg_state" pages="0,,1,,2," selected="0"/>
  <displayList>
    <image id="n196_h5b1" name="n196" src="h5b1rn" fileName="component/Main/images/floorTop.png" xy="801,1" size="927,113"/>
-    <text id="n205_e5js" name="text_playName" xy="984,504" pivot="0.5,0" size="569,154" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
-    <text id="n176_fgao" name="di_text" xy="20,20" size="313,56" group="n150_8th3" font="Microsoft YaHei" fontSize="36" color="#367c7d" align="center" vAlign="middle" autoSize="none" text="玩法名称">
+    <text id="n205_e5js" name="text_playName" xy="1268,504" pivot="0.5,0" size="0,124" font="ui://27vd145bu50h7j1a" fontSize="120" autoClearText="true" text="fffffffffdddd"/>
+    <text id="n176_fgao" name="di_text" xy="1403,49" size="313,56" group="n150_8th3" font="Microsoft YaHei" fontSize="36" color="#ffffff" align="center" vAlign="middle" autoSize="none" text="玩法名称">
      <gearDisplay controller="state" pages="0,1,2"/>
      <gearColor controller="bg_state" pages="0,1" values="#ffffff,#296137|#655c6a,#322e34" default="#367c7d,#235557"/>
      <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
@ -17,34 +17,34 @@
      <gearDisplay controller="state" pages="0,1,2"/>
      <relation target="" sidePair="left-left"/>
    </component>
-    <component id="n31_h1uu" name="roominfo_panel" src="peuq8q" fileName="component/Main/RoomInfoPanel1.xml" xy="1129,-3" group="n150_8th3" touchable="false">
+    <component id="n31_h1uu" name="roominfo_panel" src="peuq8q" fileName="component/Main/RoomInfoPanel1.xml" xy="1109,-3" size="358,80" group="n150_8th3" touchable="false">
      <relation target="" sidePair="center-center,top-top"/>
    </component>
-    <group id="n150_8th3" name="n150" xy="20,-3" size="1429,83" advanced="true">
+    <group id="n150_8th3" name="n150" xy="834,-3" size="882,108" advanced="true">
      <relation target="" sidePair="left-left"/>
    </group>
    <component id="n149_qpk6" name="btn_reset" src="peuq3v" fileName="component/Main/component/Folder/component/phone_info/Btn_reset.xml" xy="61,536" size="109,109">
      <gearDisplay controller="state" pages="1,2"/>
      <relation target="" sidePair="middle-middle"/>
    </component>
-    <image id="n177_cbxl" name="n177" src="peuq72" fileName="component/Main/images/zipai3.png" xy="1132,147">
+    <image id="n177_cbxl" name="n177" src="peuq72" fileName="component/Main/images/zipai3.png" xy="1138,115">
      <gearDisplay controller="state" pages="1,3"/>
      <relation target="" sidePair="center-center"/>
    </image>
    <loader id="n156_mk2u" name="jiang" xy="450,91" size="65,75" fill="scaleFree"/>
-    <component id="n151_8th3" name="player_card_info2" src="peuq6p" fileName="component/Main/component/Player_card_info_2.xml" xy="311,52" size="538,402">
-      <gearDisplay controller="state" pages="1,3"/>
-      <relation target="n147_nu0l" sidePair="left-left"/>
-    </component>
    <component id="n61_jali" name="player_card_info1" src="peuq5a" fileName="component/Main/component/Player_card_info_1.xml" xy="0,943" size="2532,228">
      <gearDisplay controller="state" pages="1,3"/>
      <relation target="" sidePair="width-width,bottom-bottom"/>
    </component>
-    <component id="n147_nu0l" name="player_info2" src="peuq6r" fileName="component/Main/component/PlayerHead_2.xml" xy="63,94" size="200,300">
+    <component id="n151_8th3" name="player_card_info2" src="peuq6p" fileName="component/Main/component/Player_card_info_2.xml" xy="311,52" size="538,402">
+      <gearDisplay controller="state" pages="1,3"/>
+      <relation target="n147_nu0l" sidePair="left-left"/>
+    </component>
+    <component id="n147_nu0l" name="player_info2" src="peuq6r" fileName="component/Main/component/PlayerHead_2.xml" xy="63,54" size="200,300">
      <relation target="" sidePair="rightext-left,topext-top,bottomext-top,leftext-left"/>
    </component>
    <component id="n194_syh3" name="gcm_chat" src="syh3rk" fileName="component/Main/Main_2_chat.xml" xy="2380,453"/>
-    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="54,675" size="200,300">
+    <component id="n7" name="player_info1" src="peuq6e" fileName="component/Main/component/PlayerHead_1.xml" xy="49,707" size="200,300">
      <gearXY controller="state" pages="0,1,2,3" values="69,602|49,707|54,675|48,570"/>
      <relation target="" sidePair="rightext-left,topext-bottom%,bottomext-bottom,leftext-left"/>
    </component>
@ -80,11 +80,11 @@
      <gearDisplay controller="state" pages="3"/>
      <relation target="" sidePair="center-center"/>
    </image>
-    <text id="n42_lryk" name="tex_round" xy="1348,20" size="405,56" group="n154_r1mo" fontSize="42" color="#ffffff" align="center" autoSize="none" text="剩余 5 张牌  1/8局">
+    <text id="n42_lryk" name="tex_round" xy="1348,-5" size="405,56" group="n154_r1mo" fontSize="42" color="#ffffff" align="center" autoSize="none" text="剩余 5 张牌  1/8局">
      <gearDisplay controller="state" pages="1,3"/>
      <relation target="" sidePair="center-center"/>
    </text>
-    <group id="n154_r1mo" name="n154" xy="1348,20" size="405,56" advanced="true">
+    <group id="n154_r1mo" name="n154" xy="1348,-5" size="405,56" advanced="true">
      <gearDisplay controller="jushu" pages="1"/>
    </group>
    <loader id="n153_8th3" name="cardAnima" xy="625,86" size="50,30" visible="false" touchable="false" url="ui://3bfrwj0h8th37l" autoSize="true">
@ -94,13 +94,13 @@
      <gearDisplay controller="state" pages="3"/>
      <relation target="" sidePair="center-center"/>
    </component>
-    <image id="n174_fgao" name="zipai1" src="peuq2u" fileName="component/images/zipaic2.png" xy="1164,168" visible="false">
+    <image id="n174_fgao" name="zipai1" src="peuq2u" fileName="component/images/zipaic2.png" xy="1167,136" visible="false">
      <relation target="" sidePair="center-center"/>
    </image>
-    <image id="n175_fgao" name="zipai2" src="peuq2u" fileName="component/images/zipaic2.png" xy="1160,165" visible="false">
+    <image id="n175_fgao" name="zipai2" src="peuq2u" fileName="component/images/zipaic2.png" xy="1163,133" visible="false">
      <relation target="" sidePair="center-center"/>
    </image>
-    <text id="n27" name="remaining_card" xy="1166,159" size="165,45" fontSize="32" color="#ffffff" align="center" autoSize="none" text="剩余20张">
+    <text id="n27" name="remaining_card" xy="1169,127" size="165,45" fontSize="32" color="#ffffff" align="center" autoSize="none" text="剩余20张">
      <gearDisplay controller="state" pages="1,3"/>
      <relation target="" sidePair="center-center"/>
    </text>
@ -117,7 +117,7 @@
    <component id="n179_kxwj" name="btn_distance" src="peuq94" fileName="component/gps/btn_distance_new.xml" xy="1800,13" visible="false" touchable="false">
      <gearDisplay controller="state" pages="0,1,2"/>
    </component>
-    <component id="n198_h5b1" name="safe_bg" src="o0c1ru" fileName="component/Main/main_2_safe_bg.xml" xy="1476,-8"/>
+    <component id="n198_h5b1" name="safe_bg" src="o0c1ru" fileName="component/Main/main_2_safe_bg.xml" xy="2335,0" size="200,1170"/>
    <component id="n193_syh3" name="btn_safe" src="syh3rj" fileName="component/Main/btn_safe.xml" xy="2385,30" size="109,109"/>
    <component id="n201_o0c1" name="btn_rule" src="o0c1rv" fileName="component/Main/component/Folder/component/phone_info/Btn_rule.xml" xy="2388,210" group="n183_yfzf"/>
    <component id="n166_o49p" name="btn_back_lobby" src="peuq3r" fileName="component/Main/component/Folder/component/phone_info/Btn_back_lobby.xml" xy="2388,505" size="109,109" group="n183_yfzf">
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/Qipais.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/Qipais.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,42">
+<component size="82,82">
  <displayList>
-    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="42,42" autoSize="true"/>
+    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="82,82" fill="scale"/>
  </displayList>
  <transition name="t0">
    <item time="0" type="Scale" target="n0_lr5d" tween="true" startValue="1.5,1.5" endValue="1,1" duration="6"/>
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_1.xml
@ -1,15 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,500" opaque="false" initName="player_card_info">
-  <controller name="chupai" pages="0,,1," selected="1"/>
-  <controller name="piao" pages="0,,1,,3,,4," selected="3"/>
-  <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="5"/>
-  <controller name="niao" pages="0,,1," selected="1"/>
+  <controller name="chupai" pages="0,,1," selected="0"/>
+  <controller name="piao" pages="0,,1,,3,,4," selected="0"/>
+  <controller name="piaovalue" pages="0,0,1,1,2,2,3,3,4,5,5,8" selected="0"/>
+  <controller name="niao" pages="0,,1," selected="0"/>
  <displayList>
-    <list id="n36_lr5d" name="windcard_list" xy="2529,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2">
+    <list id="n36_lr5d" name="windcard_list" xy="2494,215" size="283,81" rotation="180" layout="flow_hz" lineGap="1" colGap="1" defaultItem="ui://lkq9ne9speuq2">
      <relation target="" sidePair="right-right"/>
    </list>
-    <list id="n35_lr5d" name="area_fz_list" xy="296,-174" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="5" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
+    <list id="n35_lr5d" name="area_fz_list" xy="1068,-469" pivot="0.5,0.5" size="416,231" rotation="180" layout="row" selectionMode="none" lineGap="3" colGap="18" defaultItem="ui://v6yvqp7wlr5d30" align="right" vAlign="middle" autoClearItems="true">
      <relation target="" sidePair="rightext-left,topext-bottom,bottomext-bottom,leftext-left"/>
+      <item/>
+      <item/>
    </list>
    <component id="n25" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="447,351" size="1698,148">
      <relation target="" sidePair="center-center,bottom-bottom"/>
@ -18,7 +20,7 @@
    <component id="n38_ey1o" name="n38" src="peuq5b" fileName="component/Main/component/PromptOutCard.xml" xy="16,-177" size="1577,170">
      <gearDisplay controller="chupai" pages="1"/>
    </component>
-    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1475,-728" size="218,155">
+    <component id="n27" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="1398,-838" size="218,155">
      <relation target="n35_lr5d" sidePair="right-right"/>
    </component>
    <component id="n39_j34t" name="piao0" src="peuq5f" fileName="component/piao/btn_nopiao.xml" xy="668,-20" group="n45_j34t">
@ -29,17 +31,17 @@
      <gearDisplay controller="piao" pages="1"/>
      <Button icon="ui://lkq9ne9speuq5m" selectedIcon="ui://lkq9ne9speuq5m" controller="piaovalue" page="1"/>
    </component>
-    <component id="n41_j34t" name="piao2" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="890,-53" group="n45_j34t">
+    <component id="n41_j34t" name="piao2" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="697,-126" group="n45_j34t">
      <gearDisplay controller="piao" pages="1,3,4"/>
      <gearXY controller="piao" pages="0,3,4" values="697,-126|448,-159|890,-53" default="686,-159"/>
      <Button icon="ui://lkq9ne9speuq5n" selectedIcon="ui://lkq9ne9speuq5n" controller="piaovalue" page="2"/>
    </component>
-    <component id="n42_j34t" name="piao3" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="1388,-53" group="n45_j34t">
+    <component id="n42_j34t" name="piao3" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="957,-126" group="n45_j34t">
      <gearDisplay controller="piao" pages="1,3"/>
      <gearXY controller="piao" pages="0,3,4" values="957,-126|686,-159|1388,-53" default="946,-159"/>
      <Button icon="ui://lkq9ne9speuq5o" selectedIcon="ui://lkq9ne9speuq5o" controller="piaovalue" page="3"/>
    </component>
-    <component id="n43_j34t" name="piao5" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="1128,-53" group="n45_j34t">
+    <component id="n43_j34t" name="piao5" src="peuq5i" fileName="component/piao/btn_piao.xml" xy="697,-126" group="n45_j34t">
      <gearDisplay controller="piao" pages="3,4"/>
      <gearXY controller="piao" pages="0,3,4" values="697,-126|946,-159|1128,-53" default="686,-159"/>
      <Button icon="ui://lkq9ne9speuq5p" selectedIcon="ui://lkq9ne9speuq5p" controller="piaovalue" page="4"/>
@ -49,13 +51,13 @@
      <Button icon="ui://lkq9ne9speuq5k" selectedIcon="ui://lkq9ne9speuq5k" controller="piaovalue" page="5"/>
    </component>
    <group id="n45_j34t" name="piao" xy="668,-53" size="949,136"/>
-    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="767,-11" size="250,90" group="n48_cphv">
+    <component id="n46_cphv" name="daniao" src="peuq5q" fileName="component/niao/btn_niao.xml" xy="802,-45" size="400,169" group="n48_cphv">
      <gearDisplay controller="niao" pages="1"/>
    </component>
-    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="1381,-11" size="250,90" group="n48_cphv">
+    <component id="n47_cphv" name="budaniao" src="peuq5s" fileName="component/niao/btn_noniao.xml" xy="1416,-45" size="400,169" group="n48_cphv">
      <gearDisplay controller="niao" pages="1"/>
    </component>
-    <group id="n48_cphv" name="niao" xy="767,-11" size="864,90" advanced="true">
+    <group id="n48_cphv" name="niao" xy="802,-45" size="1014,169" advanced="true">
      <relation target="" sidePair=""/>
    </group>
  </displayList>
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/component/Player_card_info_2.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="200,750" opaque="false" initName="player_card_info">
  <displayList>
-    <list id="n47_lr5d" name="area_fz_list" xy="4,29" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="5" align="right" vAlign="bottom"/>
-    <list id="n48_lr5d" name="windcard_list" xy="26,322" size="280,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
+    <list id="n47_lr5d" name="area_fz_list" xy="84,31" pivot="0.5,0.5" size="713,268" rotation="180" layout="row" scroll="horizontal" colGap="18" align="right" vAlign="bottom"/>
+    <list id="n48_lr5d" name="windcard_list" xy="84,1" size="535,530" layout="flow_hz" selectionMode="none" scroll="horizontal" lineGap="1" colGap="1" defaultItem="ui://v6yvqp7wf55qvw" vAlign="bottom"/>
    <component id="n50_n1ry" name="mask_liangpai" src="peuq59" fileName="component/Component1.xml" xy="200,83" size="5,5"/>
-    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="748,218" size="930,319" touchable="false"/>
+    <component id="n25" name="area_outcard_list" src="peuq59" fileName="component/Component1.xml" xy="534,79" size="930,319" touchable="false"/>
    <component id="n51_n7o4" name="area_handcard_list" src="peuq59" fileName="component/Component1.xml" xy="227,230" size="717,533" touchable="false"/>
  </displayList>
  <transition name="t0">
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/images/budaniao.png
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/images/budaniao.png
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/images/daniao.png
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/images/daniao.png
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/images/safe.png
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/images/safe.png
--- a/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/Main/main_2_safe_bg.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="1064,2000">
+<component size="200,1170">
  <displayList>
-    <image id="n198_h5b1" name="safe_bg" src="h5b1rp" fileName="component/Main/images/safe.png" xy="0,0" size="1064,2000"/>
+    <image id="n201_106jc" name="n201" src="106jcs3" fileName="component/Main/images/safe.png" xy="-862,0"/>
  </displayList>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Fz_0_3.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Fz_0_3.xml
@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,126">
+<component size="58,176">
  <controller name="c1" pages="0,,1," selected="0"/>
  <controller name="c2" pages="0,,1," selected="0"/>
  <displayList>
-    <loader id="n3_lr5d" name="card_3" xy="0,0" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" autoSize="true" clearOnPublish="true"/>
-    <loader id="n2_lr5d" name="card_2" xy="0,42" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" autoSize="true"/>
-    <loader id="n1_lr5d" name="card_1" xy="0,84" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" autoSize="true"/>
-    <group id="n4_lr5d" name="n4" xy="0,0" size="42,126"/>
-    <graph id="n5_m25s" name="n5" xy="0,0" size="42,126" type="rect" lineColor="#00000000" fillColor="#4d000000">
+    <loader id="n3_lr5d" name="card_3" xy="0,0" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale" clearOnPublish="true"/>
+    <loader id="n2_lr5d" name="card_2" xy="0,58" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale"/>
+    <loader id="n1_lr5d" name="card_1" xy="0,117" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" fill="scale"/>
+    <group id="n4_lr5d" name="n4" xy="0,0" size="58,175"/>
+    <graph id="n5_m25s" name="n5" xy="0,0" size="58,175" visible="false" type="rect" lineColor="#00000000" fillColor="#4d000000">
      <gearDisplay controller="c1" pages="1"/>
      <relation target="n4_lr5d" sidePair="width-width,height-height"/>
    </graph>
-    <graph id="n6_jl3i" name="n6" xy="0,84" size="42,42" type="rect" lineColor="#00000000" fillColor="#4d000000" corner="3">
+    <graph id="n6_jl3i" name="n6" xy="0,84" size="42,42" visible="false" type="rect" lineColor="#00000000" fillColor="#4d000000" corner="3">
      <gearDisplay controller="c2" pages="1"/>
    </graph>
  </displayList>
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Fz_0_4.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Fz_0_4.xml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,168">
+<component size="58,235">
  <displayList>
-    <loader id="n5_lr5d" name="card_4" xy="0,0" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" autoSize="true" clearOnPublish="true"/>
-    <loader id="n3_lr5d" name="card_3" xy="0,42" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" autoSize="true" clearOnPublish="true"/>
-    <loader id="n2_lr5d" name="card_2" xy="0,84" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" autoSize="true" clearOnPublish="true"/>
-    <loader id="n1_lr5d" name="card_1" xy="0,126" pivot="0.5,0.5" size="42,42" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" autoSize="true" clearOnPublish="true"/>
-    <group id="n4_lr5d" name="n4" xy="0,0" size="42,168"/>
+    <loader id="n5_lr5d" name="card_4" xy="0,1" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" fill="scale" clearOnPublish="true"/>
+    <loader id="n3_lr5d" name="card_3" xy="0,59" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" fill="scale" clearOnPublish="true"/>
+    <loader id="n2_lr5d" name="card_2" xy="0,117" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" fill="scale" clearOnPublish="true"/>
+    <loader id="n1_lr5d" name="card_1" xy="0,176" pivot="0.5,0.5" size="58,58" group="n4_lr5d" rotation="180" url="ui://lkq9ne9speuq8" fill="scale" clearOnPublish="true"/>
+    <group id="n4_lr5d" name="n4" xy="0,1" size="58,233"/>
  </displayList>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Gcm_OutCard.xml
@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="82,243">
+<component size="164,486">
  <displayList>
-    <image id="n2_ddb9" name="show_di_bg" src="peuqa" fileName="component/cards/zipai_di_bg.png" xy="-29,-28" size="136,311">
+    <image id="n2_ddb9" name="show_di_bg" src="peuqa" fileName="component/cards/zipai_di_bg.png" xy="-58,-56" size="272,622">
      <relation target="n1_wyal" sidePair="width-width%,height-height%,center-center%,middle-middle%"/>
    </image>
-    <loader id="n1_wyal" name="icon" xy="0,0" size="82,243" url="ui://lkq9ne9speuqb" fill="scale" shrinkOnly="true" clearOnPublish="true"/>
+    <loader id="n1_wyal" name="icon" xy="0,0" size="164,486" url="ui://lkq9ne9speuqb" fill="scale" clearOnPublish="true"/>
  </displayList>
  <transition name="mopai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="162.439,481.374" duration="7"/>
    <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-365,-40" endValue="0,-1" duration="7"/>
    <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@ -15,7 +15,7 @@
    <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
  </transition>
  <transition name="mopai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="162.22,480.724" duration="7"/>
    <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="300,50" endValue="0,0" duration="7"/>
    <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@ -23,7 +23,7 @@
    <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
  </transition>
  <transition name="mopai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="15,44" endValue="162.22,480.724" duration="7"/>
    <item time="0" type="Size" target="n2_ddb9" value="-,-"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="300,0" endValue="0,0" duration="7"/>
    <item time="0" type="XY" target="n2_ddb9" value="-,-"/>
@ -31,37 +31,37 @@
    <item time="7" type="XY" target="n2_ddb9" value="-,-"/>
  </transition>
  <transition name="cpai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="163.129,483.418" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="240,100" endValue="0,0" duration="7"/>
  </transition>
  <transition name="cpai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="162.731,482.239" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-180,280" endValue="0,0" duration="7"/>
  </transition>
  <transition name="cpai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="82,243" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="166.018,491.981" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-189,149" endValue="0,0" duration="7"/>
  </transition>
  <transition name="mopai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="82,243" duration="5"/>
-    <item time="0" type="Size" target="n2_ddb9" tween="true" startValue="31.2,56.19" endValue="136,312" duration="5"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="163.129,483.418" duration="5"/>
+    <item time="0" type="Size" target="n2_ddb9" tween="true" startValue="31.2,56.19" endValue="275.588,632.231" duration="5"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="-250,0" endValue="0,0" duration="5"/>
-    <item time="0" type="XY" target="n2_ddb9" tween="true" startValue="-258,-5" endValue="-30,-31" duration="5"/>
+    <item time="0" type="XY" target="n2_ddb9" tween="true" startValue="-258,-5" endValue="-61,-62" duration="5"/>
  </transition>
  <transition name="cpai4">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="82,243" duration="4"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="17,44" endValue="163.287,483.887" duration="4"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="295,252" endValue="0,0" duration="4"/>
  </transition>
  <transition name="qipai1">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="82,243" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.954,482.9" endValue="0,0" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="216,677" duration="7"/>
  </transition>
  <transition name="qipai2">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="82,243" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="162.246,480.802" endValue="0,0" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="-254,259" duration="7"/>
  </transition>
  <transition name="qipai3">
-    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="82,243" endValue="0,0" duration="7"/>
+    <item time="0" type="Size" target="n1_wyal" tween="true" startValue="163.242,483.754" endValue="0,0" duration="7"/>
    <item time="0" type="XY" target="n1_wyal" tween="true" startValue="0,0" endValue="466,248" duration="7"/>
  </transition>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/cards/Qipai.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="42,42">
+<component size="82,82">
  <displayList>
-    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="42,42" rotation="180" autoSize="true"/>
+    <loader id="n0_lr5d" name="icon" xy="0,0" pivot="0.5,0.5" size="100,82" rotation="180" fill="scale"/>
  </displayList>
  <transition name="t0">
    <item time="0" type="Scale" target="n0_lr5d" tween="true" startValue="1.5,1.5" endValue="1,1" duration="6"/>
--- a/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/chi_peng_effect/Btn_pass_new.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="180,180" pivot="0.5,0.5" extention="Button">
+<component size="260,260" pivot="0.5,0.5" extention="Button">
  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
  <displayList>
-    <image id="n9_x8lf" name="n9" src="peuqo" fileName="component/chi_peng_effect/newop.png" xy="27,25" size="125,129"/>
+    <image id="n9_x8lf" name="n9" src="peuqo" fileName="component/chi_peng_effect/newop.png" xy="3,28" size="180,180"/>
  </displayList>
-  <Button downEffect="scale" downEffectValue=".8"/>
+  <Button downEffect="scale" downEffectValue="0.8"/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/images/ting.png
+++ b/wb_new_ui/assets/Main_RunBeard/component/images/ting.png
--- a/wb_new_ui/assets/Main_RunBeard/component/niao/btn_niao.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/niao/btn_niao.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="250,90" extention="Button">
+<component size="400,169" extention="Button">
  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
  <displayList>
-    <image id="n4_99we" name="n4" src="peuq5r" fileName="component/Main/images/daniao.png" xy="0,0" size="250,90"/>
+    <image id="n4_99we" name="n4" src="peuq5r" fileName="component/Main/images/daniao.png" xy="-2,2"/>
  </displayList>
  <Button/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/niao/btn_noniao.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/niao/btn_noniao.xml
@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="250,90" extention="Button">
+<component size="400,169" extention="Button">
  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
  <displayList>
-    <image id="n3_99we" name="n3" src="peuq5t" fileName="component/Main/images/budaniao.png" xy="0,0" size="250,90"/>
+    <image id="n3_99we" name="n3" src="peuq5t" fileName="component/Main/images/budaniao.png" xy="0,0" size="400,169"/>
  </displayList>
  <Button/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/option/Btn_fztip.xml
@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="180,180" pivot="0.5,0.5" extention="Button">
+<component size="260,260" pivot="0.5,0.5" extention="Button">
  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
  <controller name="hupai" pages="0,,1," selected="0"/>
  <displayList>
-    <loader id="n4_lr5d" name="icon" xy="22,22" size="135,135" url="ui://lkq9ne9speuqp" align="center" vAlign="middle"/>
+    <loader id="n4_lr5d" name="icon" xy="0,0" size="260,260" url="ui://lkq9ne9speuqp" align="center" vAlign="middle" fill="scale"/>
    <component id="n5_rjio" name="hupai" src="peuq9d" fileName="component/option/component/card/Btn_Card.xml" xy="28,-115">
      <gearDisplay controller="hupai" pages="1"/>
    </component>
  </displayList>
-  <Button downEffect="scale" downEffectValue=".8"/>
+  <Button downEffect="scale" downEffectValue="0.8"/>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/component/option/component/card/Gcm_OutCard.xml
+++ b/wb_new_ui/assets/Main_RunBeard/component/option/component/card/Gcm_OutCard.xml
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="78,235">
+<component size="156,470">
  <displayList>
-    <loader id="n0_lr5d" name="icon" xy="0,0" size="78,235" url="ui://v6yvqp7wlr5d1a" autoSize="true"/>
+    <loader id="n0_lr5d" name="icon" xy="0,0" size="156,470" url="ui://lkq9ne9speuqb" fill="scale"/>
  </displayList>
 </component>
--- a/wb_new_ui/assets/Main_RunBeard/package.xml
+++ b/wb_new_ui/assets/Main_RunBeard/package.xml
@ -100,7 +100,7 @@
    <component id="peuq2o" name="FzEffect1.xml" path="/component/effect/" exported="true"/>
    <component id="peuq2p" name="FzEffect2.xml" path="/component/effect/" exported="true"/>
    <component id="peuq2q" name="Hu_Tip.xml" path="/component/HuTip/" exported="true"/>
-    <image id="peuq2r" name="ting.png" path="/component/images/" scale="9grid" scale9grid="107,76,44,2"/>
+    <image id="peuq2r" name="ting.png" path="/component/images/" scale="9grid" scale9grid="79,75,71,6"/>
    <component id="peuq2s" name="Qipais.xml" path="/component/Main/" exported="true"/>
    <image id="peuq2t" name="zipai02.png" path="/component/images/" exported="true"/>
    <image id="peuq2u" name="zipaic2.png" path="/component/images/" exported="true"/>
@ -996,7 +996,6 @@
    <component id="syh3rl" name="VoiceMask.xml" path="/component/Main/" exported="true"/>
    <image id="syh3rm" name="game_start.png" path="/image/main_2/"/>
    <image id="h5b1rn" name="floorTop.png" path="/component/Main/images/"/>
-    <image id="h5b1rp" name="safe.png" path="/component/Main/images/"/>
    <image id="h5b1rr" name="main_2_choice.png" path="/image/main_2/" exported="true" scale="9grid" scale9grid="92,0,184,334"/>
    <image id="h5b1rs" name="game_bar_di.png" path="/component/setting/images/newsetting/"/>
    <image id="h5b1rt" name="game_bar_top.png" path="/component/setting/images/newsetting/" scale="9grid" scale9grid="154,12,308,24"/>
@ -1005,6 +1004,7 @@
    <image id="o0c1rx" name="game_rule.png" path="/image/main_2/"/>
    <image id="o0c1ry" name="info_player_bg.png" path="/component/Main/new_ui/"/>
    <image id="wp68rz" name="1492661c-8834-41e0-a028-26a60dc41556.png" path="/component/Main/"/>
+    <image id="106jcs3" name="safe.png" path="/component/Main/images/"/>
  </resources>
  <publish name="Main_RunBeard" path="..\wb_unity_pro\Assets\ART\base\main_zipai\ui" packageCount="2"/>
 </packageDescription>
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_1.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_2.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_3.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_4.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_atlas0_5.png
--- a/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
+++ b/wb_unity_pro/Assets/ART/base/main_zipai/ui/Main_RunBeard_fui.bytes
--- a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png
+++ b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_atlas0_1.png
--- a/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes
+++ b/wb_unity_pro/Assets/ART/extend/zipai/fanpaofa/ui/Extend_Poker_FanPaoFa_fui.bytes