Merge branch 'master' into lps/missFile-M

# Conflicts:
#	lua_probject/base_project/Game/View/MissileSender.lua
#	lua_probject/base_project/Game/View/playerDetailView.lua
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas0_10.png.meta
#	wb_unity_pro/Assets/ART/base/common/ui/Common_atlas_qmc17jbz.png.meta
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta
#	wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_fui.bytes

lua_probject/base_project/Game/View/ViewUtil.lua

@@ -199,7 +199,7 @@ function get_majiang_prefix(game_id)
         end
         ct = ct_data[tostring(game_id)] or 0
     end
-    local prefix = ct == 0 and "" or "a"
+    local prefix = ct == 0 and "" or "b"
     --printlog("get_majiang_prefix===>>>",prefix,ct)
     return prefix
 end

lua_probject/base_project/Game/View/playerDetailView.lua

@@ -32,7 +32,6 @@ function playerDetailView:Show(player)
 end
 
 function playerDetailView:Init()
-    local selfUser = DataManager.SelfUser
     self.tex_name = self._view:GetChild("tex_name")
     self.tex_ip = self._view:GetChild("tex_ip")
     self.tex_id = self._view:GetChild("tex_id")

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

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    if result then
+        result.cardList = json.decode(result.cardList)
+        table.sort(result.cardList)
+    end
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
-        local _gamectr = ControllerManager.GetController(GameController)
+        if isWitness and isWitness == 1 then
-        _gamectr:PlayerReady()
+            if self._witnessCallbak then
-        self:DestroyWithCallback()
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
+            local _gamectr = ControllerManager.GetController(GameController)
+            _gamectr:PlayerReady()
+            self:DestroyWithCallback()
+        end
     end)
 
 
@@ -71,9 +90,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
-            local _gamectr = ControllerManager.GetController(GameController)
+            if isWitness and isWitness == 1 then
-            _gamectr:PlayerReady()
+                if self._witnessCallbak then
-            self:DestroyWithCallback()
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
+                local _gamectr = ControllerManager.GetController(GameController)
+                _gamectr:PlayerReady()
+                self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -103,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
     local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
+    self.list_lastCard.numItems = #result.cardList
+    self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
     for i = 1, peopleNum do
         local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
 
@@ -191,7 +219,7 @@ function M:fillResult0(room, peopleNum, result)
             end
         end
         handCardList.numItems = handInfoNum
-        allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+        allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
 
         if infoList.seat == room.self_player.seat then
             isMeCtr.selectedIndex = 1
@@ -244,7 +272,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -288,6 +318,15 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/b202_%d", data)
+    print("lingmeng icon", obj.icon)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

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

@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    if evt_data.result then
+        evt_data.result.cardList = evt_data.cardList
+    end
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

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

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    if result then
+        result.cardList = json.decode(result.cardList)
+        table.sort(result.cardList)
+    end
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
-        local _gamectr = ControllerManager.GetController(GameController)
+        if isWitness and isWitness == 1 then
-        _gamectr:PlayerReady()
+            if self._witnessCallbak then
-        self:DestroyWithCallback()
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
+            local _gamectr = ControllerManager.GetController(GameController)
+            _gamectr:PlayerReady()
+            self:DestroyWithCallback()
+        end
     end)
 
 
@@ -71,9 +90,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
-            local _gamectr = ControllerManager.GetController(GameController)
+            if isWitness and isWitness == 1 then
-            _gamectr:PlayerReady()
+                if self._witnessCallbak then
-            self:DestroyWithCallback()
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
+                local _gamectr = ControllerManager.GetController(GameController)
+                _gamectr:PlayerReady()
+                self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -103,6 +129,8 @@ function M:fillResult0(room, peopleNum, result)
     local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
+    self.list_lastCard.numItems = #result.cardList
+    self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
     for i = 1, peopleNum do
         local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
 
@@ -186,12 +214,13 @@ function M:fillResult0(room, peopleNum, result)
         handCardList:SetVirtual()
         handCardList.itemRenderer = function(index, obj)
             obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
+            print("obj.icon")
             if room.jing == infoList.hand_card[index + 1] then
                 obj:GetController('jing').selectedIndex = 1
             end
         end
         handCardList.numItems = handInfoNum
-        allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+        allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
 
         if infoList.seat == room.self_player.seat then
             isMeCtr.selectedIndex = 1
@@ -240,7 +269,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -284,6 +315,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

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

@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    if evt_data.result then
+        evt_data.result.cardList = evt_data.cardList
+    end
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

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

@@ -47,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback, isWitness, witne
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    if result then
+        result.cardList = json.decode(result.cardList)
+        table.sort(result.cardList)
+    end
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -116,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
     local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
+    self.list_lastCard.numItems = #result.cardList
+    self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
     for i = 1, peopleNum do
         local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
 
@@ -302,6 +315,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

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

@@ -328,11 +328,14 @@ end
 
 function M:OneventResult1(evt_data)
     local over = evt_data.type
-    print("OneventResult1")
+    printlog("OneventResult1")
     pt(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    if evt_data.result then
+        evt_data.result.cardList = evt_data.cardList
+    end
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

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

@@ -31,12 +31,13 @@ end
 --     end
 -- end
 
-function M:InitData(over, room, result, total_result, callback)
+function M:InitData(over, room, result, total_result, callback, isWitness, witnessCallbak)
     -- print("===============================InitData===========================", over, room, result, total_result)
     -- pt(room)
     -- pt(result)
     -- Pt(total_result)
     self._callback = callback
+    self._witnessCallbak = witnessCallbak
     local showClearMainBtn = self._view:GetChild("btn_showClearMain")
     local nextRoundBtn = self._view:GetChild("btn_nextRound")
     local nextRoundBtn2 = self._view:GetChild("Btn_NextRound2")
@@ -46,6 +47,17 @@ function M:InitData(over, room, result, total_result, callback)
     local playerNum = self._view:GetController("playerNum")
     local showBtnTypeCtr = self._view:GetController("showType")
 
+    if result then
+        result.cardList = json.decode(result.cardList)
+        table.sort(result.cardList)
+    end
+    self.list_lastCard = self._view:GetChild('list_lastCard')
+
+    self.list_lastCard:SetVirtual()
+    self.list_lastCard.itemRenderer = function(index, obj)
+        self:RemindCardRender(result.cardList[index + 1], obj)
+    end
+
     local peopleNum = room.room_config.people_num
 
     playerNum.selectedIndex = peopleNum - 2
@@ -55,9 +67,16 @@ function M:InitData(over, room, result, total_result, callback)
     end)
 
     nextRoundBtn.onClick:Set(function()
-        local _gamectr = ControllerManager.GetController(GameController)
+        if isWitness and isWitness == 1 then
-        _gamectr:PlayerReady()
+            if self._witnessCallbak then
-        self:DestroyWithCallback()
+                self._witnessCallbak()
+            end
+            self:DestroyWithCallback()
+        else
+            local _gamectr = ControllerManager.GetController(GameController)
+            _gamectr:PlayerReady()
+            self:DestroyWithCallback()
+        end
     end)
 
     endRound.onClick:Set(function()
@@ -69,9 +88,16 @@ function M:InitData(over, room, result, total_result, callback)
         _overCtr.selectedIndex = 0
         self:fillResult0(room, peopleNum, result)
         nextRoundBtn2.onClick:Set(function()
-            local _gamectr = ControllerManager.GetController(GameController)
+            if isWitness and isWitness == 1 then
-            _gamectr:PlayerReady()
+                if self._witnessCallbak then
-            self:DestroyWithCallback()
+                    self._witnessCallbak()
+                end
+                self:DestroyWithCallback()
+            else
+                local _gamectr = ControllerManager.GetController(GameController)
+                _gamectr:PlayerReady()
+                self:DestroyWithCallback()
+            end
         end)
     elseif over == 1 then
         showBtnTypeCtr.selectedIndex = 1
@@ -101,6 +127,8 @@ function M:fillResult0(room, peopleNum, result)
     local gamePlay = mode:LoadConfigToDetail(json.encode(room.room_config.config))
     self._view:GetChild("Label_GamePlay").title = string.format("第%s/%s局,%s", room.curren_round,
         room.room_config.round, gamePlay)
+    self.list_lastCard.numItems = #result.cardList
+    self._view:GetChild('n147').text = string.format("剩余%d张未显示", #result.cardList)
     for i = 1, peopleNum do
         local playerInfoComp = self._view:GetChild(string.format("Comp_Player%d", i))
 
@@ -184,14 +212,13 @@ function M:fillResult0(room, peopleNum, result)
         table.sort(infoList.hand_card, self.HandCardSortAndJing)
         handCardList:SetVirtual()
         handCardList.itemRenderer = function(index, obj)
-            obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(),
+            obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), infoList.hand_card[index + 1])
-                infoList.hand_card[index + 1])
             if room.jing == infoList.hand_card[index + 1] then
                 obj:GetController('jing').selectedIndex = 1
             end
         end
         handCardList.numItems = handInfoNum
-        allCardsList.width = 172 * fzInfoNum + 60 + (handInfoNum - 1) * 56 + 36 * (fzInfoNum)
+        allCardsList.width = 234 * fzInfoNum + 78 + (handInfoNum - 1) * 74 + 36 * (fzInfoNum)
 
         if infoList.seat == room.self_player.seat then
             isMeCtr.selectedIndex = 1
@@ -240,7 +267,9 @@ end
 function M:fillResult1(room, peopleNum, total_result)
     local gameNameAndRoomIDText = self._view:GetChild("Text_GameNameAndRoomID")
     local familyIDText = self._view:GetChild("Text_FamilyID")
-    for i, v in pairs(room.self_player.self_user.games) do
+    print("lingmeng fillResult1")
+    pt(room)
+    for i, v in pairs(DataManager.SelfUser.games) do
         if v.game_id == room.game_id then
             gameNameAndRoomIDText.text = string.format("%s  房号:%s", v.name, room.room_id)
         end
@@ -284,6 +313,14 @@ function M:fillHead(url, view)
     ImageLoad.Load(url, view:GetChild("Btn_Head")._iconObject)
 end
 
+function M:RemindCardRender(data, obj)
+    local room = DataManager.CurrenRoom
+    obj.icon = string.format("ui://Main_Majiang/%s202_%d", self:GetPrefix(), data)
+    if room.jing == data then
+        obj:GetController('jing').selectedIndex = 1
+    end
+end
+
 function M.HandCardSortAndJing(a, b)
     local jing = DataManager.CurrenRoom.jing
     if a == jing or b == jing then

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

@@ -332,6 +332,9 @@ function M:OneventResult1(evt_data)
     --0：小结算   1：小大结算    2：大结算
     self._room._reload_flag = false
     self._room.playing = false
+    if evt_data.result then
+        evt_data.result.cardList = evt_data.cardList
+    end
     if 0 == over then
         local result = evt_data.result
         self._cacheEvent:Enqueue(function()

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

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="210,73" pivot="0.5,0.5" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <controller name="cStyle" pages="0,,1," selected="0">
+    <remark page="0" value="解散"/>
+    <remark page="1" value="退出"/>
+  </controller>
+  <displayList>
+    <image id="n0_xblm" name="n0" src="mwqzckx" fileName="Main_new/Main/Image/dismiss_room.png" xy="0,0">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n1_qncf" name="n1" src="mwqzcky" fileName="Main_new/Main/Image/exit_room.png" xy="0,0" size="210,73">
+      <gearDisplay controller="cStyle" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio" downEffect="scale" downEffectValue="0.9"/>
+</component>

wb_new_ui/assets/Extend_Poker_RunFastNew/RunFast_Main_New_2.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" designImageAlpha="100" designImageLayer="1">
-  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="3"/>
+  <controller name="state" pages="0,准备状态,1,游戏状态,2,,3,回放" selected="0"/>
   <controller name="sdk" pages="0,,1," selected="0"/>
   <controller name="action" pages="2,空,0,准备,1,开始" selected="0"/>
   <controller name="time" pages="0,,1,,2,,3," selected="0"/>
@@ -122,11 +122,11 @@
     </component>
     <graph id="n102_t2e2" name="n109" xy="342,-1343" size="1670,834" visible="false" type="rect" lineSize="0" fillColor="#80000000"/>
     <component id="n101_t2e2" name="tuoguanzhong" src="prgzew" fileName="component/tuoguanzhong.xml" xy="996,2338" visible="false"/>
-    <component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2372,294" group="n121_ckvb">
+    <component id="n18" name="player_info2" src="ckvbcje" fileName="Main_New/PlayerHead_2.xml" xy="2336,32" group="n121_ckvb">
       <gearXY controller="state" pages="0,1,2,3" values="2336,32|2336,32|2336,32|2372,294"/>
       <relation target="" sidePair="right-right,middle-middle"/>
     </component>
-    <component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="9,721" size="183,187" group="n121_ckvb" aspect="true">
+    <component id="n7" name="player_info1" src="ckvbcim" fileName="Main_New/PlayerHead_1.xml" xy="80,495" size="183,187" group="n121_ckvb" aspect="true">
       <gearXY controller="state" pages="0,1,2,3" values="80,495|80,495|80,495|9,721"/>
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
@@ -136,7 +136,7 @@
       <gearLook controller="state" pages="3" values="1,0,0,1" default="1,0,0,1"/>
       <relation target="" sidePair="bottom-bottom"/>
     </component>
-    <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="460,464" group="n122_ckvb" touchable="false">
+    <component id="n71_sdax" name="player_card_info_2" src="ckvbcjo" fileName="Main_New/Player_card_info_2.xml" xy="424,202" group="n122_ckvb" touchable="false">
       <gearDisplay controller="state" pages="1,3"/>
       <relation target="n18" sidePair="right-left,middle-middle"/>
     </component>
@@ -151,6 +151,7 @@
       <gearDisplay controller="action" pages="0,1"/>
       <relation target="" sidePair="bottom-middle"/>
     </component>
+    <component id="n149_mwqz" name="btn_closeRoom" src="mwqzckw" fileName="Main_New/Component/btn_gameDismissRoom.xml" xy="1300,479" size="360,126" group="n126_ckvb" visible="false"/>
     <group id="n126_ckvb" name="readyBtn" xy="871,479" size="789,332" advanced="true">
       <gearDisplay controller="state" pages="0,2"/>
     </group>

wb_new_ui/assets/Extend_Poker_RunFastNew/package.xml

@@ -506,6 +506,9 @@
     <font id="eqmdckt" name="RunFastShengYu.fnt" path="/bmtFont_shengyuNum/" exported="true"/>
     <component id="lj2ncku" name="btn_mul.xml" path="/Main_new/Main/Component/"/>
     <image id="lj2nckv" name="Record2_08.png" path="/Main_new/Main/Image/"/>
+    <component id="mwqzckw" name="btn_gameDismissRoom.xml" path="/Main_New/Component/"/>
+    <image id="mwqzckx" name="dismiss_room.png" path="/Main_New/Component/"/>
+    <image id="mwqzcky" name="exit_room.png" path="/Main_New/Component/"/>
   </resources>
   <publish name="Extend_Poker_RunFastNew" path="..\wb_unity_pro\Assets\ART\extend\poker\runfast\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_Card_Hu.xml

@@ -10,7 +10,7 @@
   <controller name="laizi" pages="0,,1," selected="0"/>
   <controller name="jing" pages="0,,1," selected="0"/>
   <displayList>
-    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://Main_MaJiang/202_101" fill="scaleFree" clearOnPublish="true">
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="60,84" url="ui://Main_MaJiang/202_101" fill="scaleFree">
       <gearXY controller="button" pages="0,1" values="0,0|-3,-22" tween="true"/>
       <gearColor controller="quese" pages="1" values="#666666" default="#ffffff"/>
       <relation target="" sidePair="width-width,height-height"/>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Btn_RemindCard.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="78,84" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="jing" pages="0,,1," selected="0"/>
+  <controller name="move" pages="0,,1," selected="0"/>
+  <displayList>
+    <loader id="n3_hp0b" name="icon" xy="0,0" size="78,84" aspect="true" url="ui://Main_Majiang/b201_101" fill="scaleFree">
+      <gearXY controller="button" pages="0,1" values="0,0|0,-35"/>
+      <gearLook controller="move" pages="1" values="0.3,0,0,1" default="1,0,0,1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
+    <image id="n12_k1od" name="jing" src="pn9mt8" fileName="Main_new/Main/Image/Group 38.png" xy="3,-1" size="5,0" aspect="true">
+      <gearDisplay controller="jing" pages="1"/>
+      <gearXY controller="button" pages="0,1" values="3,-1|0,-22" duration=".1"/>
+      <gearLook controller="move" pages="1" values="0.3,0,0,0" default="1,0,0,0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Check"/>
+</component>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_3.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="172,84">
+<component size="234,84">
   <displayList>
-    <component id="n0_yry6" name="Btn_Card1" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="0,0"/>
+    <component id="n0_yry6" name="Btn_Card1" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="0,0"/>
-    <component id="n1_yry6" name="Btn_Card2" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,0"/>
+    <component id="n1_yry6" name="Btn_Card2" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,0"/>
-    <component id="n2_yry6" name="Btn_Card3" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="112,0"/>
+    <component id="n2_yry6" name="Btn_Card3" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="156,0"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_Clearing_FZ_4.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="172,84">
+<component size="234,84">
   <displayList>
-    <component id="n0_yry6" name="Btn_Card1" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="0,0"/>
+    <component id="n0_yry6" name="Btn_Card1" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="0,0"/>
-    <component id="n1_yry6" name="Btn_Card2" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,0"/>
+    <component id="n1_yry6" name="Btn_Card2" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,0"/>
-    <component id="n2_yry6" name="Btn_Card3" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="112,0"/>
+    <component id="n2_yry6" name="Btn_Card3" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="156,0"/>
-    <component id="n3_yry6" name="Btn_Card4" src="yry6z3" fileName="Main_new_2/Clearing/Component/Btn_Card_Hu.xml" xy="56,-12"/>
+    <component id="n3_yry6" name="Btn_Card4" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="78,-12"/>
   </displayList>
 </component>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_HandCard.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="732,84">
+<component size="967,84">
   <displayList>
-    <list id="n0_yry6" name="list" xy="0,0" size="732,84" layout="row" overflow="scroll" colGap="-4" defaultItem="ui://v0j9abjyyry6z3" autoClearItems="true">
+    <list id="n0_yry6" name="list" xy="0,0" size="969,84" layout="row" overflow="scroll" colGap="-4" defaultItem="ui://v0j9abjymwqz1bk" autoClearItems="true">
       <relation target="" sidePair="width-width,height-height"/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/Component/Comp_PlayInfo.xml

@@ -17,14 +17,14 @@
     <text id="n5_yry6" name="text_huShow" xy="503,4" size="522,76" font="ui://27vd145bh35o7ik0" fontSize="58" color="#fcd696" leading="0" bold="true" text="平胡dsad 实打实收">
       <relation target="n2_yry6" sidePair="left-right"/>
     </text>
-    <list id="n6_yry6" name="list_allCards" xy="252,90" size="732,84" layout="row" scroll="horizontal" colGap="36" vAlign="middle" autoClearItems="true">
+    <list id="n6_yry6" name="list_allCards" xy="253,91" size="967,84" layout="row" scroll="horizontal" colGap="36" vAlign="middle" autoClearItems="true">
       <relation target="" sidePair="left-left"/>
       <item url="ui://v0j9abjyyry6zj"/>
     </list>
-    <component id="n7_yry6" name="Btn_Card_Hu" src="yry6z3" fileName="Main_new/Clearing/Component/Btn_Card_Hu.xml" xy="1022,90">
+    <component id="n7_yry6" name="Btn_Card_Hu" src="mwqz1bk" fileName="Main_new/Clearing/Component/Btn_RemindCard.xml" xy="1258,89">
       <relation target="n6_yry6" sidePair="left-right"/>
     </component>
-    <list id="n8_yry6" name="list_JiangMa" xy="1314,36" size="206,138" layout="flow_hz" overflow="scroll" lineGap="18" colGap="-3" defaultItem="ui://v0j9abjyyry6zk">
+    <list id="n8_yry6" name="list_JiangMa" xy="1424,36" size="206,138" layout="flow_hz" overflow="scroll" lineGap="18" colGap="-3" defaultItem="ui://v0j9abjyyry6zk">
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Main_Majiang/Main_new/Clearing/clearing.xml

@@ -2,7 +2,7 @@
 <component size="2532,1170" bgColor="#000000">
   <controller name="over" pages="0,,1," selected="0"/>
   <controller name="main" pages="0,,1," selected="1"/>
-  <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="1"/>
+  <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="0"/>
   <controller name="showType" pages="0,,1," selected="0"/>
   <displayList>
     <image id="n110_qt01" name="n110" src="qt01ys" fileName="Main_new/Main/Image/Rectangle 212.png" xy="559,451" group="n113_qt01"/>
@@ -19,36 +19,36 @@
     <image id="n115_yry6" name="n115" src="yry6yw" fileName="Main_new/Clearing/Image/final_result_title 1.png" xy="540,-15" group="n116_yry6">
       <gearDisplay controller="over" pages="0"/>
     </image>
-    <component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="186,117" group="n121_yry6"/>
+    <component id="n118_yry6" name="Label_GamePlay" src="yry6yy" fileName="Main_new/Clearing/Component/Label_GamePlayInfo.xml" xy="185,116" group="n121_yry6"/>
-    <component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2032,1020" group="n121_yry6"/>
+    <component id="n120_yry6" name="Btn_NextRound2" src="yry6yz" fileName="Main_new/Clearing/Component/Btn_NextRound.xml" xy="2031,1019" group="n121_yry6"/>
-    <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,219" group="n121_yry6">
+    <component id="n122_yry6" name="Comp_Player1" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,218" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
     </component>
-    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,516" group="n121_yry6">
+    <component id="n123_yry6" name="Comp_Player2" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,590" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
-      <gearXY controller="playerNum" pages="0,1" values="96,591|96,516" default="96,417"/>
+      <gearXY controller="playerNum" pages="0,1" values="95,590|96,516" default="96,417"/>
     </component>
-    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,813" group="n121_yry6">
+    <component id="n124_yry6" name="Comp_Player3" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,614" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
-      <gearXY controller="playerNum" pages="1" values="96,813" default="96,615"/>
+      <gearXY controller="playerNum" pages="0,1" values="95,614|96,813" default="96,615"/>
     </component>
-    <text id="n141_kxhm" name="Text_BoJing" xy="1942,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
+    <text id="n141_kxhm" name="Text_BoJing" xy="1941,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="精分">
       <relation target="" sidePair=""/>
     </text>
-    <text id="n142_kxhm" name="Text_Gang" xy="2052,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
+    <text id="n142_kxhm" name="Text_Gang" xy="2051,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#fbbb46" align="center" vAlign="middle" leading="0" bold="true" text="杠分">
       <relation target="" sidePair=""/>
     </text>
-    <text id="n143_kxhm" name="Text_Hu" xy="2166,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
+    <text id="n143_kxhm" name="Text_Hu" xy="2165,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#5dbd24" align="center" vAlign="middle" leading="0" bold="true" text="胡分">
       <relation target="" sidePair="top-top"/>
     </text>
-    <text id="n144_kxhm" name="Text_Tatal" xy="2287,150" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
+    <text id="n144_kxhm" name="Text_Tatal" xy="2286,149" size="86,54" group="n121_yry6" font="ui://27vd145bh35o7ik0" fontSize="40" color="#c9372e" align="center" vAlign="middle" leading="0" bold="true" text="总分">
       <relation target="" sidePair="top-top"/>
     </text>
-    <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="96,813" group="n121_yry6">
+    <component id="n125_yry6" name="Comp_Player4" src="yry6zn" fileName="Main_new/Clearing/Component/Comp_PlayInfo.xml" xy="95,812" group="n121_yry6">
       <gearDisplay controller="playerNum" pages="2"/>
-      <gearXY controller="playerNum" default="96,813"/>
+      <gearXY controller="playerNum" pages="0" values="95,812" default="96,813"/>
     </component>
-    <list id="n145_uans" name="list_lastCard" xy="303,1038" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjyyry6z3" vAlign="middle">
+    <list id="n145_uans" name="list_lastCard" xy="302,1037" size="1256,84" group="n121_yry6" layout="row" overflow="scroll" scroll="horizontal" defaultItem="ui://v0j9abjymwqz1bk" vAlign="middle" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -82,9 +82,9 @@
       <item/>
       <item/>
     </list>
-    <text id="n146_uans" name="n146" xy="192,1056" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/>
+    <text id="n146_uans" name="n146" xy="191,1055" size="88,56" group="n121_yry6" font="Alimama FangYuanTi VF" fontSize="42" color="#c06a2d" text="剩牌"/>
-    <text id="n147_uans" name="n147" xy="1638,1056" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/>
+    <text id="n147_uans" name="n147" xy="1637,1055" size="302,56" group="n121_yry6" fontSize="42" color="#c06a2d" text="剩余50张未显示"/>
-    <group id="n121_yry6" name="over0" xy="96,117" size="2340,1017" group="n116_yry6" advanced="true">
+    <group id="n121_yry6" name="over0" xy="95,116" size="2340,1017" group="n116_yry6" advanced="true">
       <gearDisplay controller="over" pages="0"/>
     </group>
     <graph id="n126_yry6" name="Bg_over1" xy="185,183" size="2160,864" group="n140_yry6" type="rect" lineSize="0" fillColor="#ff9c8f70" corner="54"/>
@@ -109,15 +109,15 @@
     <component id="n134_yry6" name="Btn_Share" src="yry6ze" fileName="Main_new/Clearing/Component/Btn_Share.xml" xy="1425,996" group="n140_yry6"/>
     <component id="n133_yry6" name="Btn_EndRound" src="yry6zd" fileName="Main_new/Clearing/Component/Btn_EndRound.xml" xy="1761,996" group="n140_yry6"/>
     <component id="n135_yry6" name="Btn_Copy" src="yry6zf" fileName="Main_new/Clearing/Component/Btn_Copy.xml" xy="2100,996" group="n140_yry6"/>
-    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="333,228" group="n140_yry6">
+    <component id="n136_yry6" name="Comp_ResultInfo1" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="540,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
       <gearXY controller="playerNum" pages="1,2" values="333,228|333,228" default="540,228"/>
     </component>
-    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1035,228" group="n140_yry6">
+    <component id="n137_yry6" name="Comp_ResultInfo2" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1530,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="0,1,2"/>
       <gearXY controller="playerNum" pages="0,1" values="1530,228|1035,228" default="801,228"/>
     </component>
-    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1737,228" group="n140_yry6">
+    <component id="n138_yry6" name="Comp_ResultInfo3" src="yry6z5" fileName="Main_new/Clearing/Component/Comp_ResultInfo.xml" xy="1269,228" group="n140_yry6">
       <gearDisplay controller="playerNum" pages="1,2"/>
       <gearXY controller="playerNum" pages="1" values="1737,228" default="1269,228"/>
     </component>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1454,6 +1454,7 @@
     <movieclip id="otcu1bh" name="Missile_egg.jta" path="/Missile/" exported="true" atlas="10"/>
     <movieclip id="otcu1bi" name="Missile_flower.jta" path="/Missile/" exported="true" atlas="10"/>
     <image id="qncf1bj" name="exit_room.png" path="/Main_new/Main/Image/"/>
+    <component id="mwqz1bk" name="Btn_RemindCard.xml" path="/Main_new/Clearing/Component/" exported="true"/>
   </resources>
   <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
 </packageDescription>

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

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1ecfbe703e98add438a492e9c66f3071
+guid: 7aef48e6dc5a8c6498eb76cd41e5f0e9
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -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_qmc17jbz.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f099c2603d49045418fa148ddf4eab4f
+guid: d7e6544ba54171b43948e06b99591294
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -88,5 +88,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-  assetBundleName: base/common/af187115a4824290240734622129b80b
+  assetBundleName: 
   assetBundleVariant: 

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

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

wb_unity_pro/Assets/ART/base/main_majiang/ui/Main_Majiang_atlas10.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 790f50fd61a717d4cb8a4ef4de556436
+guid: cb443755a2795ce49878e416e2c55b41
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}