Merge branch 'master' into lps/emoji

# Conflicts:
#	wb_new_ui/assets/Family/Main.xml
#	wb_new_ui/assets/Family/Main/Component/c_familyMember.xml
#	wb_unity_pro/Assets/ART/base/Family/ui/Family_fui.bytes

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

@@ -5,7 +5,7 @@ local FamilyNumberRecord = {
 
 local M = FamilyNumberRecord
 
-function FamilyNumberRecord.New(root)
+function FamilyNumberRecord.New(root, page)
     local self = setmetatable({}, { __index = M })
 
     self._father = root
@@ -18,6 +18,7 @@ function FamilyNumberRecord.New(root)
     comp_numberRecord.height = root._view.height
     comp_numberRecord:Center()
     self._view = comp_numberRecord
+    self._data_minPage = page - 1
 
     local group_id = self.group_id
     local MJScore = 0
@@ -108,9 +109,13 @@ function FamilyNumberRecord.New(root)
         end
     end)
     self._view:GetChild('btn_close').onClick:Set(function()
-        root.familyType.selectedIndex = self._lastTpe
+        if self.ctr_numberRecord.selectedIndex > self._data_minPage then
-        self._lastTpe = nil
+            self.ctr_numberRecord.selectedIndex = self.ctr_numberRecord.selectedIndex - 1
-        self._view.visible = false
+        else
+            root.familyType.selectedIndex = self._lastTpe
+            self._lastTpe = nil
+            self._view.visible = false
+        end
     end)
     self._view:GetChild('btn_clearInput').onClick:Set(function()
         input_IDSerach.text = ""
@@ -179,7 +184,17 @@ function FamilyNumberRecord.New(root)
         self._viewlist_numberRecordDetail:RefreshVirtualList()
     end)
 
-    self:OnClickSortType()
+    if self._data_minPage == 0 then
+        self:OnClickSortType()
+    else
+        self.ctr_numberRecord.selectedIndex = 1
+        self:OnClickNumberRank(group_id, DataManager.SelfUser.account_id, 0)
+        self._view:GetChild('text_numberRecordName').text = DataManager.SelfUser.nick_name
+        self._view:GetChild('text_numberRecordID').text = string.format("ID:%s", DataManager.SelfUser.account_id)
+        ImageLoad.Load(DataManager.SelfUser.head_url, self._view:GetChild('btn_numberRecordHead')._iconObject)
+        self.rankNumber.uid = DataManager.SelfUser.account_id
+        self.rankNumber.round = 0
+    end
 
     -- fgCtr:FG_GetConsumeStat(group_id, self.familyChooseTimeView:GetBeginTime(), self.familyChooseTimeView:GetEndTime(),
     --     function(res)

lua_probject/base_project/Game/View/FamilyView.lua

@@ -69,10 +69,16 @@ function M:init(url)
     end)
     -------绑定成员战绩按钮
     view:GetChild('btn_family_record').onClick:Set(function()
-        self._child_familyNumberRecord = FamilyNumberRecord.New(self)
+        self._child_familyNumberRecord = FamilyNumberRecord.New(self, 1)
         self.lastType = 1
     end)
 
+    view:GetChild('btn_person_record').onClick:Set(function()
+        self._child_familyNumberRecord = FamilyNumberRecord.New(self, 2)
+        self.lastType = 1
+    end)
+
+
     if FamilyEventView then
         self._familyEventView = FamilyEventView.new(self)
         self._familyEventView:_evtAddPlay()
@@ -266,10 +272,10 @@ end
 
 function M:BanFamily()
     local fgCtr = ControllerManager.GetController(NewGroupController)
-    local data = { 
+    local data = {
         id = self._group.id,
-        ban = not self._group.ban 
+        ban = not self._group.ban
-        }
+    }
     fgCtr:FG_UpdateGroupInfo(data,
         function(res)
             if res.ReturnCode ~= 0 then
@@ -534,6 +540,7 @@ function M:ConnetFamily(index, groups, isCreate)
     list_family:SetVirtual()
     self._group = DataManager.groups:get(groups[index].id)
     self._view:GetChild('text_familyId').text = self._group.id
+    self._view:GetController('lev').selectedIndex = self._group.lev - 1
     print("===================================self._group")
     pt(self._group)
     self._roomNum = self._group.room_num
@@ -817,7 +824,7 @@ function M:RefalshMoreBtn()
     MORE_LIST[5].name = tex
 
     local tex = ""
-    if self._group.ban then 
+    if self._group.ban then
         tex = "一键开启"
     else
         tex = "一键打烊"

lua_probject/base_project/Main.lua

@@ -54,7 +54,6 @@ function Main()
 
     EmojiLuaHelper.Init()
 
-
     --PlayerPrefs.DeleteKey('session_id')
     Application.targetFrameRate = 60
     FairyGUI.UIConfig.buttonSound = FairyGUI.NAudioClip(ResourcesManager.LoadObject("base/common/sound/click.mp3",

wb_new_ui/assets/Common/package.xml

@@ -608,7 +608,7 @@
     <image id="cvc87i5r" name="ann_queren.png" path="/font/images/" exported="true"/>
     <image id="cvc87i5s" name="ann_quxiao.png" path="/font/images/" exported="true"/>
     <component id="cvc87i5t" name="MessageBox1.xml" path="/" exported="true"/>
-    <image id="s98c7i5u" name="shurukuang5.png" path="/font/images/win/" exported="true" scale="9grid" scale9grid="45,10,90,20"/>
+    <image id="s98c7i5u" name="shurukuang5.png" path="/font/images/win/" exported="true" scale="9grid" scale9grid="45,19,316,37"/>
     <image id="s98c7i5v" name="shurukuang6.png" path="/font/images/win/" exported="true"/>
     <image id="i18j7i5w" name="chongzhi.png" path="/font/images/btn_keyboard/" exported="true"/>
     <image id="i18j7i5x" name="ann_quanbushanchu.png" path="/font/images/" exported="true"/>

wb_new_ui/assets/Family/Main.xml

@@ -6,7 +6,7 @@
   <controller name="numberRecordRank" pages="0,,1,,3," selected="0"/>
   <controller name="numberRecord" pages="0,,1,,3," selected="0"/>
   <controller name="showChooseTime" pages="0,,1," selected="0"/>
-  <controller name="lev" pages="0,1,1,2,2,3" selected="0"/>
+  <controller name="lev" pages="0,1,1,2,2,3" selected="1"/>
   <controller name="moreBtn" pages="0,,1," selected="0"/>
   <controller name="familyBan" pages="0,,1," selected="0"/>
   <controller name="cMyfamilyList" pages="0,,1," selected="0"/>
@@ -23,44 +23,47 @@
     </image>
     <component id="n3_in3i" name="btn_close" src="in3i7cu9" fileName="Main/Component/btn_close.xml" xy="54,6" group="n17_in3i"/>
     <group id="n17_in3i" name="bg" xy="0,0" size="2532,1170"/>
-    <image id="n11_in3i" name="n11" src="jrro7cye" fileName="Main/Image/bg_topTitle.png" xy="1021,13" size="489,104" group="n34_86ct"/>
+    <image id="n11_in3i" name="n11" src="jrro7cye" fileName="Main/Image/bg_topTitle.png" xy="1022,13" size="489,104" group="n34_86ct"/>
-    <component id="n10_in3i" name="btn_family_record" src="in3i7cud" fileName="Main/Component/btn_family_record.xml" xy="399,14" size="328,108" group="n34_86ct">
+    <component id="n10_in3i" name="btn_family_record" src="in3i7cud" fileName="Main/Component/btn_family_record.xml" xy="400,14" size="328,108" group="n34_86ct">
       <gearDisplay controller="lev" pages="0,1"/>
       <relation target="" sidePair="left-left%,top-top%"/>
     </component>
-    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2131,29" group="n34_86ct" scale="1.2,1.2"/>
+    <component id="n6_in3i" name="btn_myfamily" src="in3i7cue" fileName="Main/Component/btn_myfamily.xml" xy="2132,29" group="n34_86ct" scale="1.2,1.2"/>
-    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1749,29" group="n34_86ct" scale="1.2,1.2">
+    <component id="n397_ukzq" name="btn_person_record" src="ukzq7d5m" fileName="Main/Component/btn_person_record.xml" xy="400,14" group="n34_86ct">
+      <gearDisplay controller="lev" pages="2"/>
+    </component>
+    <component id="n8_in3i" name="btn_showALlStartRoom" src="in3i7cuc" fileName="Main/Component/btn_showALlStartRoom.xml" xy="1750,29" group="n34_86ct" scale="1.2,1.2">
       <gearDisplay controller="lev" pages="0,1"/>
     </component>
-    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="28,143" size="420,1011" group="n360_jrro">
+    <image id="n353_jrro" name="n353" src="jrro7cy2" fileName="Main/Image/bg_left1.png" xy="29,143" size="420,1011" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="48,161" size="384,978" group="n360_jrro">
+    <image id="n354_jrro" name="n354" src="jrro7cyn" fileName="Main/Image/bg_left2.png" xy="49,161" size="384,978" group="n360_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <group id="n360_jrro" name="bg_left" xy="28,143" size="420,1011" group="n34_86ct"/>
+    <group id="n360_jrro" name="bg_left" xy="29,143" size="420,1011" group="n34_86ct"/>
-    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="460,142" size="2070,1011" group="n362_jrro">
+    <image id="n355_jrro" name="n355" src="jrro7cyl" fileName="Main/Image/bg_main1.png" xy="461,142" size="2070,1011" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="479,160" size="2034,978" group="n362_jrro">
+    <image id="n356_jrro" name="n356" src="jrro7cyk" fileName="Main/Image/bg_main2.png" xy="480,160" size="2034,978" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="490,277" size="2010,852" group="n362_jrro">
+    <image id="n357_jrro" name="n357" src="jrro7cyj" fileName="Main/Image/bg_main3.png" xy="491,277" size="2010,852" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="839,289" size="1652,828" group="n362_jrro">
+    <image id="n358_jrro" name="n358" src="jrro7cyi" fileName="Main/Image/bg_main4.png" xy="840,289" size="1652,828" group="n362_jrro">
       <relation target="" sidePair="height-height,left-left%"/>
     </image>
-    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="854,298" size="1623,60" group="n362_jrro"/>
+    <image id="n363_jrro" name="n363" src="jrro7cyf" fileName="Main/Image/bg_mainOpenGame.png" xy="855,298" size="1623,66" group="n362_jrro"/>
-    <group id="n362_jrro" name="bg_right" xy="460,142" size="2070,1011" group="n34_86ct"/>
+    <group id="n362_jrro" name="bg_right" xy="461,142" size="2070,1011" group="n34_86ct"/>
-    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="500,323" group="n23_in3i">
+    <component id="n5_in3i" name="btn_inviteFriends" src="in3i7cug" fileName="Main/Component/btn_inviteFriends.xml" xy="501,323" size="321,105" group="n23_in3i">
       <relation target="" sidePair="left-left%,top-top"/>
     </component>
-    <text id="n22_in3i" name="text_familyId" xy="649,374" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456">
+    <text id="n22_in3i" name="text_familyId" xy="650,379" size="111,42" group="n23_in3i" font="ui://27vd145bh35o7iln" fontSize="30" color="#ad3c3a" text="123456">
       <relation target="n5_in3i" sidePair="center-center,bottom-bottom%"/>
     </text>
-    <group id="n23_in3i" name="inviteFriends" xy="500,323" size="321,99" group="n34_86ct"/>
+    <group id="n23_in3i" name="inviteFriends" xy="501,323" size="321,105" group="n34_86ct"/>
-    <list id="n19_in3i" name="list_other" xy="48,180" size="384,958" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
+    <list id="n19_in3i" name="list_other" xy="49,180" size="384,958" group="n34_86ct" overflow="scroll" defaultItem="ui://htcn7v3rin3i7cun" autoClearItems="true">
       <relation target="" sidePair="height-height%,left-left%"/>
       <item/>
       <item/>
@@ -75,7 +78,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n18_in3i" name="list_family" xy="504,186" size="1977,93" group="n34_86ct" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3rin3i7cuf" vAlign="middle" selectionController="listFamily" autoClearItems="true">
+    <list id="n18_in3i" name="list_family" xy="505,186" size="1977,93" group="n34_86ct" layout="row" overflow="scroll" scroll="horizontal" colGap="24" defaultItem="ui://htcn7v3rin3i7cuf" vAlign="middle" selectionController="listFamily" autoClearItems="true">
       <item/>
       <item/>
       <item/>
@@ -85,7 +88,7 @@
       <item/>
       <item/>
     </list>
-    <list id="n24_in3i" name="list_familyNumber" xy="499,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="20" defaultItem="ui://htcn7v3rin3i7cur">
+    <list id="n24_in3i" name="list_familyNumber" xy="500,437" size="322,679" group="n34_86ct" overflow="scroll" lineGap="20" defaultItem="ui://htcn7v3rin3i7cur">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
@@ -93,27 +96,27 @@
       <item/>
       <item/>
     </list>
-    <list id="n28_in3i" name="list_room" xy="854,367" size="1636,752" group="n34_86ct" overflow="scroll" lineGap="12" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
+    <list id="n28_in3i" name="list_room" xy="855,377" size="1636,752" group="n34_86ct" overflow="scroll" lineGap="12" defaultItem="ui://htcn7v3rin3i7cuh" autoClearItems="true">
       <relation target="" sidePair="height-height,left-left%"/>
       <item/>
       <item/>
       <item/>
       <item/>
     </list>
-    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="573,1028" group="n34_86ct">
+    <component id="n381_ieus" name="btn_chatRoom" src="ieus7d1c" fileName="Main/Component/btn_chatRoom.xml" xy="574,1028" group="n34_86ct">
       <relation target="" sidePair="left-left,bottom-bottom"/>
     </component>
-    <text id="n364_jrro" name="n364" xy="1569,301" size="204,56" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="42" color="#444444" text="dangqian">
+    <text id="n364_jrro" name="n364" xy="1556,297" size="232,64" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="48" color="#444444" text="dangqian">
       <relation target="n28_in3i" sidePair="center-center,bottom-top"/>
     </text>
-    <graph id="n371_ajr3" name="bh_ban" xy="490,288" size="2006,830" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
+    <graph id="n371_ajr3" name="bh_ban" xy="491,288" size="2006,830" group="n34_86ct" type="rect" lineSize="0" fillColor="#66000000">
       <gearDisplay controller="familyBan" pages="1"/>
       <relation target="" sidePair="height-height,left-left%"/>
     </graph>
-    <text id="n372_ajr3" name="text_banMain" xy="1375,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打样">
+    <text id="n372_ajr3" name="text_banMain" xy="1376,647" size="455,121" group="n34_86ct" font="ui://27vd145bh35o7iln" fontSize="50" autoSize="none" text="该亲友圈已打样">
       <gearDisplay controller="familyBan" pages="1"/>
     </text>
-    <component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="0,0" group="n34_86ct">
+    <component id="n391_j0cy" name="com_chatRoom" src="ieus7d1d" fileName="ChatRoom/com_chatRoom.xml" xy="1,0" group="n34_86ct">
       <gearDisplay controller="cIsChatRoom" pages="1"/>
       <relation target="" sidePair="width-width,height-height"/>
     </component>

wb_new_ui/assets/Family/Main/Component/btn_family_record.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="235,78" extention="Button">
+<component size="328,108" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_jrro" name="n4" src="jrro7cyo" fileName="Main/Image/btn_numberRecord.png" xy="0,0">
+    <image id="n4_jrro" name="n4" src="jrro7cyo" fileName="Main/Image/btn_numberRecord.png" xy="0,0" size="328,108">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
   </displayList>

wb_new_ui/assets/Family/Main/Component/btn_inviteFriends.xml

@@ -2,7 +2,7 @@
 <component size="321,99" extention="Button">
   <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
   <displayList>
-    <image id="n4_jrro" name="n4" src="jrro7cyh" fileName="Main/Image/bg_mainInvide.png" xy="0,0"/>
+    <image id="n4_jrro" name="n4" src="jrro7cyh" fileName="Main/Image/bg_mainInvide.png" xy="0,0" size="321,111"/>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/Family/Main/Component/btn_person_record.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="328,108" extention="Button">
+  <controller name="button" pages="0,up,1,down,2,over,3,selectedOver" selected="0"/>
+  <displayList>
+    <image id="n4_jrro" name="n4" src="ukzq7d5l" fileName="Main/Image/Group 653.png" xy="0,0" size="328,108">
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Family/Main/Component/c_familyMember.xml

@@ -8,7 +8,7 @@
     <image id="n18_jrro" name="n18" src="jrro7cyq" fileName="Main/Image/image_inGame.png" xy="114,48">
       <gearDisplay controller="type" pages="3"/>
     </image>
-    <image id="n19_jrro" name="n19" src="jrro7cyr" fileName="Main/Image/image_levef.png" xy="130,48">
+    <image id="n19_jrro" name="n19" src="jrro7cyr" fileName="Main/Image/image_levef.png" xy="128,48" size="98,33">
       <gearDisplay controller="type" pages="0"/>
     </image>
     <image id="n20_jrro" name="n20" src="jrro7cys" fileName="Main/Image/image_online.png" xy="130,48">

wb_new_ui/assets/Family/Main/Component/c_roomChild.xml

@@ -1,16 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="1620,180">
   <controller name="type" pages="0,玩法匹配,1,加入房间" selected="0"/>
-  <controller name="num" pages="0,,1,,2," selected="2"/>
+  <controller name="num" pages="0,,1,,2," selected="0"/>
   <displayList>
     <image id="n23_jrro" name="n23" src="q2iu7d5k" fileName="Main/Image/bg_mainListChild(1).png" xy="0,0" size="1326,180">
       <relation target="" sidePair="width-width,height-height"/>
     </image>
-    <image id="n24_jrro" name="n24" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="12,12">
+    <image id="n24_jrro" name="n24" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="12,51">
       <gearDisplay controller="num" pages="0,1,2"/>
       <gearXY controller="num" pages="0,1" values="12,51|62,12" default="12,12"/>
     </image>
-    <image id="n25_jrro" name="n25" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="108,12">
+    <image id="n25_jrro" name="n25" src="jrro7cy8" fileName="Main/Image/btn_mainGameNumberHead.png" xy="108,51">
       <gearDisplay controller="num" pages="0,2"/>
       <gearXY controller="num" pages="0" values="108,51" default="108,12"/>
     </image>
@@ -33,11 +33,11 @@
     <component id="n28_o8k8" name="btn_watch" src="ayfr7cwq" fileName="Main/Component/btn_watch.xml" xy="1148,3" size="160,63">
       <gearDisplay controller="type" pages="1,4"/>
     </component>
-    <component id="n15_in3i" name="player1" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="12,12" size="90,72" group="n29_q2iu">
+    <component id="n15_in3i" name="player1" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="12,54" size="90,72" group="n29_q2iu">
       <gearDisplay controller="num" pages="0,1,2"/>
       <gearXY controller="num" pages="0,1" values="12,54|62,12" default="12,12"/>
     </component>
-    <component id="n16_in3i" name="player2" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="108,12" size="90,72" group="n29_q2iu">
+    <component id="n16_in3i" name="player2" src="86ct7cwk" fileName="Main/Component/btn_head.xml" xy="108,54" size="90,72" group="n29_q2iu">
       <gearDisplay controller="num" pages="0,2"/>
       <gearXY controller="num" pages="0" values="108,54" default="108,12"/>
     </component>
@@ -45,13 +45,13 @@
     <text id="n2_in3i" name="game_type" xy="205,13" size="1075,64" group="n30_q2iu" font="ui://27vd145bh35o7ika" fontSize="48" color="#474747" leading="0" autoSize="ellipsis" text="（抚州麻将）123123456">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <text id="n3_in3i" name="n3" xy="244,69" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#474747" leading="0" autoSize="none" text="玩法：12316">
+    <text id="n3_in3i" name="n3" xy="244,71" size="115,49" group="n30_q2iu" font="ui://27vd145bh35o7il2" fontSize="36" color="#474747" leading="0" autoSize="none" text="玩法：12316">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
     <text id="n5_in3i" name="n5" xy="223,115" size="124,49" group="n30_q2iu" font="ui://27vd145bh35o7im7" fontSize="36" color="#474747" leading="0" text="已加入:">
       <relation target="" sidePair="center-center,middle-middle"/>
     </text>
-    <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,69" size="969,49" group="n30_q2iu">
+    <component id="n7_in3i" name="Label_gameRule" src="in3i7cuj" fileName="Main/Component/Label_gameRule.xml" xy="344,71" size="969,49" group="n30_q2iu">
       <relation target="" sidePair="center-center,middle-middle"/>
       <Label titleColor="#ad3c3a"/>
     </component>

wb_new_ui/assets/Family/Record/com_Record.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <component size="2532,1170">
-  <controller name="cWindow" pages="0,,1," selected="1">
+  <controller name="cWindow" pages="0,,1," selected="0">
     <remark page="0" value="亲友圈战绩"/>
     <remark page="1" value="房间战绩"/>
   </controller>
@@ -36,13 +36,27 @@
     <graph id="n51_slrk" name="n51" xy="876,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
     <graph id="n52_slrk" name="n52" xy="1968,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
     <graph id="n53_slrk" name="n53" xy="2252,303" size="6,79" group="n57_slrk" type="rect" lineColor="#ffffffff"/>
-    <text id="n47_slrk" name="n47" xy="204,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="游戏"/>
+    <text id="n47_slrk" name="n47" xy="204,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="游戏">
-    <text id="n48_slrk" name="n48" xy="440,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="时间"/>
+      <relation target="" sidePair="center-center"/>
-    <text id="n49_slrk" name="n49" xy="651,311" size="88,60" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房号"/>
+    </text>
-    <text id="n54_slrk" name="n54" xy="2076,311" size="88,60" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="备注"/>
+    <text id="n48_slrk" name="n48" xy="440,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="时间">
-    <text id="n55_slrk" name="n55" xy="2288,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="回放"/>
+      <relation target="" sidePair="center-center"/>
-    <text id="n56_slrk" name="n56" xy="1410,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="结算"/>
+    </text>
-    <text id="n58_slrk" name="n58" xy="782,311" size="88,62" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" autoSize="none" text="房卡"/>
+    <text id="n49_slrk" name="n49" xy="651,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房号">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n54_slrk" name="n54" xy="2076,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="备注">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n55_slrk" name="n55" xy="2288,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="回放">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n56_slrk" name="n56" xy="1410,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="结算">
+      <relation target="" sidePair="center-center"/>
+    </text>
+    <text id="n58_slrk" name="n58" xy="782,311" size="88,56" group="n57_slrk" font="ui://27vd145bg2mo7ij0" fontSize="42" color="#ffffff" text="房卡">
+      <relation target="" sidePair="center-center"/>
+    </text>
     <component id="n63_ghku" name="combBox_time" src="ghku7d4d" fileName="Record/Component/combBox_time.xml" xy="1915,222" group="n57_slrk">
       <ComboBox visibleItemCount="10"/>
     </component>

wb_new_ui/assets/Family/package.xml

@@ -374,6 +374,8 @@
     <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"/>
+    <image id="ukzq7d5l" name="Group 653.png" path="/Main/Image/"/>
+    <component id="ukzq7d5m" name="btn_person_record.xml" path="/Main/Component/"/>
   </resources>
   <publish name="Family" path="..\wb_unity_pro\Assets\ART\base\Family\ui" packageCount="2"/>
 </packageDescription>

wb_new_ui/assets/Lobby/CreatePlay.xml

@@ -1,22 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="2484,1122">
+<component size="2532,1170">
   <controller name="gameName" pages="0,,1,,2," selected="0"/>
   <controller name="playName" pages="0,,1," selected="0"/>
   <displayList>
-    <image id="n0_pzuc" name="n0" src="86ct7cww" fileName="component/CreatePlay/Image/Rectangle 93.png" xy="0,162"/>
+    <image id="n17_p8hp" name="n17" src="p8hp7cyv" fileName="component/CreatePlay/Image/bg_main1.png" xy="30,22">
-    <list id="n5_pzuc" name="list_gameName" xy="618,0" size="1206,171" layout="row" overflow="scroll" colGap="36" defaultItem="ui://2d9xdj6zpzuc7cx4" selectionController="gameName">
+      <relation target="" sidePair="center-center,middle-middle"/>
+    </image>
+    <image id="n0_pzuc" name="n0" src="86ct7cww" fileName="component/CreatePlay/Image/Rectangle 93.png" xy="60,146">
+      <relation target="" sidePair="left-left%,top-top%"/>
+    </image>
+    <list id="n5_pzuc" name="list_gameName" xy="644,57" size="1206,99" layout="row" overflow="scroll" colGap="36" defaultItem="ui://2d9xdj6zpzuc7cx4" selectionController="gameName">
+      <relation target="" sidePair="top-top%"/>
+      <item/>
+      <item url="ui://2d9xdj6zp8hp7cz4"/>
+    </list>
+    <image id="n3_pzuc" name="n3" src="86ct7cwu" fileName="component/CreatePlay/Image/Rectangle 91.png" xy="564,157" size="1914,975"/>
+    <image id="n18_p8hp" name="n18" src="p8hp7cz5" fileName="component/CreatePlay/Image/Rectangle 292.png" xy="563,945"/>
+    <component id="n2_pzuc" name="btn_close" src="pzuc7cx3" fileName="component/CreatePlay/Component/btn_close.xml" xy="2373,0" size="159,159">
+      <relation target="" sidePair="right-right,top-top"/>
+    </component>
+    <list id="n6_pzuc" name="list_playName" xy="60,156" size="472,976" overflow="scroll" lineGap="24" defaultItem="ui://2d9xdj6z86ct7cwy" selectionController="playName" autoClearItems="true">
       <item/>
     </list>
-    <image id="n3_pzuc" name="n3" src="86ct7cwu" fileName="component/CreatePlay/Image/Rectangle 91.png" xy="577,117"/>
+    <text id="n13_pzuc" name="input_multiple" xy="1539,996" size="120,71" visible="false" font="ui://27vd145bh35o7ill" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="1" input="true"/>
-    <component id="n2_pzuc" name="btn_close" src="pzuc7cx3" fileName="component/CreatePlay/Component/btn_close.xml" xy="15,13"/>
+    <component id="n10_pzuc" name="btn_create" src="pzuc7cx5" fileName="component/CreatePlay/Component/btn_Create.xml" xy="1980,568" group="n15_pzuc"/>
-    <list id="n6_pzuc" name="list_playName" xy="30,198" size="480,912" overflow="scroll" lineGap="24" defaultItem="ui://2d9xdj6z86ct7cwy" selectionController="playName" autoClearItems="true">
+    <text id="n11_pzuc" name="n11" xy="1658,606" size="110,72" group="n15_pzuc" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="倍数"/>
-      <item/>
+    <graph id="n12_pzuc" name="n12" xy="1533,607" size="120,69" group="n15_pzuc" visible="false" type="rect" lineSize="0" fillColor="#ffb8997d"/>
-    </list>
+    <group id="n15_pzuc" name="buttom" xy="1533,568" size="849,147" visible="false" advanced="true"/>
-    <text id="n13_pzuc" name="input_multiple" xy="1539,996" size="120,71" font="ui://27vd145bh35o7ill" fontSize="42" color="#ffffff" align="center" vAlign="middle" autoSize="none" singleLine="true" text="1" input="true"/>
+    <list id="n16_id5t" name="list_playPanel" xy="564,158" size="1906,787" overflow="scroll"/>
-    <component id="n10_pzuc" name="btn_create" src="pzuc7cx5" fileName="component/CreatePlay/Component/btn_Create.xml" xy="1986,957" group="n15_pzuc"/>
-    <text id="n11_pzuc" name="n11" xy="1664,995" size="110,72" group="n15_pzuc" font="ui://27vd145bh35o7ill" fontSize="54" color="#450f05" text="倍数"/>
-    <graph id="n12_pzuc" name="n12" xy="1539,996" size="120,69" group="n15_pzuc" type="rect" lineSize="0" fillColor="#ffb8997d"/>
-    <group id="n15_pzuc" name="buttom" xy="1539,957" size="849,147" visible="false" advanced="true"/>
-    <list id="n16_id5t" name="list_playPanel" xy="577,127" size="1906,836" overflow="scroll"/>
   </displayList>
 </component>

wb_new_ui/assets/Lobby/component/CreatePlay/Component/Single_gameName.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="378,171" extention="Button">
+<component size="354,99" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <graph id="n3_pzuc" name="n3" xy="0,0" size="378,171" type="rect" lineSize="0" fillColor="#fffcf0d5" corner="51">
+    <image id="n6_p8hp" name="n6" src="p8hp7cyx" fileName="component/CreatePlay/Image/CreateRoom10b.png" xy="0,0">
       <gearDisplay controller="button" pages="1"/>
-    </graph>
+      <relation target="" sidePair="width-width,height-height"/>
-    <graph id="n4_pzuc" name="n4" xy="0,0" size="378,171" type="rect" lineSize="0" fillColor="#fff1dcb4" corner="51">
+    </image>
+    <image id="n7_p8hp" name="n7" src="p8hp7cyw" fileName="component/CreatePlay/Image/CreateRoom10a.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
-    </graph>
+      <relation target="" sidePair="width-width,height-height"/>
-    <text id="n5_pzuc" name="title" xy="172,11" size="160,102" alpha="0.6" font="ui://27vd145bh35o7iju" fontSize="78" color="#88390e" text="麻将">
+    </image>
-      <gearLook controller="button" pages="0" values="0.6,0,0,0" default="1,0,0,0"/>
-    </text>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/Lobby/component/CreatePlay/Component/Single_gameName2.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<component size="354,99" extention="Button">
+  <controller name="button" pages="0,up,1,down" selected="1"/>
+  <displayList>
+    <image id="n6_p8hp" name="n6" src="p8hp7cyz" fileName="component/CreatePlay/Image/CreateRoom11b.png" xy="0,0">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+    <image id="n7_p8hp" name="n7" src="p8hp7cyy" fileName="component/CreatePlay/Image/CreateRoom11a.png" xy="0,0">
+      <gearDisplay controller="button" pages="0"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </image>
+  </displayList>
+  <Button mode="Radio"/>
+</component>

wb_new_ui/assets/Lobby/component/CreatePlay/Component/Single_playName.xml

@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<component size="480,132" extention="Button">
+<component size="456,150" extention="Button">
-  <controller name="button" pages="0,up,1,down" selected="0"/>
+  <controller name="button" pages="0,up,1,down" selected="1"/>
   <displayList>
-    <image id="n3_86ct" name="n3" src="86ct7cwr" fileName="CreatePlay/Image/Group 151.png" xy="0,0">
+    <loader id="n6_p8hp" name="icon1" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz3" fill="scale">
-      <gearDisplay controller="button" pages="1"/>
-    </image>
-    <image id="n4_86ct" name="n4" src="86ct7cws" fileName="CreatePlay/Image/Group 152.png" xy="0,0">
       <gearDisplay controller="button" pages="0"/>
-    </image>
+      <relation target="" sidePair="width-width,height-height"/>
-    <text id="n5_86ct" name="title" xy="83,14" size="316,102" font="ui://27vd145bh35o7iju" fontSize="78" color="#ffffff" strokeColor="#88390e" strokeSize="6" text="抚顺麻将"/>
+    </loader>
+    <loader id="n7_p8hp" name="icon2" xy="0,0" size="456,150" url="ui://2d9xdj6zp8hp7cz2" fill="scale">
+      <gearDisplay controller="button" pages="1"/>
+      <relation target="" sidePair="width-width,height-height"/>
+    </loader>
   </displayList>
   <Button mode="Radio"/>
 </component>

wb_new_ui/assets/Lobby/package.xml

@@ -554,6 +554,19 @@
     <component id="jrro7cys" name="btn_lookRecord.xml" path="/NumberRecord/Component/"/>
     <component id="jrro7cyt" name="comp_numberRecordDetailResultChild.xml" path="/NumberRecord/Component/"/>
     <component id="jrro7cyu" name="btn_head.xml" path="/Main/Component/"/>
+    <image id="p8hp7cyv" name="bg_main1.png" path="/component/CreatePlay/Image/" atlas="alone"/>
+    <image id="p8hp7cyw" name="CreateRoom10a.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cyx" name="CreateRoom10b.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cyy" name="CreateRoom11a.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cyz" name="CreateRoom11b.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cz0" name="liquanmajiang1.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7cz1" name="liquanmajiang2.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7cz2" name="paodekuai1.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <image id="p8hp7cz3" name="paodekuai2.png" path="/component/CreatePlay/Image/" exported="true"/>
+    <component id="p8hp7cz4" name="Single_gameName2.xml" path="/component/CreatePlay/Component/" exported="true"/>
+    <image id="p8hp7cz5" name="Rectangle 292.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cz6" name="btn_create.png" path="/component/CreatePlay/Image/"/>
+    <image id="p8hp7cz7" name="Rectangle 255.png" path="/component/CreatePlay/Image/"/>
   </resources>
   <publish name="Lobby" path="..\wb_unity_pro\Assets\ART\base\lobby\ui" packageCount="2">
     <atlas name="默认" index="0"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_3_jiangxi.xml

@@ -34,7 +34,7 @@
       <gearXY controller="state" pages="0,1" values="1200,274|80,654" default="1194,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="1888,519" size="144,144">
+    <component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="1888,519" size="144,144">
       <gearDisplay controller="state" pages="1"/>
       <gearXY controller="state" pages="0,1" values="1888,519|1767,33" default="1194,909"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>

wb_new_ui/assets/Main_Majiang/Main_new/Main_new_4_jiangxi.xml

@@ -36,7 +36,7 @@
       <gearXY controller="state" pages="0,1,2" values="1188,274|1867,27|1188,274" default="1188,909"/>
       <relation target="" sidePair="center-center,top-top"/>
     </component>
-    <component id="n152_kxhm" name="player_info3_2" src="lu84tz" fileName="Main_new/Main/PlayerHead_2.xml" xy="2031,516" size="108,108">
+    <component id="n152_kxhm" name="player_info3_2" src="pkx5so" fileName="Main_new/Main/PlayerHead_1.xml" xy="2031,516" size="108,108">
       <gearDisplay controller="state" pages="1,3"/>
       <gearXY controller="state" pages="0,1,3" values="2031,516|1885,24|1885,24" default="1337,906"/>
       <relation target="n155_gi99" sidePair="left-right,top-top"/>
@@ -61,7 +61,7 @@
       <gearDisplay controller="state" pages="1,2"/>
     </component>
     <component id="n87_8sat" name="btn_back_lobby" src="gq7m4p" fileName="Main_style_2/poker/Btn_back_lobby.xml" xy="25,21" size="58,75" group="n90_8sat" scale="2,2">
-      <gearDisplay controller="state" pages="0,3"/>
+      <gearDisplay controller="state" pages="3"/>
     </component>
     <component id="n105_r1z9" name="btn_leave_lobby" src="gq7m4s" fileName="Main_style_2/poker/Btn_leave_lobby.xml" xy="269,-887" group="n90_8sat">
       <gearDisplay controller="state" pages="0,3"/>
@@ -193,7 +193,7 @@
     <component id="n159_ckvb" name="Comp_ConterBox" src="gjnb107" fileName="Main_new/Main/Comp_ConterBox.xml" xy="1136,375" group="n169_gmbn">
       <gearDisplay controller="state" pages="1,3"/>
     </component>
-    <group id="n169_gmbn" name="conter_box" xy="1136,375" size="258,258"/>
+    <group id="n169_gmbn" name="conter_box" xy="1136,375" size="350,274"/>
     <graph id="n146_l15a" name="btn_showNext" xy="1121,424" size="208,165" type="rect" lineSize="0" fillColor="#00ffffff">
       <gearDisplay controller="state" pages="1"/>
     </graph>

wb_new_ui/assets/NewGroup/mgr/View_GroupGameSetting.xml

@@ -5,20 +5,21 @@
   <controller name="update" pages="0,,1,,2," selected="0"/>
   <displayList>
     <component id="n177_id5t" name="lst_game" src="pzuc7cx2" fileName="CreatePlay.xml" pkg="2d9xdj6z" xy="24,24" group="n163_10xl7"/>
-    <component id="n157_10xl7" name="btn_next" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1196,1018" size="149,82" group="n162_10xl7">
+    <component id="n157_10xl7" name="btn_next" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1986,993" size="426,144" group="n162_10xl7">
-      <Button title=" " titleColor="#167547" titleFontSize="24" icon="ui://m7iejg46vyn37i5b"/>
+      <relation target="" sidePair="right-right%,bottom-bottom%"/>
+      <Button title=" " titleColor="#167547" titleFontSize="24" icon="ui://2d9xdj6zp8hp7cz6"/>
     </component>
-    <component id="n158_10xl7" name="n158" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="672,1042" size="416,60" group="n162_10xl7" controller="type,2"/>
+    <component id="n158_10xl7" name="n158" src="kwi0hjx" fileName="mgr/component/comm/mng_label.xml" xy="706,1041" size="416,60" group="n162_10xl7" controller="type,2"/>
-    <image id="n173_vyn3" name="n173" src="s98c7i5u" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="890,1029" size="263,57" group="n162_10xl7"/>
+    <image id="n173_vyn3" name="n173" src="s98c7i5u" fileName="font/images/win/shurukuang5.png" pkg="27vd145b" xy="924,1026" size="390,78" group="n162_10xl7"/>
-    <component id="n160_10xl7" name="btn_color" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1370,1018" size="135,82" group="n162_10xl7" visible="false">
+    <component id="n160_10xl7" name="btn_color" src="eeqmcgp" fileName="buttons/Btn_Common.xml" pkg="27vd145b" xy="1404,1017" size="135,82" group="n162_10xl7" visible="false">
       <Button title=" " icon="ui://m7iejg46vyn37i5c"/>
     </component>
-    <text id="n161_10xl7" name="tex_name" xy="909,1033" size="247,51" group="n162_10xl7" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" align="center" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="点击输入玩法名"/>
+    <text id="n161_10xl7" name="tex_name" xy="924,1029" size="388,76" group="n162_10xl7" font="ui://27vd145bh35o7ilb" fontSize="48" color="#222222" vAlign="middle" autoSize="shrink" autoClearText="true" text="" input="true" prompt="请输入房间名称"/>
-    <text id="n174_vyn3" name="n174" xy="767,1040" size="132,42" group="n162_10xl7" font="ui://27vd145bqz637ij2" fontSize="24" color="#367256" vAlign="middle" autoSize="none" text="玩法名称:"/>
+    <text id="n174_vyn3" name="n174" xy="633,1024" size="299,86" group="n162_10xl7" font="ui://27vd145bh35o7im7" fontSize="66" color="#450f05" vAlign="middle" autoSize="none" text="房间名称:"/>
-    <group id="n162_10xl7" name="n162" xy="672,1018" size="833,84" group="n163_10xl7" advanced="true">
+    <group id="n162_10xl7" name="n162" xy="633,993" size="1779,144" group="n163_10xl7" advanced="true">
       <relation target="" sidePair="center-center%"/>
     </group>
-    <group id="n163_10xl7" name="page0" xy="24,24" size="2484,1122" advanced="true">
+    <group id="n163_10xl7" name="page0" xy="24,24" size="2532,1170" advanced="true">
       <gearDisplay controller="page" pages="0"/>
     </group>
     <component id="n73_kwi0" name="panel_play_set" src="mpllhv2" fileName="mgr/component/play_set/panel_play_set.xml" xy="599,210" size="1334,750" group="n107_kwi0"/>

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

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 39e80cba59cdd474b8bd6a3f5ee72afc
+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: 
+  assetBundleVariant: 

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

@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 17552fc02a861564bb8cf95edb2f667e
+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/main_majiang/bceee620094f2c87befefb9d76b9b13b
+  assetBundleVariant: 

wb_unity_pro/Assets/ART/base/main_majiang/ui/MajiangCard3d_fui.bytes.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0b4978514ef326b43b4769a7d03822d4
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: base/main_majiang/bceee620094f2c87befefb9d76b9b13b
+  assetBundleVariant: 

wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs

@@ -0,0 +1,137 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEditor;
+using System.IO;
+using taurus.client;
+using taurus.unity;
+
+class ReadAssetBase : Editor
+{
+    static string PACK_PATH = Path.Combine(Path.GetFullPath(Path.Combine(Application.dataPath, "..")), "Pack", "Android32");
+    static string READ_PATH = Path.Combine(Application.streamingAssetsPath, "Pack");
+    static string READ_ZIP = Path.Combine(Application.streamingAssetsPath, "Pack.byte");
+    static string READ_VERSION = Path.Combine(Application.streamingAssetsPath, "version.txt");
+
+    [MenuItem("BuildTools/Read Pack In Local")]
+    static public void ReadAssetBaseRun()
+    {
+        if (!Directory.Exists(PACK_PATH))
+        {
+            Debug.LogError("请打包后再运行解压操作");
+            return;
+        }
+        try
+        {
+            EditorApplication.LockReloadAssemblies();
+            EditorUtility.DisplayProgressBar("正在解压资源包中", "请稍候，正在处理资源...", 0f);
+            if (Directory.Exists(READ_PATH))
+            {
+                Directory.Delete(READ_PATH, true);
+            }
+            Directory.CreateDirectory(READ_PATH);
+
+            if (File.Exists(READ_ZIP))
+            {
+                File.Delete(READ_ZIP);
+            }
+
+            if (File.Exists(READ_VERSION))
+            {
+                File.Delete(READ_VERSION);
+            }
+
+            string baseString = Path.Combine(Application.streamingAssetsPath , "init2_1.json");
+            string baseBytes = File.ReadAllText(baseString);
+
+            ArrayList baseList = (ArrayList)MiniJSON.Json.Deserialize(baseBytes);
+            string baseVersion = ((Hashtable)baseList[1])["version"] as string;
+            for (int i = 0; i < baseList.Count; i++)
+            {
+                var tem = (Hashtable)baseList[i];
+                string _base_path = Path.Combine("base", tem["name"] as string);
+                string version = tem["version"] as string;         
+                __UnPack(version, _base_path);
+            }
+
+            string extendString = Path.Combine(Application.streamingAssetsPath, "init1_1.json");
+            string extendBytes = File.ReadAllText(extendString);
+
+            ArrayList extendList = (ArrayList)MiniJSON.Json.Deserialize(extendBytes);
+            for (int i = 0; i < extendList.Count; i++)
+            {
+                var tem = (Hashtable)extendList[i];
+                string extendBundle = tem["bundle"] as string;
+                string[] extendNameTem = extendBundle.Split('/');
+                string _extend_path = Path.Combine(extendNameTem);
+                string version = tem["version"] as string;
+                __UnPack(version, _extend_path);
+            }
+
+            string arv = Path.Combine(READ_PATH, string.Format("asset_config{0}.json",  baseVersion));
+            File.WriteAllText(arv, baseBytes);
+            string rv = Path.Combine(READ_PATH , "version.txt");
+            File.WriteAllText(rv, baseVersion);
+            File.WriteAllText(READ_VERSION, baseVersion);
+
+            IFilePack zf = null;
+            zf = new FilePack20(READ_ZIP, PackMode.Write);
+            zf.PackFile(READ_PATH, ".meta|.manifest");
+            zf = null;
+
+            Directory.Delete(READ_PATH, true);
+
+            EditorUtility.DisplayDialog("完成", "处理完毕！", "确定");
+        }
+        finally
+        {
+            EditorUtility.ClearProgressBar();
+            EditorApplication.UnlockReloadAssemblies();
+        }
+
+    }
+
+    static void __UnPack(string version, string _base_path)
+    {
+        try
+        {
+            string dir = PACK_PATH;
+            var zip_path = Path.Combine(dir, _base_path, $"asset_pack{version}.bytes");
+            if (!File.Exists(zip_path))
+            {
+                Debug.LogError("打包文件不完全，请将打包所有资源包");
+                throw new System.Exception();
+            }
+            IFilePack zip = null;
+            zip = new FilePack20(zip_path, PackMode.Read);
+            zip.UnPackFile(READ_PATH);
+
+            var lua_pack_path = Path.Combine(READ_PATH, "lua_pack");
+            if (File.Exists(lua_pack_path))
+            {
+                var lua_dir = Path.Combine(READ_PATH, "lua/");
+                if (!Directory.Exists(READ_PATH))
+                    Directory.CreateDirectory(READ_PATH);
+                zip = new FilePack20(lua_pack_path, PackMode.Read);
+                zip.UnPackFile(lua_dir);
+                File.Delete(lua_pack_path);
+            }
+
+            string rv = Path.Combine(READ_PATH, _base_path, "version.txt");
+            string directory = Path.GetDirectoryName(rv);
+
+            if (!Directory.Exists(directory))
+            {
+                Directory.CreateDirectory(directory);  // 递归创建所有不存在的文件夹
+            }
+            File.WriteAllText(rv, version, System.Text.Encoding.ASCII);
+        }
+        catch
+        {
+            Directory.Delete(READ_PATH, true);
+
+        }
+
+    }
+
+}

wb_unity_pro/Assets/Scripts/Editor/ReadAssetBase.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e97fe5854fac3b642908e31f7e8b48ac
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

wb_unity_pro/Assets/Scripts/VerCheck.cs

@@ -14,7 +14,7 @@ public class VerCheck : MonoBehaviour
     public static VerCheck Instance { get; private set; }
     public securityConnection conn;
     public bool isGFF = false;
-    public bool isDXYGFF = true;
+    public bool isDXYGFF = false;
 
     void Awake()
     {
@@ -87,6 +87,7 @@ public class VerCheck : MonoBehaviour
         //string init_url = "http://8.138.94.89:9898/NewFK/config/init2_1.json";
 
         //江西
+        //string init_url = "http://8.138.255.70:9898/NewFK/config/init2_1.json";
         string init_url = "http://110.40.188.229:6789/NewFK/config/init2_1.json";
 
         //公用