消息记录

lua_probject/base_project/Game/Controller/NewGroupController.lua

@@ -1718,3 +1718,15 @@ function M:WEB_FG_GET_GROUP_DETAIL(groupId, callback)
         callback(res)
     end)
 end
+
+-- 消息记录
+function M:FG_Get_Msg(groupId, callback)
+    local _data = {}
+    _data.id = groupId
+    local _client = ControllerManager.GroupClient
+    _client:send(Protocol.WEB_FG_Get_Mssages, _data, function(res)
+        print("消息记录返回")
+        pt(res)
+        callback(res)
+    end)
+end

lua_probject/base_project/Game/Protocol.lua

@@ -301,6 +301,9 @@ Protocol = {
 
     -- 获取某个家族的详细信息
     WEB_FG_GET_GROUP_DETAIL         = "group/get_groupDetail",
+
+    -- 获取消息记录
+    WEB_FG_Get_Mssages              = "group/get_messages",
     -------------- group-log---------------------
     -- 获取奖励日志
     WEB_FG_GET_REWARDS_LOG          = "group/log/get_reward_log",

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

@@ -1,41 +1,97 @@
 local FamilyMsgRecord = {}
 
+-- m_state : 进入亲友圈(0)退出亲友圈(1)，创建亲友圈(2)，踢出亲友圈(3)
+local function RequestData(self, groupId)
+    local fgCtr = ControllerManager.GetController(NewGroupController)
+    fgCtr:FG_Get_Msg(groupId, function(res)
+        if res.ReturnCode ~= 0 then
+            ViewUtil.ErrorTip(res.ReturnCode)
+            return
+        end
+
+        self.resData = res.Data.messages
+
+        self:ReflashCallBack()
+    end)
+end
+
+local function list_msgRender(self, index, obj)
+    local msg = self.resData[index + 1]
+
+    local tex_msg = obj:GetChild("tex_msg")
+    local tex_time = obj:GetChild("tex_time")
+    local loader_icon = obj:GetChild("loader_icon")
+
+    local msgText = ''
+    if msg.m_state == 0 then
+        msgText = string.format("【%s】被【%s】加入亲友圈", msg.user_name, msg.tag_name)
+
+
+
+    elseif msg.m_state == 1 then
+        msgText = string.format("【%s】退出亲友圈", msg.user_name)
+    elseif msg.m_state == 2 then
+        msgText = string.format("【%s】创建亲友圈", msg.user_name)
+    elseif msg.m_state == 3 then
+        msgText = string.format("【%s】被【%s】踢出亲友圈", msg.user_name, msg.tag_name)
+    end
+
+    tex_msg.text = msgText
+    tex_time.text = os.date('%Y-%m-%d    %H:%M:%S', msg.m_time)
+
+    ImageLoad.Load(msg.m_portrait, loader_icon)
+end
+
 function FamilyMsgRecord.New(callback)
-    setmetatable(FamilyMsgRecord, { __index = BaseWindow })
+    setmetatable(FamilyMsgRecord, { __index = BaseView })
     local inst = setmetatable({}, { __index = FamilyMsgRecord })
-    inst._close_destroy = true
+    inst._full = false
-    inst._full = true
+    inst._scale = true
-    inst._animation = false
+    inst.class = "com_FamilyMsgRecord"
-    inst._full_offset = false
+    BaseView.InitView(inst, 'ui://Family/com_FamilyMsgRecord')
-    inst._anim_pop = 0
-    BaseWindow.init(inst, 'ui://Family/com_FamilyMsgRecord')
     inst:Init()
-    inst._root_view:GetChild("win_mode").visible = false
 
     inst.closeCallback = callback
 
     return inst
 end
 
-function FamilyMsgRecord:Show()
+function FamilyMsgRecord:Show(groupId)
-    BaseWindow.Show(self)
+    BaseView.Show(self)
+    self:Reflash(groupId)
+end
+
+function FamilyMsgRecord:Reflash(groupId)
+    RequestData(self, groupId)
+end
+
+function FamilyMsgRecord:ReflashCallBack()
+    self.list_msg.numItems = #self.resData
+    --self.list_msg:RefreshVirtualList()
 end
 
 function FamilyMsgRecord:Init()
+    self.list_msg = self._view:GetChild("list_msg")
+
     self.btn_quit = self._view:GetChild("btn_quit")
 
     self.btn_quit.onClick:Set(function()
         self:Close()
     end)
+
+    self.list_msg.itemRenderer = function(index, obj)
+        list_msgRender(self, index, obj)
+    end
+
+    self.list_msg:SetVirtual()
 end
 
 function FamilyMsgRecord:Close()
-
+    if self.closeCallback then
-    if self.closeCallback then 
         self.closeCallback()
     end
 
-    BaseWindow.Close(self)
+    BaseView.Close(self)
 end
 
-return FamilyMsgRecord
+return FamilyMsgRecord

lua_probject/base_project/Game/View/FamilyView.lua

@@ -292,12 +292,8 @@ function M:ShareWx()
 end
 
 function M:MsgView()
-    self.lastType = self.familyType.selectedIndex
+    local view = FamilyMsgRecord.New()
-    self.familyType.selectedIndex = 0
+    view:Show(self._group.id)
-    local view = FamilyMsgRecord.New(function()
-        self.familyType.selectedIndex = self.lastType
-    end)
-    view:Show()
 end
 
 function M:SetIsOpenChatRoom()

wb_new_ui/assets/Extend_MJ_FuZhou/package.xml

@@ -195,7 +195,6 @@
     <image id="plau69" name="Head0.png" path="/images/clearing/"/>
     <image id="plau6a" name="icon.png" path="/images/" exported="true"/>
     <component id="k1od6b" name="Gang_tip_choice.xml" path="/component/choose/" exported="true"/>
-    <misc id="f8c37k" name="我们项目的素材.rar" path="/component/hu_effect/"/>
     <component id="m21r8i" name="com_huType.xml" path="/component/hu_effect/" exported="true"/>
     <movieclip id="f8c31a" name="xingxing.jta" path="/component/hu_effect/"/>
   </resources>

wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/别人胡.xml

@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="2164,766" pivot="0.5,0.5" anchor="true">
-  <displayList>
-    <image id="n1_sq21" name="n1" src="plau20" fileName="component/chi_peng_effect/image/胡.png" xy="505,245" pivot="0.5,0.5" size="238,277" aspect="true"/>
-    <image id="n10_9msj" name="n10" src="plau4v" fileName="component/eff/image/星星.png" xy="590,346" pivot="0.5,0.5" blend="add"/>
-    <image id="n11_9msj" name="n11" src="plau4v" fileName="component/eff/image/星星.png" xy="586,340" pivot="0.5,0.5" blend="add"/>
-    <image id="n12_9msj" name="n12" src="plau4v" fileName="component/eff/image/星星.png" xy="608,342" pivot="0.5,0.5" blend="add"/>
-    <image id="n13_9msj" name="n13" src="plau4v" fileName="component/eff/image/星星.png" xy="620,336" pivot="0.5,0.5" blend="add"/>
-    <image id="n14_9msj" name="n14" src="plau4v" fileName="component/eff/image/星星.png" xy="604,388" pivot="0.5,0.5" blend="add"/>
-    <image id="n15_9msj" name="n15" src="plau4v" fileName="component/eff/image/星星.png" xy="620,397" pivot="0.5,0.5" blend="add"/>
-    <image id="n16_9msj" name="n16" src="plau4v" fileName="component/eff/image/星星.png" xy="590,398" pivot="0.5,0.5" blend="add"/>
-  </displayList>
-  <transition name="t2">
-    <item time="0" type="Alpha" target="n1_sq21" value="0"/>
-    <item time="0" type="Scale" target="n10_9msj" value="0,0"/>
-    <item time="0" type="Scale" target="n15_9msj" value="0,0"/>
-    <item time="0" type="Scale" target="n13_9msj" value="0,0"/>
-    <item time="0" type="Scale" target="n12_9msj" value="0,0"/>
-    <item time="0" type="Scale" target="n11_9msj" value="0,0"/>
-    <item time="0" type="Scale" target="n14_9msj" value="0,0"/>
-    <item time="3" type="Scale" target="n16_9msj" value="0,0"/>
-    <item time="16" type="Alpha" target="n1_sq21" value="0"/>
-    <item time="16" type="Rotation" target="n15_9msj" tween="true" startValue="0" endValue="360" duration="23"/>
-    <item time="16" type="Scale" target="n15_9msj" tween="true" startValue="0,0" endValue="0.7,0.7" duration="12"/>
-    <item time="16" type="XY" target="n15_9msj" tween="true" startValue="1048,346" endValue="1174,518" duration="23"/>
-    <item time="17" type="Alpha" target="n1_sq21" value="1"/>
-    <item time="17" type="Rotation" target="n10_9msj" tween="true" startValue="0" endValue="360" duration="23"/>
-    <item time="17" type="Rotation" target="n12_9msj" tween="true" startValue="0" endValue="360" duration="23"/>
-    <item time="17" type="Scale" target="n1_sq21" tween="true" startValue="0.4,0.4" endValue="1,1" duration="2" ease="Bounce.In"/>
-    <item time="17" type="Scale" target="n12_9msj" tween="true" startValue="0,0" endValue="0.8,0.8" duration="12"/>
-    <item time="17" type="Scale" target="n10_9msj" tween="true" startValue="0,0" endValue="1.2,1.2" duration="12"/>
-    <item time="17" type="XY" target="n12_9msj" tween="true" startValue="1048,346" endValue="1191,326" duration="23"/>
-    <item time="17" type="XY" target="n10_9msj" tween="true" startValue="1048,346" endValue="778,202" duration="23"/>
-    <item time="19" type="Rotation" target="n13_9msj" tween="true" startValue="0" endValue="360" duration="27"/>
-    <item time="19" type="Scale" target="n13_9msj" tween="true" startValue="0,0" endValue="1,1" duration="15"/>
-    <item time="19" type="XY" target="n13_9msj" tween="true" startValue="1048,346" endValue="919,169" duration="28"/>
-    <item time="20" type="Rotation" target="n11_9msj" tween="true" startValue="0" endValue="360" duration="23"/>
-    <item time="20" type="Scale" target="n11_9msj" tween="true" startValue="0,0" endValue="0.9,0.9" duration="12"/>
-    <item time="20" type="XY" target="n11_9msj" tween="true" startValue="1048,346" endValue="1088,213" duration="23"/>
-    <item time="22" type="Rotation" target="n14_9msj" tween="true" startValue="0" endValue="360" duration="25"/>
-    <item time="22" type="Rotation" target="n16_9msj" tween="true" startValue="0" endValue="360" duration="20"/>
-    <item time="22" type="Scale" target="n16_9msj" tween="true" startValue="0,0" endValue="0.8,0.8" duration="10"/>
-    <item time="22" type="Scale" target="n14_9msj" tween="true" startValue="0,0" endValue="1,1" duration="14"/>
-    <item time="22" type="XY" target="n14_9msj" tween="true" startValue="1048,346" endValue="959,492" duration="25"/>
-    <item time="22" type="XY" target="n16_9msj" tween="true" startValue="1048,346" endValue="1287,378" duration="20"/>
-    <item time="28" type="Scale" target="n15_9msj" tween="true" startValue="0.7,0.7" endValue="0,0" duration="11"/>
-    <item time="29" type="Scale" target="n12_9msj" tween="true" startValue="0.8,0.8" endValue="0,0" duration="11"/>
-    <item time="29" type="Scale" target="n10_9msj" tween="true" startValue="1.2,1.2" endValue="0,0" duration="11"/>
-    <item time="32" type="Scale" target="n16_9msj" tween="true" startValue="0.8,0.8" endValue="0,0" duration="10"/>
-    <item time="32" type="Scale" target="n11_9msj" tween="true" startValue="0.9,0.9" endValue="0,0" duration="11"/>
-    <item time="34" type="Scale" target="n13_9msj" tween="true" startValue="1,1" endValue="0,0" duration="14"/>
-    <item time="36" type="Scale" target="n14_9msj" tween="true" startValue="1,1" endValue="0,0" duration="13"/>
-  </transition>
-</component>

wb_new_ui/assets/Extend_MJ_NanCheng/component/eff/自己胡牌.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<component size="1334,750">
-  <displayList>
-    <image id="n8_o50w" name="n8" src="plau20" fileName="component/chi_peng_effect/image/胡.png" xy="398,238" scale="2,2"/>
-    <image id="n9_o50w" name="n9" src="evgeoh" fileName="component/chi_peng_effect/image/牌.png" pkg="lxhyy2sd" xy="621,238" scale="2,2"/>
-  </displayList>
-  <transition name="t2">
-    <item time="0" type="XY" target="n9_o50w" tween="true" startValue="1327,238" endValue="611,238" duration="5" ease="Bounce.In"/>
-    <item time="0" type="XY" target="n8_o50w" tween="true" startValue="-248,238" endValue="417,238" duration="5" ease="Bounce.In"/>
-    <item time="5" type="XY" target="n8_o50w" tween="true" startValue="417,238" endValue="407,238" duration="2"/>
-    <item time="5" type="XY" target="n9_o50w" tween="true" startValue="611,238" endValue="621,238" duration="2"/>
-    <item time="7" type="XY" target="n9_o50w" tween="true" startValue="621,238" endValue="628,238" duration="4"/>
-    <item time="7" type="XY" target="n8_o50w" tween="true" startValue="407,238" endValue="404,238" duration="4"/>
-    <item time="11" type="XY" target="n9_o50w" tween="true" startValue="628,238" ease="Bounce.Out"/>
-    <item time="11" type="XY" target="n8_o50w" tween="true" startValue="404,238" ease="Bounce.Out"/>
-  </transition>
-</component>

wb_new_ui/assets/Extend_MJ_NanCheng/package.xml

@@ -181,8 +181,6 @@
     <image id="plau4x" name="zi.png" path="/component/eff/"/>
     <image id="plau4y" name="mo.png" path="/component/eff/"/>
     <component id="plau4z" name="FzEffect.xml" path="/component/eff/" exported="true"/>
-    <component id="plau50" name="别人胡.xml" path="/component/eff/" exported="true"/>
-    <component id="plau51" name="自己胡牌.xml" path="/component/eff/" exported="true"/>
     <component id="plau5z" name="eff_list1.xml" path="/component/hu_effect/" exported="true"/>
     <component id="plau60" name="eff_list2.xml" path="/component/hu_effect/" exported="true"/>
     <image id="plau61" name="sao.png" path="/component/hu_effect/"/>

wb_new_ui/assets/Family/FamilyMsgRecord/Component/item_msg.xml

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1992,102">
   <displayList>
-    <image id="n0_k356" name="n0" src="k3567d50" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113"/>
+    <image id="n0_k356" name="n0" src="edxg7d5e" fileName="FamilyMsgRecord/Iamge/Group 650.png" xy="-3,0" size="1998,113"/>
     <text id="n1_k356" name="tex_msg" xy="120,0" size="1332,102" font="ui://27vd145bh35o7ik0" fontSize="42" color="#444444" vAlign="middle" autoSize="none" bold="true" text="{微信用户1}被{用户121}加入亲友圈"/>
     <text id="n4_k356" name="tex_time" xy="1474,0" size="487,102" font="ui://27vd145bh35o7ik0" fontSize="42" align="right" vAlign="middle" autoSize="none" bold="true" text="2025-03-08 11:40:28"/>
-    <loader id="n2_k356" name="loader_icon" xy="18,16" size="70,70"/>
     <graph id="n5_k356" name="n5" xy="18,16" size="70,70" type="rect" lineSize="2" lineColor="#ff804b2e" corner="12"/>
+    <loader id="n2_k356" name="loader_icon" xy="18,16" size="70,70" url="ui://htcn7v3redxg7d5f" align="center" vAlign="middle" fill="scale"/>
   </displayList>
 </component>

wb_new_ui/assets/Family/FamilyMsgRecord/com_FamilyMsgRecord.xml

@@ -1,26 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
   <displayList>
-    <image id="n5_k356" name="n5" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1003,24" group="n8_k356">
+    <image id="n9_hyws" name="n9" src="jrro7cyp" fileName="Main/Image/loginBg.png" xy="1,0" size="2531,1170" group="n17_hyws">
-      <relation target="n6_k356" sidePair="left-left"/>
+      <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <text id="n6_k356" name="n6" xy="1120,27" size="292,94" group="n8_k356" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" text="申请消息">
+    <image id="n10_hyws" name="n10" src="jrro7cyd" fileName="Main/Image/bt_top.png" xy="0,0" group="n17_hyws">
+      <relation target="" sidePair="right-left,top-top,rightext-right"/>
+    </image>
+    <component id="n11_hyws" name="btn_quit" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_hyws"/>
+    <image id="n13_hyws" name="n13" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1003,24" group="n16_hyws">
+      <relation target="n14_hyws" sidePair="left-left"/>
+    </image>
+    <text id="n14_hyws" name="n14" xy="1120,27" size="292,94" group="n16_hyws" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="申请消息">
       <relation target="" sidePair="center-center"/>
     </text>
-    <image id="n7_k356" name="n7" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1466,24" group="n8_k356" flip="hz">
+    <image id="n15_hyws" name="n15" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1466,24" group="n16_hyws" flip="hz">
-      <relation target="n6_k356" sidePair="right-right"/>
+      <relation target="n14_hyws" sidePair="right-right"/>
     </image>
-    <group id="n8_k356" name="n8" xy="1003,24" size="526,99"/>
+    <group id="n16_hyws" name="n16" xy="1003,24" size="526,99" group="n17_hyws" advanced="true"/>
-    <component id="n0_k356" name="btn_quit" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6"/>
+    <group id="n17_hyws" name="bg" xy="0,0" size="2532,1170"/>
-    <image id="n2_k356" name="n2" src="k3567d52" fileName="FamilyMsgRecord/Iamge/Rectangle 290.png" xy="243,192" size="2040,948"/>
+    <image id="n3_k356" name="n3" src="edxg7d5g" fileName="FamilyMsgRecord/Iamge/Rectangle 291.png" xy="225,174" size="2076,984"/>
-    <image id="n3_k356" name="n3" src="k3567d51" fileName="FamilyMsgRecord/Iamge/Rectangle 291.png" xy="225,174" size="2076,984"/>
+    <image id="n2_k356" name="n2" src="edxg7d5f" fileName="FamilyMsgRecord/Iamge/Rectangle 290.png" xy="243,192" size="2040,948"/>
-    <list id="n4_k356" name="list_msg" xy="264,208" size="1997,919" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3rk3567d53" align="center" vAlign="middle" autoClearItems="true">
+    <list id="n4_k356" name="list_msg" xy="264,208" size="1997,919" layout="flow_hz" overflow="scroll" lineGap="16" defaultItem="ui://htcn7v3redxg7d5d" align="center" autoClearItems="true">
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
-      <item/>
       <item/>
       <item/>
       <item/>

wb_new_ui/assets/Family/Main.xml

@@ -22,11 +22,10 @@
       <relation target="" sidePair="right-left,top-top,rightext-right"/>
     </image>
     <component id="n3_in3i" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_in3i"/>
-    <text id="n399_nq5b" name="n399" xy="199,26" size="203,97" group="n17_in3i" fontSize="30" align="center" autoSize="none" text="版本1.0.1"/>
     <image id="n392_f1fu" name="n392" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1039,24" group="n395_f1fu">
       <relation target="n393_f1fu" sidePair="left-left"/>
     </image>
-    <text id="n393_f1fu" name="n393" xy="1156,27" size="220,94" group="n395_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#000000" shadowOffset="3,3" text="亲友圈">
+    <text id="n393_f1fu" name="n393" xy="1156,27" size="220,94" group="n395_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="亲友圈">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n394_f1fu" name="n394" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1430,24" group="n395_f1fu" flip="hz">

wb_new_ui/assets/Family/NumberList/com_numberList.xml

@@ -11,7 +11,7 @@
     <image id="n23_ndb5" name="n23" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n26_ndb5">
       <relation target="n24_ndb5" sidePair="left-left"/>
     </image>
-    <text id="n24_ndb5" name="n24" xy="1084,27" size="364,94" group="n26_ndb5" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#000000" shadowOffset="3,3" text="亲友圈成员">
+    <text id="n24_ndb5" name="n24" xy="1084,27" size="364,94" group="n26_ndb5" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="亲友圈成员">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n25_ndb5" name="n25" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n26_ndb5" flip="hz">

wb_new_ui/assets/Family/PlayEdit/com_playEdit.xml

@@ -12,7 +12,16 @@
     <image id="n0_mggi" name="n0" src="86ct7cvc" fileName="GamePlay/Image/Rectangle 91.png" xy="249,172" size="2034,981"/>
     <image id="n1_mggi" name="n1" src="86ct7cvb" fileName="GamePlay/Image/Rectangle 112.png" xy="261,184" size="2010,957"/>
     <graph id="n2_mggi" name="n2" xy="279,202" size="1974,861" type="rect" lineColor="#ffeddfc0" fillColor="#ffeddfc0" corner="36"/>
-    <image id="n3_mggi" name="49" src="ndnl7d2c" fileName="GamePlay/Image/Group 315.png" xy="969,25" size="594,99"/>
+    <image id="n13_hyws" name="n13" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1003,25" group="n16_hyws">
+      <relation target="n14_hyws" sidePair="left-left"/>
+    </image>
+    <text id="n14_hyws" name="n14" xy="1120,28" size="292,94" group="n16_hyws" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="玩法管理">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <image id="n15_hyws" name="n15" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1466,25" group="n16_hyws" flip="hz">
+      <relation target="n14_hyws" sidePair="right-right"/>
+    </image>
+    <group id="n16_hyws" name="n16" xy="1003,25" size="526,99" advanced="true"/>
     <list id="n4_mggi" name="list_gamePlay" xy="337,293" size="1854,720" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3r86ct7cv8">
       <item url="ui://htcn7v3r86ct7cvd"/>
     </list>

wb_new_ui/assets/Family/SelectNumber/com_SelectNumber.xml

@@ -11,7 +11,7 @@
     <image id="n10_f1fu" name="n10" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="967,24" group="n13_f1fu">
       <relation target="n11_f1fu" sidePair="left-left"/>
     </image>
-    <text id="n11_f1fu" name="n11" xy="1084,27" size="364,94" group="n13_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#000000" shadowOffset="3,3" text="亲友圈成员">
+    <text id="n11_f1fu" name="n11" xy="1084,27" size="364,94" group="n13_f1fu" font="ui://27vd145bg2mo7ij0" fontSize="72" color="#ffffff" align="center" vAlign="middle" shadowColor="#4c5058" shadowOffset="3,3" text="亲友圈成员">
       <relation target="" sidePair="center-center"/>
     </text>
     <image id="n12_f1fu" name="n12" src="yk1o7d3p" fileName="Main/Image/hall_club_common_tittle_icon1.png" xy="1502,24" group="n13_f1fu" flip="hz">

wb_new_ui/assets/Family/package.xml

@@ -366,11 +366,11 @@
     <image id="ftxw7d59" name="Group 558.png" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Image/"/>
     <image id="ftxw7d5a" name="Rectangle 165(2).png" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Image/"/>
     <image id="ftxw7d5b" name="Rectangle 186.png" path="/FamilyRoomCardRecord/FamilyRoomCardRecord/Image/"/>
-    <component id="edxg7d5c" name="com_FamilyMsgRecord.xml" path="/FamilyMsgRecord/"/>
+    <component id="edxg7d5c" name="com_FamilyMsgRecord.xml" path="/FamilyMsgRecord/" exported="true"/>
-    <component id="edxg7d5d" name="item_msg.xml" path="/FamilyMsgRecord/Component/"/>
+    <component id="edxg7d5d" name="item_msg.xml" path="/FamilyMsgRecord/Component/" exported="true"/>
-    <image id="edxg7d5e" name="Group 650.png" path="/FamilyMsgRecord/Iamge/"/>
+    <image id="edxg7d5e" name="Group 650.png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="25,22,54,59"/>
-    <image id="edxg7d5f" name="Rectangle 290.png" path="/FamilyMsgRecord/Iamge/"/>
+    <image id="edxg7d5f" name="Rectangle 290.png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="20,21,40,42"/>
-    <image id="edxg7d5g" name="Rectangle 291.png" path="/FamilyMsgRecord/Iamge/"/>
+    <image id="edxg7d5g" name="Rectangle 291.png" path="/FamilyMsgRecord/Iamge/" scale="9grid" scale9grid="21,22,42,44"/>
     <image id="mggi7d5h" name="look.png" path="/Main/Image/"/>
     <component id="mggi7d5i" name="com_playEdit.xml" path="/PlayEdit/" exported="true"/>
     <image id="q2iu7d5k" name="bg_mainListChild(1).png" path="/Main/Image/" scale="9grid" scale9grid="26,22,136,123"/>

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

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170" bgColor="#000000">
   <controller name="over" pages="0,,1," selected="0"/>
-  <controller name="main" pages="0,,1," selected="1"/>
+  <controller name="main" pages="0,,1," selected="0"/>
   <controller name="playerNum" alias="玩家数量" pages="0,两人,1,三人,2,四人" selected="0"/>
   <controller name="showType" pages="0,,1," selected="0"/>
   <displayList>
@@ -105,7 +105,6 @@
       <relation target="" sidePair=""/>
       <relation target="n129_yry6" sidePair="left-right"/>
     </text>
-    <image id="n132_yry6" name="Img_Family" src="yry6zo" fileName="Main_new/Clearing/Image/club 1.png" xy="1245,993" group="n140_yry6" visible="false"/>
     <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"/>

wb_new_ui/assets/Main_Majiang/package.xml

@@ -1026,7 +1026,6 @@
     <component id="rw7jxg" name="btn_closeShow.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
     <component id="rw7jxh" name="pop_showNextCard.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
     <component id="rw7jxm" name="btn_oneChoose.xml" path="/Main_new/Main/Component/allCardsToShow/"/>
-    <image id="rw7jyi" name="bg2.png" path="/"/>
     <image id="qt01yq" name="Group 193.png" path="/Main_new/Main/Image/"/>
     <image id="qt01yr" name="Group 239.png" path="/Main_new/Main/Image/"/>
     <image id="qt01ys" name="Rectangle 212.png" path="/Main_new/Main/Image/" scale="9grid" scale9grid="677,26,48,215"/>
@@ -1528,5 +1527,5 @@
     <image id="whhc1fn" name="tile_zimo.png" path="/Main_new/Image/HuCardEffect/" exported="true"/>
     <movieclip id="whhc1fo" name="Effect_ZiMo.jta" path="/Main_new/Main/" atlas="alone"/>
   </resources>
-  <publish name="Main_Majiang" path="..\wb_unity_pro\Assets\ART\base\main_majiang\ui" packageCount="2"/>
+  <publish name="Main_Majiang" path="..\qyq_new_unity\Assets\ART\base\ui" packageCount="2"/>
 </packageDescription>

wb_unity_pro/Assets/ART/base/Family/ui/Family_atlas0_5.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 93fbe85eee0acec498778b5125cda3e1
-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/family/b23cba4d4e164d6d5cb3cff916b9e0a4
-  assetBundleVariant: 

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

@@ -1,9 +1,5 @@
 fileFormatVersion: 2
-<<<<<<< HEAD
 guid: 3ad3937da18bb154e8135801fe276a86
-=======
-guid: f5dfe2527407f0847b118e5033b6d3ca
->>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -61,14 +57,50 @@ TextureImporter:
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
-  applyGammaDecoding: 0
+  applyGammaDecoding: 1
   platformSettings:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 2048
     resizeAlgorithm: 0
     textureFormat: -1
-    textureCompression: 1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Android
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 0
     compressionQuality: 50
     crunchedCompression: 0
     allowsAlphaSplitting: 0
@@ -92,9 +124,5 @@ TextureImporter:
   pSDRemoveMatte: 0
   pSDShowRemoveMatteOption: 0
   userData: 
-<<<<<<< HEAD
   assetBundleName: 
-=======
-  assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
->>>>>>> 2e92757ba3fe3e5c4b058b254d41c2efd68dec7a
   assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 0e38ff08c92b6fe4f9fb606078139c8f
-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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_1.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 4bc6de557fd8b01469ea797a88fab6e7
-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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/fuzhou/ui/Extend_MJ_FuZhou_atlas1_2.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: dbed66f7225e8e947bf642537b101869
-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: extend/majiang/fuzhou/2da6f335ff400cb853dadc4ba58a8c70
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/jinxi/ui/Extend_MJ_JinXi_atlas1.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 1bac4deafc7d3de4eb47ce486a4975ea
-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: extend/majiang/jinxi/d6500faabd8efe9ea4f5aef4daf5e9dd
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/lichuan/ui/Extend_MJ_LiChuan_atlas0_1.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: fe92826453867a142b205f15f933263f
-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: extend/majiang/lichuan/8dba1742414c996765e2bd85d1b4bea7
-  assetBundleVariant: 

wb_unity_pro/Assets/ART/extend/majiang/nancheng/ui/Extend_MJ_NanCheng_atlas1.png.meta

@@ -1,92 +0,0 @@
-fileFormatVersion: 2
-guid: 67a875cabb31a38438757231517e845b
-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: extend/majiang/nancheng/704ffdeb1d214471a2c68eb82f8ff5c9
-  assetBundleVariant: